MacVim r182.1 (prerelease)

Updated to Vim 9.1.2068

.cirrus.yml

@@ -5,9 +5,9 @@ env:
 freebsd_task:
   name: FreeBSD
   matrix:
-    - name: FreeBSD 14.2
+    - name: FreeBSD 14.3
       freebsd_instance:
-        image_family: freebsd-14-2
+        image_family: freebsd-14-3
   timeout_in: 20m
   install_script:
     - pkg install -y gettext
@@ -23,7 +23,7 @@ freebsd_task:
     - sudo -u cirrus make test
   on_failure:
     test_artifacts:
-      name: "Cirrus-CI-freebsd-failed-tests"
+      name: "Cirrus-${CIRRUS_BUILD_ID}-freebsd-failed-tests"
       path: |
         runtime/indent/testdir/*.fail
         runtime/syntax/testdir/failed/*

.editorconfig

@@ -24,6 +24,14 @@ indent_size = 2
 # https://spec.commonmark.org/0.31.2/#hard-line-breaks
 trim_trailing_whitespace = false
 
+[*.vim]
+indent_style = space
+indent_size = 2
+
+[runtime/pack/dist/opt/{comment,nohlsearch}/**.vim]
+indent_style = space
+indent_size = 4
+
 [runtime/doc/**.txt]
 # It can mess up some documentation by trying to strip trailing whitespaces
 trim_trailing_whitespace = false
@@ -31,3 +39,12 @@ trim_trailing_whitespace = false
 [src/testdir/test*.vim]
 # Some tests need trailing whitespaces, for example `set showbreak=>>\ `
 trim_trailing_whitespace = false
+
+#
+# Some custom files do not use tabs
+#
+[src/sign.c]
+indent_style = space
+
+[src/sound.c]
+indent_style = space

.git-blame-ignore-revs

@@ -13,3 +13,15 @@
 # change indentation style of netrw plugin
 c363ca1ecd1f8db03663ef98dcf41eeacc3c22c7
 c673b805ad80d0aef07e745d412a2bf298ba1c07
+# fix indentation style in insexpand.c v9.1.1352
+355db99d12a89f05765948b33eecd6d9733e16bb
+# fix indentation styles in various files v9.1.1363
+c2a9000bc1b4a2cbcfeef55450c184b16906d910
+# indentation style in various files v9.1.1364
+562610cfa327c8ebff12a1700525e17a070d5e2c
+# Patch v9.1.1371
+19e1dd6b6aeb96d64122332a8c3d17b9d5ca007b
+# Patch v9.1.1372
+a4a00a7ad0cfa26685c057c11a09bec2c962346a
+# Patch v9.1.1390
+e89aef3f65388a8b627c77f250525f2a264716c5

.gitattributes

@@ -1 +1,40 @@
-src/testdir/test42.in diff
+# The old test .ok files are expected to use LF line endings, even on Windows.
+# In src/testdir/Make_mvc.mak and src/testdir/Make_ming.mak, the test result
+# files .out are converted to LF line endings before being compared.
+# Therefore, if the .ok files' line endings are not specified and are
+# converted to CRLF, the comparison between .ok and .out will fail.
+src/testdir/test*.ok text eol=lf
+
+# This ok file contains literal CR LF endings. Should not be touched by git,
+# so handle as binary
+src/testdir/test21.ok -text
+
+# `vim.pot` is updated every time any of the *.c files are modified.  And as it
+# contains line numbers for strings from *.c files, inserting a line into a
+# single .c file may cause many lines in the `vim.pot` file to be updated.
+#
+# This generates a lot of "noise" in the diffs.  And especially considering that
+# `vim.pot` is a generated file, looking at changes in this file is not useful.
+#
+# By marking it as binary we tell the git machinery that it should not be
+# presented to the user in patches, use "git diff --text" to override
+src/po/vim.pot -diff
+
+# Although vim.pot has been marked as binary, you may want to check the textual differences
+# using git --text but still want to ignore some noisy output like:
+# - POT-Creation Date
+# - comments pointing to the message source location in
+#   *.c/*.h/*.vim/*.cpp/*.in/*.xs files followed by line numbers
+# Note: location comments should be no longer part of vim.pot, since commit 2844765e903214490e1
+# which add the --no-location argument for xgettext to no longer ouput such comments
+#
+# To ignore certain changes, setup a custom textconv filter using:
+# git config diff.ignore_vim_pot.textconv "grep -Ev '^.(POT-Creation-Date:|.*\\.([ch]|vim|in|xs|cpp):).*$'"
+src/po/vim.pot diff=ignore_vim_pot
+
+# GitHub reacts to the `linguist-generated` attribute, by ignoring marked files
+# for the repository's language statistics and hiding changes in these files
+# by default in diffs.
+#
+# https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github
+src/po/vim.pot linguist-generated=true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,6 +10,8 @@ body:
         Thanks for reporting issues of MacVim!
 
         If you want to report a security issue, instead of reporting it here publicly, please disclose it using the steps listed at https://github.com/macvim-dev/macvim/security/policy.
+
+        For general Vim issues that are not specific to MacVim, please file them at https://github.com/vim/vim.
         
         To make it easier for us to help you please enter detailed information below.
   - type: textarea
@@ -30,56 +32,48 @@ body:
       required: true
   - type: input
     attributes:
-      label: Version of Vim and architecture
+      label: Version of MacVim
       description: >
-        Including patch level, use ":version" to see it [e.g. 8.2.1234, GUI, arm64]
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Environment
-      description: >
-        OS and architecture [e.g. Big Sur, arm64], terminal [e.g. Apple Terminal/iTerm], value of $TERM, shell [e.g. zsh 5.8]; anything that might matter
-      placeholder: |
-        Operating system:
-        Terminal:
-        Value of $TERM:
-        Shell:
+        MacVim release number (e.g. r181). Use "About MacVim" to find out which one you are using. If building manually from source, provide the Git commit hash instead (e.g. a4466fe3b695).
     validations:
       required: true
   - type: input
     attributes:
-      label: How MacVim was installed
+      label: MacVim installation method
       description: >
-        MacVim has been downloaded from GitHub, installed via Homebrew, MacPorts or builed from git
+        Was MacVim downloaded from GitHub release, installed via Homebrew / Homebrew Cask / MacPorts, or built from source manually?
+  - type: textarea
+    attributes:
+      label: Environment
+      description: >
+        macOS version (e.g. macOS 15.3.2 Sequoia), Mac type (e.g. MacBook Air M2), terminal (e.g. Apple Terminal/iTerm); anything that might matter
+      placeholder: |
+        macOS version:
+        Mac:
+        Terminal:
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Logs and stack traces
       placeholder: Insert log or other text here (if necessary)
       render: shell
-  - type: input
+  - type: textarea
     attributes:
-      label: Vim configuration where issue is reproducable
-      description: 'e.g. link to your vimrc configuration: url to file/gist/repo..'
+      label: Vim and MacVim configuration where issue is reproducable
+      description: Provide a link to vimrc and/or MacVim settings (see https://github.com/macvim-dev/macvim/wiki/Reporting-an-Issue for how to obtain it).
   - type: checkboxes
     attributes:
-      label: Issue has been tested with given configuration
-      description: This will help us to narrow down the problem more quickly
+      label: How was MacVim launched?
+      description: Different ways of opening MacVim can have an impact on the behavior.
       options:
-        - label: by running MacVim.app from GUI macOS interface
-        - label: by running vim/gvim/etc installed by MacVim
-        - label: by running other versions of vim (e.g. /usr/bin/vim)
+        - label: by launching MacVim.app in macOS (by using the Dock, Spotlight, or the `open` command)
+        - label: by running mvim/gvim in the terminal
   - type: checkboxes
     attributes:
-      label: Issue has been tested with no configuration
-      description: This will help us to narrow down the problem more quickly
+      label: Issue has been tested with clean configuration
+      description: Running MacVim and Vim with clean configurations allow us to narrow down whether this is a configuration issue.
       options:
-        - label: by running `mvim --clean` (or `gvim`, supplied by MacVim distribution)
+        - label: by running `mvim --clean` (or `gvim`, supplied by MacVim distribution). You can also use the File → "New Clean Window" menu item within MacVim.
         - label: by running `vim --clean` (in terminal, supplied by MacVim distribution)
         - label: by running `vim --clean` (in terminal, other suppliers, e.g. /usr/bin/vim)
-  - type: checkboxes
-    attributes:
-      label: Other conditions
-      description: This will help us to narrow down the problem more quickly
-      options:
-        - label: The both Homebrew packages "vim" and "macvim" are installed

.github/actions/test_artifacts/action.yml

@@ -1,13 +1,51 @@
 name: 'test_artifacts'
 description: "Upload failed test artifacts"
+inputs:
+  artifact-name:
+    description: Name of the artifact
+    required: true
+
 runs:
   using: "composite"
   steps:
+# MacVim: We don't use a matrix within the reused
+# workflow, and so would prefer to manually pass
+# in the name of the artifact rather than deriving
+# it from the matrix automatically like in Vim
+# upstream.
+#    - name: Collect matrix properties for naming
+#      uses: actions/github-script@v8
+#      id: matrix-props
+#      env:
+#        MATRIX_PROPS: ${{ toJSON(inputs) }}
+#      with:
+#        # An array-flattening-to-string JavaScript function.
+#        script: |
+#          const f = function (x) { return x.toString().length > 0; }
+#          const g = function (x) {
+#            return (Array.isArray(x))
+#              ? x.filter(f)
+#                .map((function (h) { return function (y) { return h(y); }; })(g))
+#                .join('-')
+#              : x;
+#          }
+#          return Object.values(JSON.parse(process.env.MATRIX_PROPS))
+#            .filter(f)
+#            .map(g)
+#            .join('-');
+#        # By default, the JSON-encoded return value of the function is
+#        # set as the "result".
+#        result-encoding: string
     - name: Upload failed tests
       uses: actions/upload-artifact@v4
       with:
         # Name of the artifact to upload.
-        name: ${{ github.workflow }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-tests
+        name: ${{ format('GH-{0}-{1}-{2}-{3}-{4}-failed-tests',
+          github.run_id,
+          github.run_attempt,
+          github.job,
+          strategy.job-index,
+          inputs.artifact-name) }}
 
         # A file, directory or wildcard pattern that describes what
         # to upload.

.github/actions/test_macvim_artifacts/action.yml

@@ -1,6 +1,14 @@
 # This is a clone of test_artifacts for MacVim-specific files
+# This should be almost identical to test_artifacts, other than the artifact
+# name/path. In the future we could potentially combine the two, but for now
+# it's simpler to keep them separate to ease upstream merging.
 name: 'test_macvim_artifacts'
 description: "Upload failed MacVim test artifacts"
+inputs:
+  artifact-name:
+    description: Name of the artifact
+    required: true
+
 runs:
   using: "composite"
   steps:
@@ -8,7 +16,12 @@ runs:
       uses: actions/upload-artifact@v4
       with:
         # Name of the artifact to upload.
-        name: ${{ github.workflow }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-macvim-tests
+        name: ${{ format('GH-{0}-{1}-{2}-{3}-{4}-failed-macvim-tests',
+          github.run_id,
+          github.run_attempt,
+          github.job,
+          strategy.job-index,
+          inputs.artifact-name) }}
 
         # A file, directory or wildcard pattern that describes what
         # to upload.

.github/actions/universal-package/action.yml

@@ -7,15 +7,19 @@ description: Create universal Homebrew package which contains x86_64 and arm64
 # that has both x86_64 and arm64 arch, as Homebrew's distributed bottles are thin binaries with only one arch.
 #
 # We still use Homebrew to manage the library because their formulas are up to date and have correct build instructions
-# that will work. This way we don't have to manually configuring and building and updating the package info.
+# that will work. This way we don't have to manually configure, build, and update the package info.
 
 inputs:
   formula:
-    description: Formura name
+    description: Formula name
     required: true
   contents:
     description: Path for contents in package's keg
     required: true
+  gnuiconv:
+    description: Use the Homebrew GNU libiconv instead of system one
+    type: boolean
+    required: false
 runs:
   using: 'composite'
   steps:
@@ -31,14 +35,31 @@ runs:
         # version and stomp what we have here.
         brew update
 
+        brew cat ${formula} >${formula}.rb
+
+        if [[ "${{ inputs.gnuiconv }}" == "true" ]]; then
+          # Modify formula to build using Homebrew libiconv. Usually just adding "depends_on" is enough, but since we
+          # override "CC" to use vanilla system clang, we need to manually inject the compilation/link flags to specify
+          # the locations.
+          sed -i.bak '/^[[:blank:]]*def install$/i\'$'\n  depends_on "libiconv"\n' ${formula}.rb
+          sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] += " -I'$(brew --prefix)$'/opt/libiconv/include"\n' ${formula}.rb
+          sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["LDFLAGS"] += " -L'$(brew --prefix)$'/opt/libiconv/lib"\n' ${formula}.rb
+        fi
+
         # Patch the official Homebrew formula to explicitly build for min deployment target and a universal binary. We
         # also need to explicitly use system Clang because Homebrew's bundled clang script tries to inject -march
         # compiler flags that will cause universal builds to fail as Clang does not like that.
-        brew cat ${formula} | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["MACOSX_DEPLOYMENT_TARGET"] = "'${MACOSX_DEPLOYMENT_TARGET}$'"\n' | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["CC"] = "/usr/bin/clang"\n' | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] = "-arch x86_64 -arch arm64"\n' | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["LDFLAGS"] = "-arch x86_64 -arch arm64"\n' >${formula}.rb
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["MACOSX_DEPLOYMENT_TARGET"] = "'${MACOSX_DEPLOYMENT_TARGET}$'"\n' ${formula}.rb
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["CC"] = "/usr/bin/clang"\n' ${formula}.rb
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] = "-arch x86_64 -arch arm64"\n' ${formula}.rb
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["LDFLAGS"] = "-arch x86_64 -arch arm64"\n' ${formula}.rb
+
+        # Homebrew requires formula files to be placed in taps and disallows
+        # installing from raw paths, so we manually create a taps folder for a
+        # 'macvim-dev/deps' tap.
+        FORMULA_DIR="$(brew --repository)/Library/Taps/macvim-dev/homebrew-deps/Formula/"
+        mkdir -p "$FORMULA_DIR"
+        cp ${formula}.rb "$FORMULA_DIR"
 
         # Uninstall the already installed formula because we want to build our own
         brew uninstall --ignore-dependencies ${formula} || true
@@ -53,14 +74,15 @@ runs:
 
         echo '::endgroup::'
 
-    - name: Cache keg
-      id: cache-keg
-      uses: actions/cache@v4
+    - name: Restore keg cache
+      id: cache-keg-restore
+      uses: actions/cache/restore@v4
       with:
         path: ${{ steps.setup-formula.outputs.brew_prefix }}/Cellar/${{ inputs.formula }}
         key: ${{ inputs.formula }}-homebrew-cache-custom-unified-prefix${{ steps.setup-formula.outputs.brew_prefix }}-xcode${{ steps.setup-formula.outputs.xcode_version }}-${{ hashFiles(format('{0}.rb', inputs.formula)) }}
 
     - name: Install formula
+      id: install-formula
       shell: bash
       run: |
         echo '::group::Install formula'
@@ -74,10 +96,12 @@ runs:
 
         # This will be a no-op if formula was cached. We check if the package
         # exists first just to avoid an "already installed" warning.
-        brew list ${formula} &>/dev/null || brew install --quiet --formula -s ./${formula}.rb
+        brew list ${formula} &>/dev/null || brew install --quiet --formula -s macvim-dev/deps/${formula}
 
         # If formula was cached, this step is necessary to relink it to brew prefix (e.g. /usr/local)
-        brew unlink ${formula} && brew link ${formula}
+        # The "-f" is there to force link keg-only formulas. Homebrew doesn't provide a command to just link in the
+        # optional /opt/homebrew/opt/... folders, so we have to resort to doing this.
+        brew unlink ${formula} && brew link -f ${formula}
         echo '::endgroup::'
 
         echo '::group::Verify built version'
@@ -93,3 +117,16 @@ runs:
         done
 
         echo '::endgroup::'
+
+    - name: Save keg cache
+      id: cache-keg-save
+      uses: actions/cache/save@v4
+      # We always save the generated artifact even if the whole run
+      # fails due to other issues. This helps debugging build
+      # failure issues faster if the cache doesn't already exist as
+      # we want subsequent runs to not have to re-generate this
+      # artifact again.
+      if: always() && steps.cache-keg-restore.outputs.cache-hit != 'true' && steps.install-formula.conclusion == 'success'
+      with:
+        path: ${{ steps.setup-formula.outputs.brew_prefix }}/Cellar/${{ inputs.formula }}
+        key: ${{ steps.cache-keg-restore.outputs.cache-primary-key }}

.github/labeler.yml

@@ -45,9 +45,7 @@ if_perl:
     - changed-files:
       - any-glob-to-any-file:
         - 'src/if_perl.xs'
-        - 'src/if_perlsfio.c'
         - 'src/proto/if_perl.pro'
-        - 'src/proto/if_perlsfio.pro'
         - 'runtime/doc/if_perl.txt'
 
 if_python:
@@ -130,9 +128,12 @@ runtime:
   - all:
     - changed-files:
       - any-glob-to-any-file:
-        - 'runtime/ftplugin'
-        - 'runtime/syntax'
-        - 'runtime/indent'
+        - 'runtime/autoload/**/*.vim'
+        - 'runtime/colors/**/*.vim'
+        - 'runtime/compiler/**/*.vim'
+        - 'runtime/ftplugin/**/*.vim'
+        - 'runtime/indent/**/*.vim'
+        - 'runtime/syntax/**/*.vim'
         - 'runtime/pack/dist/opt/termdebug/plugin/termdebug.vim'
 
 termdebug:
@@ -146,7 +147,7 @@ plugin-netrw:
     - changed-files:
       - any-glob-to-any-file:
         - 'runtime/plugin/netrwPlugin.vim'
-        - 'runtime/autoload/netrw*'
+        - 'runtime/pack/dist/opt/netrw/**'
 
 xxd:
   - all:

.github/workflows/ci-macvim.yaml

@@ -1,5 +1,7 @@
 name: MacVim GitHub CI
 
+# Main CI workflow for MacVim. Will build and test MacVim on different platforms.
+
 on:
   push:
   pull_request:
@@ -11,399 +13,42 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
-env:
-  MACOSX_DEPLOYMENT_TARGET: '10.13'
-  MACOSX_DEPLOYMENT_TARGET_LEGACY: '10.9'
-
-  MACVIM_ARCHS: "x86_64 arm64"  # Universal app for Intel/Apple Silicon
-  MACVIM_ARCHS_LEGACY: "x86_64" # Legacy builds only need to build x86-64 because Apple Silicon can't run on these old OSes
-
-  CC: clang
-
-  MAKE_BUILD_ARGS: LINK_AS_NEEDED=yes # In macOS we never over-specify link dependencies and we already check against external deps in smoketest. With LTO, linking takes a while, so we want to avoid using link.sh.
-
-  VERSIONER_PERL_VERSION: '5.34'  # macOS default Perl installation uses this to determine which one to use
-
-  vi_cv_path_python: /Library/Frameworks/Python.framework/Versions/2.7/bin/python
-  vi_cv_path_python3: "%s/bin/python3"
-  vi_cv_path_plain_lua: "%s/bin/lua"
-  vi_cv_path_ruby: "%s/opt/ruby/bin/ruby"
-  vi_cv_dll_name_perl: /System/Library/Perl/%s/darwin-thread-multi-2level/CORE/libperl.dylib
-  vi_cv_dll_name_python: /Library/Frameworks/Python.framework/Versions/2.7/Python
-  vi_cv_dll_name_python3: /usr/local/Frameworks/Python.framework/Versions/Current/Python
-  vi_cv_dll_name_python3_arm64: /opt/homebrew/Frameworks/Python.framework/Versions/Current/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: /usr/local/lib/liblua.dylib
-  vi_cv_dll_name_lua_arm64: /opt/homebrew/lib/liblua.dylib
-
-  MACVIM_APP: src/MacVim/build/Release/MacVim.app
-  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 11.x / 12.x, and also older versions of Xcode for compatibility testing.
     strategy:
       fail-fast: false
       matrix:
         include:
-#          # Oldest version of Xcode supported on GitHub Action to test source code backwards compatibility
-#          # This version of Xcode can run on macOS 11 where as 13.3 has to run on macOS 12.
-#          - os: macos-12
-#            xcode: '13.2.1'
-#            extra: [vimtags, check-xcodeproj-compat]
-#
-#          # Older version of Xcode, and used to publish legacy builds (for macOS 10.9 - 10.12)
-#          - os: macos-12
-#            xcode: '14.0' # last version of Xcode that uses the macOS 12 SDK, which still supports deploying to macOS 10.9
-#            publish: true
-#            legacy: true
-#            publish_postfix: '_10.9'
+          # Self-hosted runner with old enough software (Xcode 14.0.1) to be
+          # able to make legacy builds. We only run this when making a full
+          # release build.
+          - os: macos-13-xcode14-self-hosted
+            publish: true
+            publish_postfix: '_10.9'
+            skip: ${{ ! startswith(github.ref, 'refs/tags/release') }}
+            legacy: true
 
-          - os: macos-13
-            xcode: '15.2'
-            extra: [vimtags, check-xcodeproj-compat]
-
-          # Below runners use Apple Silicon.
           - os: macos-14
             xcode: '15.4'
-            optimized: true
+            testgui: true
+            extra: [vimtags, check-xcodeproj-compat]
 
-          # Most up to date OS and Xcode. Used to publish release for the main build.
           - os: macos-15
-            xcode: '16.2'
+            xcode: '16.4'
+            testgui: false
             publish: true
             optimized: true
 
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up legacy build
-        if: matrix.legacy
-        run: |
-          # Set the correct build env vars to target the correct architectures and min OS targets.
-          echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET_LEGACY" >> $GITHUB_ENV
-          echo "MACVIM_ARCHS=$MACVIM_ARCHS_LEGACY" >> $GITHUB_ENV
-
-          # Use Sparkle 1 because Sparkle 2 requires newer OS version than our legacy build.
-          # Later, we pass the --enable-sparkle_1 flag to configure to set the corresponding ifdef.
-          ln -fhs Sparkle_1.framework src/MacVim/Sparkle.framework
-
-          # Sparkle shows a dialog asking if the user wants to check for updates on 2nd launch of
-          # MacVim. On Sparkle 1 this is annoyingly a modal dialog box and interferes with tests.
-          # Just disable it by pre-setting to not check for updates.
-          defaults write org.vim.MacVim SUEnableAutomaticChecks 0
-
-      - name: Set up Xcode
-        if: matrix.xcode != ''
-        run: |
-          sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
-          xcode-select -p
-          xcodebuild -version
-
-      # Set up, install, and cache gettext library for localization.
-      #
-      - name: Set up gettext
-        if: matrix.publish
-        uses: ./.github/actions/universal-package
-        with:
-          formula: gettext
-          contents: lib/libintl.a,lib/libintl.dylib
-
-      # Set up, install, and cache libsodium library for encryption.
-
-      - name: Set up libsodium
-        if: matrix.publish
-        uses: ./.github/actions/universal-package
-        with:
-          formula: libsodium
-          contents: lib/libsodium.a,lib/libsodium.dylib
-
-      # Set up remaining packages and tools
-
-      - name: Install packages
-        run: |
-          brew install --quiet libtool
-
-      - name: Install packages for testing
-        run: |
-          # Apple diff is broken. Use GNU diff instead. See http://github.com/vim/vim/issues/14056.
-          brew install --quiet diffutils
-
-      - name: Grant microphone access for macos-14
-        if: matrix.os == 'macos-14'
-        run: |
-          # Temporary fix to fix microphone permission issues for macos-14 when playing sound.
-          sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR IGNORE INTO access VALUES ('kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159,NULL,NULL,'UNUSED',1687786159);"
-
-      - name: Install scripting runtimes
-        if: matrix.publish
-        run: |
-          # We no longer need to install/update Python 3, as it's guaranteed to
-          # be installed on runners. Since we use stable ABI, the exact version
-          # on CI does not matter.
-
-          brew install --quiet ruby
-          brew install --quiet lua
-
-          if [[ -d $(brew --prefix)/Cellar/perl ]]; then
-            # We just use system perl to reduce dependencies
-            brew unlink perl
-          fi
-
-          echo "vi_cv_path_python3=$(printf $vi_cv_path_python3 $(brew --prefix))" >> $GITHUB_ENV
-          echo "vi_cv_path_plain_lua=$(printf $vi_cv_path_plain_lua $(brew --prefix))" >> $GITHUB_ENV
-          echo "vi_cv_path_ruby=$(printf $vi_cv_path_ruby $(brew --prefix))" >> $GITHUB_ENV
-
-          # With Perl, we need to manually specify the version number because the dylib path depends on it.
-          echo "vi_cv_dll_name_perl=$(printf $vi_cv_dll_name_perl $VERSIONER_PERL_VERSION)" >> $GITHUB_ENV
-
-          # New runner images (macos-13) no longer have Python2 installed. We
-          # need to install Python2 manually. Installing from the official
-          # installer is the easiest way as Homebrew no longer ships python@2
-          # and this way does not invole manual building from source. We
-          # mostly only need the headers to build a dynamic build anyway.
-          #
-          # This will be removed in the future as Python2 has been completely
-          # unsupported for years.
-          curl https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg -o ~/Downloads/python-2.7.18-macosx10.9.pkg
-          sudo installer -pkg ~/Downloads/python-2.7.18-macosx10.9.pkg -target /
-
-      # All set up steps are done. Build and test MacVim below.
-
-      - name: Configure
-        run: |
-          set -o verbose
-
-          CONFOPT=(
-            --with-local-dir=$(brew --prefix)
-            --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
-              --with-python3-stable-abi=3.9 # macOS and Xcode currently ships 3.9, so we don't want go higher than that.
-              --enable-rubyinterp=dynamic
-              --enable-luainterp=dynamic
-              --with-lua-prefix=$(brew --prefix)
-              --with-macarchs="$MACVIM_ARCHS"
-            )
-          else
-            CONFOPT+=(
-              --disable-sparkle       # Disable Sparkle for testing that this flag builds and works
-              --enable-nls=no --enable-libsodium=no # Disable gettext and libsodium unless we built them ourselves for publish
-            )
-          fi
-          if ${{ matrix.legacy == true }}; then
-            CONFOPT+=(
-              --enable-sparkle_1
-            )
-          fi
-          echo "CONFOPT: ${CONFOPT[@]}"
-
-          ./configure "${CONFOPT[@]}" --enable-fail-if-missing
-
-          sed -i.bak -f ci/config.mk.sed -f ci/config.mk.clang.sed -f ci/config.mk.xcode.sed src/auto/config.mk
-          if clang --version | grep -qs '^Apple clang version \(1[3-9]\|[2-9]\d\)\.'; then
-            sed -i.bak -f ci/config.mk.clang-12.sed src/auto/config.mk
-          fi
-
-          if ${{ matrix.optimized == true }}; then
-            # Additional optimizations like link-time optimizations that are a bit slower to build.
-            sed -i.bak -f ci/config.mk.optimized.sed src/auto/config.mk
-          fi
-
-      - 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: |
-          NPROC=$(getconf _NPROCESSORS_ONLN)
-          echo "Building MacVim with ${NPROC} cores"
-
-          set -o verbose
-          make ${MAKE_BUILD_ARGS} -j${NPROC}
-
-      - name: Check version
-        run: |
-          ${VIM_BIN} --version
-          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -c 'echo "\nprof_nsec:" .. has("prof_nsec") .. "\n"' -c quit
-          ${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
-        run: |
-          set -o verbose
-
-          # 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 that --disable-sparkle flag will properly exclude all references to Sparkle symbols. This is
-          # necessary because we still use weak linking to Sparkle when that flag is set and so references to Sparkle
-          # wouldn't fail the build (we just remove Sparkle.framework from the built app after the fact).
-          if ${{ matrix.publish == false }}; then
-            # Currently we pass --disable-sparkle flag when publish==false
-            if objdump -t ${MACVIM_BIN} | grep "_SPU\|_SUUpdate"; then
-              echo 'Found references to Sparkle even when using --disable-sparkle'; false
-            fi
-          fi
-
-          # Make sure man pages were bundled
-          man -M `pwd`/${MACVIM_APP}/Contents/man -w mvim
-
-          # Make sure xxd was bundled
-          echo "AB" | ${MACVIM_APP}/Contents/bin/xxd | grep "4142"
-
-      - name: Smoketest (publish)
-        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")'     | grep Test
-          macvim_excmd -c 'perl VIM::Msg("Test")' | grep Test
-          macvim_excmd -c 'py3 print("Test")'     | grep Test
-          macvim_excmd -c 'ruby puts("Test")'     | grep Test
-
-          if [[ "$(uname -m)" == "x86_64" ]]; then
-            macvim_excmd -c 'py print "x86 Test"' | grep Test
-          else
-            # Python2 doesn't work in Apple Silicon, test under Rosetta
-            (VIM_BIN="arch -x86_64 ${VIM_BIN}"; macvim_excmd -c 'py print "rosetta Test"' | grep Test)
-          fi
-
-          # Check that localized messages work by printing ':version' and checking against localized word
-          macvim_excmd -c 'lang es_ES' -c 'version' | grep Enlazado
-
-          # Check that libsodium is working
-          macvim_excmd -c 'set cryptmethod=xchacha20v2'
-
-          # 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[@]} != "$MACVIM_ARCHS" ]]; then
-              echo "Wrong arch(s) in $1: ${archs[@]}"; false
-            else
-              lipo -info "$1"
-            fi
-          }
-          check_arch "${VIM_BIN}"
-          check_arch "${MACVIM_BIN}"
-
-      - name: Check Vim help tags
-        if: contains(matrix.extra, 'vimtags')
-        run: |
-          # Confirm that we can build the help tags, and they match what's in source.
-          make -C runtime/doc vimtags VIMEXE=../../${VIM_BIN}
-          git diff --exit-code -- runtime/doc/tags
-
-      - name: Check Xcode project compatibility version
-        if: contains(matrix.extra, 'check-xcodeproj-compat')
-        run: |
-          # Confirm that the compatibility version of xcodeproj is correct and not outdated.
-          rm -rf src/MacVim/MacVim_xcode8.xcodeproj
-          make -C src macvim-xcodeproj-compat
-          if ! git diff --exit-code -- src/MacVim/MacVim_xcode8.xcodeproj; then
-            echo 'MacVim_xcode8.xcodeproj is outdated. Run "make -C src macvim-xcodeproj-compat" to re-generate it.'; false
-          fi
-
-      - name: Test MacVim
-        timeout-minutes: 10
-        run: |
-          make ${MAKE_BUILD_ARGS} -C src macvim-tests
-
-      - name: Upload failed MacVim test results
-        if: ${{ !cancelled() && failure() }}
-        uses: ./.github/actions/test_macvim_artifacts
-
-      - name: Build Vim test binaries
-        run: |
-          # Build the unit test binaries first. With link-time-optimization they take some time to link. Running them
-          # separately de-couples them from the timeout in tests, and allow us to build in parallel jobs (since tests
-          # can't run in parallel).
-          NPROC=$(getconf _NPROCESSORS_ONLN)
-
-          set -o verbose
-          make ${MAKE_BUILD_ARGS} -j${NPROC} -C src unittesttargets
-
-      - name: Test Vim
-        timeout-minutes: 25
-        run: make ${MAKE_BUILD_ARGS} test
-
-      - name: Upload failed test files
-        if: ${{ !cancelled() && failure() }}
-        uses: ./.github/actions/test_artifacts
-
-      - name: Test Vim (GUI)
-        timeout-minutes: 25
-        run: |
-          make ${MAKE_BUILD_ARGS} -C src/testdir clean
-          make ${MAKE_BUILD_ARGS} -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.
-          if ${{ matrix.legacy == true }}; then
-            make -C src macvim-dmg-legacy CREATEDMG_FLAGS=--skip-jenkins
-          else
-            make -C src macvim-dmg CREATEDMG_FLAGS=--skip-jenkins
-          fi
-
-          if ${{ matrix.publish_postfix != '' }}; then
-            mv src/MacVim/build/Release/MacVim.dmg src/MacVim/build/Release/MacVim${{ matrix.publish_postfix }}.dmg
-          fi
-
-      - name: Upload MacVim image
-        if: startsWith(github.ref, 'refs/tags/') && matrix.publish
-        uses: actions/upload-artifact@v4
-        with:
-          name: MacVim${{ matrix.publish_postfix  }}.dmg
-          path: src/MacVim/build/Release/MacVim${{ matrix.publish_postfix }}.dmg
+    uses: ./.github/workflows/macvim-buildtest.yaml
+    with:
+      skip: ${{ matrix.skip && true || false }}
+      os: ${{ matrix.os }}
+      legacy: ${{ matrix.legacy && true || false }}
+      xcode: ${{ matrix.xcode }}
+      testgui: ${{ matrix.testgui && true || false }}
+      publish: ${{ matrix.publish && true || false }}
+      publish_postfix: ${{ matrix.publish_postfix }}
+      optimized: ${{ matrix.optimized && true || false }}
+      vimtags: ${{ contains(matrix.extra, 'vimtags') }}
+      check-xcodeproj-compat: ${{ contains(matrix.extra, 'check-xcodeproj-compat') }}

.github/workflows/codeql-analysis.yml

@@ -44,11 +44,11 @@ jobs:
 
     steps:
     - name: Checkout repository from github
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,7 +59,7 @@ jobs:
     # 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@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -73,4 +73,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/coverity.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   scan:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     env:
       CC: gcc
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Checkout repository from github
         if: env.TOKEN
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Download Coverity
         if: env.TOKEN
@@ -36,7 +36,6 @@ jobs:
             gettext \
             libcanberra-dev \
             libperl-dev \
-            python2-dev \
             python3-dev \
             liblua5.4-dev \
             lua5.4 \
@@ -53,7 +52,7 @@ jobs:
           echo "$(pwd)/cov-scan/bin" >> $GITHUB_PATH
           (
           echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
-          echo "CONFOPT=--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
+          echo "CONFOPT=--enable-perlinterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
           ) >> $GITHUB_ENV
 
       - name: Configure

.github/workflows/label.yml

@@ -17,6 +17,6 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@v6
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/link-check.yml

@@ -0,0 +1,15 @@
+# .github/workflows/link-check.yml
+name: Check Links
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 3 * * 0' # Every Sunday at 03:00 UTC
+jobs:
+  lychee:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Run Lychee
+        uses: lycheeverse/lychee-action@v2
+        with:
+          args: --verbose --config ci/lychee.toml .

.github/workflows/macvim-buildtest.yaml

@@ -0,0 +1,444 @@
+name: MacVim Build and Test
+
+# Child workflow to be called by other workflows for building/testing MacVim
+
+on:
+  workflow_call:
+    inputs:
+      skip:
+        type: boolean
+      os:
+        type: string
+      legacy:
+        type: boolean
+      xcode:
+        type: string
+      testgui:
+        type: boolean
+      publish:
+        type: boolean
+      publish_postfix:
+        type: string
+      optimized:
+        type: boolean
+      vimtags:
+        type: boolean
+      check-xcodeproj-compat:
+        type: boolean
+
+env:
+  MACOSX_DEPLOYMENT_TARGET: '10.13'
+  MACOSX_DEPLOYMENT_TARGET_LEGACY: '10.9'
+
+  MACVIM_ARCHS: "x86_64 arm64"  # Universal app for Intel/Apple Silicon
+  MACVIM_ARCHS_LEGACY: "x86_64 arm64" # Build universal for legacy too, mostly just to make building/testing on Apple Silicon CI work. In reality all Apple Silicon Macs shoud use non-legacy.
+
+  CC: clang
+
+  MAKE_BUILD_ARGS: LINK_AS_NEEDED=yes # In macOS we never over-specify link dependencies and we already check against external deps in smoketest. With LTO, linking takes a while, so we want to avoid using link.sh.
+
+  vi_cv_path_python: /Library/Frameworks/Python.framework/Versions/2.7/bin/python
+  vi_cv_path_python3: "%s/bin/python3"
+  vi_cv_path_plain_lua: "%s/bin/lua"
+  vi_cv_path_ruby: "%s/opt/ruby/bin/ruby"
+  vi_cv_dll_name_perl: /System/Library/Perl/%s/darwin-thread-multi-2level/CORE/libperl.dylib
+  vi_cv_dll_name_python: /Library/Frameworks/Python.framework/Versions/2.7/Python
+  vi_cv_dll_name_python3: /usr/local/Frameworks/Python.framework/Versions/Current/Python
+  vi_cv_dll_name_python3_arm64: /opt/homebrew/Frameworks/Python.framework/Versions/Current/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: /usr/local/lib/liblua.dylib
+  vi_cv_dll_name_lua_arm64: /opt/homebrew/lib/liblua.dylib
+
+  MACVIM_APP: src/MacVim/build/Release/MacVim.app
+  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:
+    if: ${{ !inputs.skip }}
+    runs-on: ${{ inputs.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up legacy build
+        if: inputs.legacy
+        run: |
+          # Set the correct build env vars to target the correct architectures and min OS targets.
+          echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET_LEGACY" >> $GITHUB_ENV
+          echo "MACVIM_ARCHS=$MACVIM_ARCHS_LEGACY" >> $GITHUB_ENV
+
+          # Use Sparkle 1 because Sparkle 2 requires newer OS version than our legacy build.
+          # Later, we pass the --enable-sparkle_1 flag to configure to set the corresponding ifdef.
+          ln -fhs Sparkle_1.framework src/MacVim/Sparkle.framework
+
+          # Sparkle shows a dialog asking if the user wants to check for updates on 2nd launch of
+          # MacVim. On Sparkle 1 this is annoyingly a modal dialog box and interferes with tests.
+          # Just disable it by pre-setting to not check for updates.
+          defaults write org.vim.MacVim SUEnableAutomaticChecks 0
+
+      - name: Set up Xcode
+        if: inputs.xcode != ''
+        run: |
+          sudo xcode-select -s /Applications/Xcode_${{ inputs.xcode }}.app/Contents/Developer
+          xcode-select -p
+          xcodebuild -version
+
+      # Set up, install, and cache GNU libiconv library to work around Apple iconv issues.
+
+      - name: Set up libiconv
+        if: inputs.publish
+        uses: ./.github/actions/universal-package
+        with:
+          formula: libiconv
+          contents: opt/libiconv/lib/libiconv.a,opt/libiconv/lib/libiconv.dylib
+
+      # Set up, install, and cache gettext library for localization.
+
+      - name: Set up gettext
+        if: inputs.publish
+        uses: ./.github/actions/universal-package
+        with:
+          formula: gettext
+          contents: lib/libintl.a,lib/libintl.dylib
+          gnuiconv: true  # gettext needs to match MacVim in using the same version of iconv
+
+      # Set up, install, and cache libsodium library for encryption.
+
+      - name: Set up libsodium
+        if: inputs.publish
+        uses: ./.github/actions/universal-package
+        with:
+          formula: libsodium
+          contents: lib/libsodium.a,lib/libsodium.dylib
+
+      # Set up remaining packages and tools
+
+      - name: Install packages
+        run: |
+          brew install --quiet libtool
+
+      - name: Install packages for testing
+        run: |
+          # Apple diff is broken. Use GNU diff instead. See http://github.com/vim/vim/issues/14056.
+          brew install --quiet diffutils
+
+      # Cache Python 2 to avoid downloading the installer every time. This cache shouldn't change
+      # over time as Python 2.7 is legacy.  Can't directly cache to
+      # /Library/Frameworks/Python.framework due to permission issues.
+      #
+      # Note: Legacy self-hosted runner already has this installed and doesn't need this.
+      - name: Cache Python 2
+        if: inputs.publish && !inputs.legacy
+        uses: actions/cache@v5
+        with:
+          path: python27-cache
+          key: ${{ inputs.os }}-python27
+
+      - name: Install scripting runtimes
+        if: inputs.publish
+        run: |
+          # We no longer need to install/update Python 3, as it's guaranteed to
+          # be installed on runners. Since we use stable ABI, the exact version
+          # on CI does not matter.
+
+          brew install --quiet ruby
+          brew install --quiet lua
+
+          if [[ -d $(brew --prefix)/Cellar/perl ]]; then
+            # We just use system perl to reduce dependencies
+            brew unlink perl
+          fi
+
+          echo "vi_cv_path_python3=$(printf $vi_cv_path_python3 $(brew --prefix))" >> $GITHUB_ENV
+          echo "vi_cv_path_plain_lua=$(printf $vi_cv_path_plain_lua $(brew --prefix))" >> $GITHUB_ENV
+          echo "vi_cv_path_ruby=$(printf $vi_cv_path_ruby $(brew --prefix))" >> $GITHUB_ENV
+
+          # With Perl, we need to manually specify the version number because the dylib path depends on it.
+          export PERL_VERSION=$(perl -e 'print $^V =~ s/v(\d\.\d+).*/\1/r')
+          echo "vi_cv_dll_name_perl=$(printf $vi_cv_dll_name_perl $PERL_VERSION)" >> $GITHUB_ENV
+
+          # New runner images (macos-13) no longer have Python2 installed. We
+          # need to install Python2 manually. Installing from the official
+          # installer is the easiest way as Homebrew no longer ships python@2
+          # and this way does not invole manual building from source. We
+          # mostly only need the headers to build a dynamic build anyway.
+          #
+          # This will be removed in the future as Python2 has been completely
+          # unsupported for years.
+          if [ -d /Library/Frameworks/Python.framework/Versions/2.7 ]; then
+            echo "Python 2.7 already installed"
+          elif [ -d python27-cache ]; then
+            sudo cp -R python27-cache /Library/Frameworks/Python.framework/Versions/2.7
+          else
+            curl https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg -o ~/Downloads/python-2.7.18-macosx10.9.pkg
+            sudo installer -pkg ~/Downloads/python-2.7.18-macosx10.9.pkg -target /
+            cp -R /Library/Frameworks/Python.framework/Versions/2.7 python27-cache # Allow this to be cached
+          fi
+
+      # All set up steps are done. Build and test MacVim below.
+
+      - name: Configure
+        run: |
+          set -o verbose
+
+          CONFOPT=(
+            --with-local-dir=$(brew --prefix)
+            --with-features=huge
+            --enable-netbeans
+            --with-tlib=ncurses
+            --enable-cscope
+            --enable-gui=macvim
+            --with-compiledby="GitHub Actions"
+          )
+          if ${{ inputs.publish == true }}; then
+            CONFOPT+=(
+              --enable-perlinterp=dynamic
+              --enable-pythoninterp=dynamic
+              --enable-python3interp=dynamic
+              --with-python3-stable-abi=3.9 # macOS and Xcode currently ships 3.9, so we don't want go higher than that.
+              --enable-rubyinterp=dynamic
+              --enable-luainterp=dynamic
+              --with-lua-prefix=$(brew --prefix)
+              --with-macarchs="$MACVIM_ARCHS"
+            )
+          else
+            CONFOPT+=(
+              --disable-sparkle       # Disable Sparkle for testing that this flag builds and works
+              --enable-nls=no --enable-libsodium=no # Disable gettext and libsodium unless we built them ourselves for publish
+            )
+          fi
+          if ${{ inputs.legacy == true }}; then
+            CONFOPT+=(
+              --enable-sparkle_1
+            )
+          fi
+          echo "CONFOPT: ${CONFOPT[@]}"
+
+          ./configure "${CONFOPT[@]}" --enable-fail-if-missing
+
+          sed -i.bak -f ci/config.mk.sed -f ci/config.mk.clang.sed -f ci/config.mk.xcode.sed src/auto/config.mk
+          if clang --version | grep -qs '^Apple clang version \(1[3-9]\|[2-9]\d\)\.'; then
+            sed -i.bak -f ci/config.mk.clang-12.sed src/auto/config.mk
+          fi
+
+          if ${{ inputs.optimized == true }}; then
+            # Additional optimizations like link-time optimizations that are a bit slower to build.
+            sed -i.bak -f ci/config.mk.optimized.sed src/auto/config.mk
+          fi
+
+          # Use Homebrew GNU libiconv since Apple iconv has been broken since macOS 14
+          sed -i.bak -f ci/config.mk.brew-libiconv.sed src/auto/config.mk
+
+      - name: Modify configure result
+        if: inputs.publish
+        run: |
+          set -o verbose
+          # 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: |
+          NPROC=$(getconf _NPROCESSORS_ONLN)
+          echo "Building MacVim with ${NPROC} cores"
+
+          set -o verbose
+          make ${MAKE_BUILD_ARGS} -j${NPROC}
+
+      - name: Check version
+        run: |
+          ${VIM_BIN} --version
+          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -c 'echo "\nprof_nsec:" .. has("prof_nsec") .. "\n"' -c quit
+          ${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
+        run: |
+          set -o verbose
+
+          # 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 not using system iconv, which has been buggy since macOS 14.
+          if otool -L ${VIM_BIN} | grep '^\s*/usr/lib/libiconv'; then
+            echo 'Using system iconv! We should be linking against GNU iconv instead.'; false
+          fi
+
+          # Make sure that --disable-sparkle flag will properly exclude all references to Sparkle symbols. This is
+          # necessary because we still use weak linking to Sparkle when that flag is set and so references to Sparkle
+          # wouldn't fail the build (we just remove Sparkle.framework from the built app after the fact).
+          if ${{ inputs.publish == false }}; then
+            # Currently we pass --disable-sparkle flag when publish==false
+            if objdump -t ${MACVIM_BIN} | grep "_SPU\|_SUUpdate"; then
+              echo 'Found references to Sparkle even when using --disable-sparkle'; false
+            fi
+          fi
+
+          # Make sure man pages were bundled
+          man -M `pwd`/${MACVIM_APP}/Contents/man -w mvim
+
+          # Make sure xxd was bundled
+          echo "AB" | ${MACVIM_APP}/Contents/bin/xxd | grep "4142"
+
+      - name: Smoketest (publish)
+        if: inputs.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")'     | grep Test
+          macvim_excmd -c 'perl VIM::Msg("Test")' | grep Test
+          macvim_excmd -c 'py3 print("Test")'     | grep Test
+          macvim_excmd -c 'ruby puts("Test")'     | grep Test
+
+          if [[ "$(uname -m)" == "x86_64" ]]; then
+            macvim_excmd -c 'py print "x86 Test"' | grep Test
+          else
+            # Python2 doesn't work in Apple Silicon, test under Rosetta
+            (VIM_BIN="arch -x86_64 ${VIM_BIN}"; macvim_excmd -c 'py print "rosetta Test"' | grep Test)
+          fi
+
+          # Check that localized messages work by printing ':version' and checking against localized word
+          macvim_excmd -c 'lang es_ES' -c 'version' | grep Enlazado
+
+          # Check that libsodium is working
+          macvim_excmd -c 'set cryptmethod=xchacha20v2'
+
+          # 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[@]} != "$MACVIM_ARCHS" ]]; then
+              echo "Wrong arch(s) in $1: ${archs[@]}"; false
+            else
+              lipo -info "$1"
+            fi
+          }
+          check_arch "${VIM_BIN}"
+          check_arch "${MACVIM_BIN}"
+
+      - name: Check Vim help tags
+        if: inputs.vimtags
+        run: |
+          # Confirm that we can build the help tags, and they match what's in source.
+          make -C runtime/doc vimtags VIMEXE=../../${VIM_BIN}
+          git diff --exit-code -- runtime/doc/tags
+
+      - name: Check Xcode project compatibility version
+        if: inputs['check-xcodeproj-compat']
+        run: |
+          # Confirm that the compatibility version of xcodeproj is correct and not outdated.
+          rm -rf src/MacVim/MacVim_xcode8.xcodeproj
+          make -C src macvim-xcodeproj-compat
+          if ! git diff --exit-code -- src/MacVim/MacVim_xcode8.xcodeproj; then
+            echo 'MacVim_xcode8.xcodeproj is outdated. Run "make -C src macvim-xcodeproj-compat" to re-generate it.'; false
+          fi
+
+      - name: Test MacVim
+        id: test_macvim
+        timeout-minutes: 10
+        run: |
+          echo '::group::Build MacVim test binaries'
+          # Build test binaries in a separate step to allow grouping in the CI output to make the output more concise.
+          make ${MAKE_BUILD_ARGS} -C src macvim-tests-binaries
+          echo '::endgroup::'
+          make ${MAKE_BUILD_ARGS} -C src macvim-tests
+
+      - name: Upload failed MacVim test results
+        if: ${{ !cancelled() && failure() && steps.test_macvim.conclusion == 'failure' }}
+        uses: ./.github/actions/test_macvim_artifacts
+        with:
+          artifact-name: ${{ format('{0}-{1}', inputs.os, inputs.xcode) }}
+
+      - name: Build Vim test binaries
+        run: |
+          # Build the unit test binaries first. With link-time-optimization they take some time to link. Running them
+          # separately de-couples them from the timeout in tests, and allow us to build in parallel jobs (since tests
+          # can't run in parallel).
+          NPROC=$(getconf _NPROCESSORS_ONLN)
+
+          set -o verbose
+          make ${MAKE_BUILD_ARGS} -j${NPROC} -C src unittesttargets
+
+      - name: Test Vim
+        if: startsWith(github.ref, 'refs/tags/') || !inputs.testgui
+        timeout-minutes: 30
+        run: |
+          defaults delete org.vim.MacVim  # Clean up stale states
+          # Currently we don't run any non-src tests, as syntax tests are fragile and prone to spamming escape codes.
+          # This needs to be investigated and fixed upstream.
+          # MacVim is unlikely to introduce breaking changes in runtime files anyway.
+          make ${MAKE_BUILD_ARGS} -C src test
+
+      - name: Test Vim (GUI)
+        if: startsWith(github.ref, 'refs/tags/') || inputs.testgui
+        timeout-minutes: 30
+        run: |
+          defaults delete org.vim.MacVim  # Clean up stale states
+          make ${MAKE_BUILD_ARGS} -C src/testdir clean
+          make ${MAKE_BUILD_ARGS} -C src testgui
+
+      - name: Upload failed test files
+        if: ${{ !cancelled() && failure() }}
+        uses: ./.github/actions/test_artifacts
+        with:
+          artifact-name: ${{ format('{0}-{1}', inputs.os, inputs.xcode) }}
+
+      - name: Build MacVim dmg image
+        if: inputs.publish && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master')
+        run: |
+          if ${{ inputs.legacy == true }}; then
+            make -C src macvim-dmg-legacy
+          else
+            make -C src macvim-dmg
+          fi
+
+          if ${{ inputs.publish_postfix != '' }}; then
+            mv src/MacVim/build/Release/MacVim.dmg src/MacVim/build/Release/MacVim${{ inputs.publish_postfix }}.dmg
+          fi
+
+      # Upload the dmg installer only when making tagged release or making a dev build from a master branch.
+      # 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: Upload MacVim image
+        if: inputs.publish && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master')
+        uses: actions/upload-artifact@v6
+        with:
+          name: MacVim${{ inputs.publish_postfix  }}.dmg
+          path: src/MacVim/build/Release/MacVim${{ inputs.publish_postfix }}.dmg
+
+          # If doing a tagged release, use repository-specified number of retention days (usually 90 days) to make it
+          # easier to audit. (specify "0" to indicate using repository settings)
+          #
+          # Otherwise, we are just doing a dev build for potential testing, just use a maximum of 21 days as we don't
+          # tend to need these for long.
+          retention-days: ${{ startsWith(github.ref, 'refs/tags/') && 0 || (github.retention_days > 21 && 21 || 0) }}

.github/workflows/macvim-issues.yaml

@@ -10,7 +10,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           any-of-labels: "Response Needed"
           days-before-stale: 45

.gitignore

@@ -11,6 +11,7 @@ src/objects
 src/po/big5corr
 src/po/sjiscorr
 src/types.vim
+src/tmp_make
 
 # We do need src/auto/configure.
 src/auto/config.cache
@@ -22,6 +23,8 @@ src/auto/osdef.h
 src/auto/link.log
 src/auto/link.sed
 src/auto/pathdef.c
+src/auto/wayland/*.c
+src/auto/wayland/*.h
 
 # Windows
 *.exe
@@ -64,7 +67,6 @@ src/xxd/xxd.dSYM
 *~
 *.pyc
 *.log
-src/po/vim.pot
 src/tags
 /tags
 /GPATH
@@ -148,6 +150,11 @@ src/xxd/xxd
 src/xxd/xxd.dSYM
 src/a.out.dSYM
 
+runtime/syntax/testdir/done/
+runtime/syntax/testdir/messages
+runtime/syntax/testdir/testdeps.mk
+runtime/syntax/testdir/vimcmd
+
 # Generated by "make install"
 runtime/doc/doctags
 runtime/doc/tags-*
@@ -163,6 +170,8 @@ src/shadow
 src/shadow-*
 src/runtime
 src/pixmaps
+src/LICENSE
+src/README.txt
 
 # other files possibly created by tools
 src/cscope.out

.hgignore

@@ -24,6 +24,8 @@ src/auto/osdef.h
 src/auto/link.log
 src/auto/link.sed
 src/auto/pathdef.c
+src/auto/wayland/*.c
+src/auto/wayland/*.h
 
 # Windows
 *.exe
@@ -66,7 +68,6 @@ src/xxd/xxd.dSYM
 *~
 *.pyc
 *.log
-src/po/vim.pot
 src/tags
 /tags
 /GPATH
@@ -98,21 +99,33 @@ src/json_test
 src/message_test
 src/kword_test
 
+runtime/syntax/testdir/done/
+runtime/syntax/testdir/messages
+runtime/syntax/testdir/testdeps.mk
+runtime/syntax/testdir/vimcmd
+
 # Generated by "make install"
 runtime/doc/doctags
 runtime/doc/tags-*
 
+# Temporarily generated by "runtime/syntax/generator/make"
+runtime/syntax/generator/generator.err
+runtime/syntax/generator/sanity_check.err
+runtime/syntax/generator/vim.vim.rc
+
 # 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
+src/LICENSE
+src/README.txt
 
 # other files possibly created by tools
 src/cscope.out
 
 # Linter/language server files
-/.cache/clangd/
-/.ccls-cache/
-/compile_commands.json
+.cache/clangd/
+.ccls-cache/
+compile_commands.json

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 Patches are welcome in whatever form.
 Discussions about patches happen on the [vim-dev][0] mailing list.
 If you create a pull request on GitHub it will be
-forwarded to the vim-dev mailing list.  You can also send your patch there
+forwarded to the vim-dev mailing list. You can also send your patch there
 directly (but please note, the initial posting is subject to moderation).
 In that case an attachment with a unified diff format is preferred.
 Information about the mailing list can be found [on the Vim website][0]
@@ -12,23 +12,57 @@ 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".
+Please always add a test, if possible. 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
+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.
+does not cause us trouble with trademarks or patents. There is no CLA to sign.
+
+## Signing-off commits
+
+While not required, it's recommended to use **Signed-off commits** to ensure
+transparency, accountability, and compliance with open-source best practices.
+Signed-off commits follow the [Developer Certificate of Origin (DCO)][15],
+which confirms that contributors have the right to submit their changes under
+the project's license. This process adds a `Signed-off-by` line to commit
+messages, verifying that the contributor agrees to the project's licensing
+terms. To sign off a commit, simply use the -s flag when committing:
+
+```sh
+git commit -s
+```
+
+This ensures that every contribution is properly documented and traceable,
+aligning with industry standards used in projects like the Linux Kernel or
+the git project. By making Signed-off commits a standard practice, we help
+maintain a legally compliant and well-governed codebase while fostering trust
+within our contributor community.
+
+When merging PRs into Vim, the current maintainer @chrisbra usually adds missing
+`Signed-off-by` trailers for the author user name and email address as well for
+anybody that explicitly *ACK*s a pull request as a statement that those
+approvers are happy with that particular change.
+
+## Using AI
+
+When using AI for contributions, please disclose this. Any AI-generated code
+must follow the Vim code style. In particular, [test_codestyle.vim][18]
+must not report any failures. Check the CI output for any test failures.
+
+Ensure that changes are properly tested. Do not submit a single PR that
+addresses multiple unrelated issues.
 
 # Reporting issues
 
-We use GitHub issues, but that is not a requirement.  Writing to the Vim
+We use GitHub [issues][17], but that is not a requirement. Writing to the Vim
 mailing list 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
-mailing list.  Try reproducing the problem without any of your plugins or settings:
+mailing list. Try reproducing the problem without any of your plugins or settings:
 
     vim --clean
 
@@ -46,40 +80,57 @@ Or open [the todo file][todo list] on GitHub to see the latest version.
 # Syntax, indent and other runtime files
 
 The latest version of these files can be obtained from the repository.
-They are usually not updated with numbered patches. However, they may 
-or may not work with older Vim releases (since they may contain new features).
+They are usually not updated with numbered patches. However, they may
+or may not work with older Vim releases (since they may depend on new
+features).
 
 If you find a problem with one of these files or have a suggestion for
 improvement, please first try to contact the maintainer directly.
 Look in the header of the file for the name, email address, github handle and/or
-upstream repository.  You may also check the [MAINTAINERS][11] file.
+upstream repository. You may also check the [MAINTAINERS][11] file.
 
 The maintainer will take care of issues and send updates to the Vim project for
 distribution with Vim.
 
-If the maintainer does not respond, contact the [vim-dev][0] mailing list.
+If the maintainer does not respond, contact the [vim-dev][0] mailing list or
+open an [issue][17] here.
+
+Note: Whether or not to use Vim9 script is up to the maintainer. For runtime
+files maintained here, we aim to preserve compatibility with Neovim if
+possible. Please wrap Vim9 script with a guard like this:
+```vim
+if has('vim9script')
+   " use Vim9 script implementation
+   [...]
+endif
+```
 
 ## Contributing new runtime files
 
 If you want to contribute new runtime files for Vim or Neovim, please create a
 PR with your changes against this repository here. For new filetypes, do not forget:
-* to add a new [filetype test][12] (keep it similar to the other filetype tests).
-* all configuration switches should be documented
+
+- to add a new [filetype test][12] (keep it similar to the other filetype tests).
+- all configuration switches should be documented
   (check [filetype.txt][13] and/or [syntax.txt][14] for filetype and syntax plugins)
-* add yourself as Maintainer to the top of file (again, keep the header similar to
+- add yourself as Maintainer to the top of file (again, keep the header similar to
   other runtime files)
-* add yourself to the [MAINTAINERS][11] file.
+- add yourself to the [MAINTAINERS][11] file.
+- add a guard `if has('vim9script')` if you like to maintain Neovim
+  compatibility but want to use Vim9 script (or restrict yourself to legacy Vim
+  script)
 
 # Translations
 
-Translating messages and runtime files is very much appreciated!  These things
+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
+
+- 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/README.txt][5]
 
 The help files can be translated and made available separately.
 See https://www.vim.org/translations.php for examples.
@@ -88,9 +139,11 @@ See https://www.vim.org/translations.php for examples.
 
 Please have a look at the following [discussion][6], which should give you some
 ideas. Please also check the [develop.txt][7] helpfile for the recommended
-style. Often it's also beneficial to check the surrounding code for the style
+coding style. Often it's also beneficial to check the surrounding code for the style
 being used.
 
+For the recommended documentation style, please check [helphelp.txt][16].
+
 # I have a question
 
 If you have some question on the style guide, please contact the [vim-dev][0]
@@ -103,7 +156,7 @@ mailing list. For other questions please use the [Vi Stack Exchange][8] website,
 [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
+[5]: https://github.com/vim/vim/blob/master/nsis/lang/README.txt
 [6]: https://github.com/vim/vim/discussions/13087
 [7]: https://github.com/vim/vim/blob/master/runtime/doc/develop.txt
 [8]: https://vi.stackexchange.com
@@ -113,3 +166,7 @@ mailing list. For other questions please use the [Vi Stack Exchange][8] website,
 [12]: https://github.com/vim/vim/blob/master/src/testdir/test_filetype.vim
 [13]: https://github.com/vim/vim/blob/master/runtime/doc/filetype.txt
 [14]: https://github.com/vim/vim/blob/master/runtime/doc/syntax.txt
+[15]: https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin
+[16]: https://github.com/vim/vim/blob/master/runtime/doc/helphelp.txt
+[17]: https://github.com/vim/vim/issues
+[18]: https://github.com/vim/vim/blob/master/src/testdir/test_codestyle.vim

Filelist

@@ -12,6 +12,7 @@ SRC_ALL =	\
 		.github/workflows/ci.yml \
 		.github/workflows/codeql-analysis.yml \
 		.github/workflows/coverity.yml \
+		.github/workflows/link-check.yml \
 		.github/actions/test_artifacts/action.yml \
 		.github/dependabot.yml \
 		.gitignore \
@@ -23,8 +24,13 @@ SRC_ALL =	\
 		ci/appveyor.bat \
 		ci/config.mk*.sed \
 		ci/if_ver*.vim \
+		ci/if_feat_check.vim \
+		ci/lychee.toml \
 		ci/setup-xvfb.sh \
+		ci/setup-sway.sh \
 		ci/remove_snap.sh \
+		ci/ddebs.list \
+		ci/pinned-pkgs \
 		src/Make_all.mak \
 		src/README.md \
 		src/alloc.c \
@@ -52,6 +58,7 @@ SRC_ALL =	\
 		src/debugger.c \
 		src/dict.c \
 		src/diff.c \
+		src/linematch.c \
 		src/digraph.c \
 		src/drawline.c \
 		src/drawscreen.c \
@@ -75,6 +82,7 @@ SRC_ALL =	\
 		src/findfile.c \
 		src/float.c \
 		src/fold.c \
+		src/fuzzy.c \
 		src/getchar.c \
 		src/gc.c \
 		src/globals.h \
@@ -146,6 +154,7 @@ SRC_ALL =	\
 		src/strings.c \
 		src/structs.h \
 		src/syntax.c \
+		src/tabpanel.c \
 		src/tag.c \
 		src/term.c \
 		src/terminal.c \
@@ -156,6 +165,7 @@ SRC_ALL =	\
 		src/textobject.c \
 		src/textprop.c \
 		src/time.c \
+		src/tuple.c \
 		src/typval.c \
 		src/ui.c \
 		src/undo.c \
@@ -170,6 +180,7 @@ SRC_ALL =	\
 		src/vim9compile.c \
 		src/vim9execute.c \
 		src/vim9expr.c \
+		src/vim9generics.c \
 		src/vim9instr.c \
 		src/vim9script.c \
 		src/vim9type.c \
@@ -177,62 +188,70 @@ SRC_ALL =	\
 		src/winclip.c \
 		src/window.c \
 		src/xxd/xxd.c \
-		src/testdir/gen_opt_test.vim \
-		src/testdir/README.txt \
-		src/testdir/Make_all.mak \
 		src/testdir/*.in \
 		src/testdir/*.py \
-		src/testdir/keycode_check.vim \
-		src/testdir/keycode_check.json \
-		src/testdir/lsan-suppress.txt \
-		src/testdir/sautest/autoload/*.vim \
-		src/testdir/testluaplugin/lua/testluaplugin/*.lua \
-		src/testdir/check.vim \
+		src/testdir/Make_all.mak \
+		src/testdir/README.txt \
 		src/testdir/commondumps.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/viewdumps.vim \
-		src/testdir/test[0-9]*.ok \
-		src/testdir/test77a.ok \
-		src/testdir/test77a.com \
-		src/testdir/test_*.vim \
+		src/testdir/crash/* \
+		src/testdir/dumps/*.dump \
+		src/testdir/dumps/*.vim \
+		src/testdir/keycode_check.json \
+		src/testdir/keycode_check.vim \
+		src/testdir/lsan-suppress.txt \
 		src/testdir/python2/*.py \
 		src/testdir/python3/*.py \
+		src/testdir/python_after/*.py \
+		src/testdir/python_before/*.py \
 		src/testdir/pythonx/*.py \
 		src/testdir/pythonx/topmodule/__init__.py \
 		src/testdir/pythonx/topmodule/submodule/__init__.py \
 		src/testdir/pythonx/topmodule/submodule/subsubmodule/__init__.py \
 		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/dumps/*.vim \
+		src/testdir/ru_RU/LC_MESSAGES/Makefile \
+		src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo \
+		src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.po \
+		src/testdir/runtest.vim \
 		src/testdir/samples/*.html \
 		src/testdir/samples/*.txt \
 		src/testdir/samples/*.vim \
-		src/testdir/samples/test000 \
+		src/testdir/samples/evil.zip \
+		src/testdir/samples/evil.tar \
+		src/testdir/samples/poc.zip \
+		src/testdir/samples/sample.tar \
 		src/testdir/samples/test.zip \
+		src/testdir/samples/test000 \
 		src/testdir/samples/test_undo.txt.undo \
 		src/testdir/samples/testa.zip \
-		src/testdir/color_ramp.vim \
+		src/testdir/sautest/autoload/*.vim \
 		src/testdir/silent.wav \
-		src/testdir/popupbounce.vim \
-		src/testdir/crash/* \
-		src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo \
+		src/testdir/test77a.com \
+		src/testdir/test77a.ok \
+		src/testdir/test[0-9]*.ok \
+		src/testdir/test_*.vim \
+		src/testdir/testluaplugin/lua/testluaplugin/*.lua \
+		src/testdir/util/check.vim \
+		src/testdir/util/color_ramp.vim \
+		src/testdir/util/gen_opt_test.vim \
+		src/testdir/util/gui_init.vim \
+		src/testdir/util/gui_preinit.vim \
+		src/testdir/util/mouse.vim \
+		src/testdir/util/popupbounce.vim \
+		src/testdir/util/screendump.vim \
+		src/testdir/util/script_util.vim \
+		src/testdir/util/setup.vim \
+		src/testdir/util/setup_gui.vim \
+		src/testdir/util/shared.vim \
+		src/testdir/util/summarize.vim \
+		src/testdir/util/term_util.vim \
+		src/testdir/util/view_util.vim \
+		src/testdir/util/vim9.vim \
+		src/testdir/util/window_manager.vim \
+		src/testdir/viewdumps.vim \
 		src/proto.h \
 		src/protodef.h \
+		src/proto/gen_prototypes.py \
 		src/proto/alloc.pro \
 		src/proto/arabic.pro \
 		src/proto/arglist.pro \
@@ -274,6 +293,7 @@ SRC_ALL =	\
 		src/proto/findfile.pro \
 		src/proto/float.pro \
 		src/proto/fold.pro \
+		src/proto/fuzzy.pro \
 		src/proto/getchar.pro \
 		src/proto/gc.pro \
 		src/proto/gui.pro \
@@ -286,6 +306,7 @@ SRC_ALL =	\
 		src/proto/insexpand.pro \
 		src/proto/job.pro \
 		src/proto/json.pro \
+		src/proto/linematch.pro \
 		src/proto/list.pro \
 		src/proto/locale.pro \
 		src/proto/logfile.pro \
@@ -325,6 +346,7 @@ SRC_ALL =	\
 		src/proto/spellsuggest.pro \
 		src/proto/strings.pro \
 		src/proto/syntax.pro \
+		src/proto/tabpanel.pro \
 		src/proto/tag.pro \
 		src/proto/term.pro \
 		src/proto/terminal.pro \
@@ -334,6 +356,7 @@ SRC_ALL =	\
 		src/proto/textobject.pro \
 		src/proto/textprop.pro \
 		src/proto/time.pro \
+		src/proto/tuple.pro \
 		src/proto/typval.pro \
 		src/proto/ui.pro \
 		src/proto/undo.pro \
@@ -345,6 +368,7 @@ SRC_ALL =	\
 		src/proto/vim9compile.pro \
 		src/proto/vim9execute.pro \
 		src/proto/vim9expr.pro \
+		src/proto/vim9generics.pro \
 		src/proto/vim9instr.pro \
 		src/proto/vim9script.pro \
 		src/proto/vim9type.pro \
@@ -477,6 +501,12 @@ SRC_UNIX =	\
 		src/gui_xmebwp.h \
 		src/gui_x11.c \
 		src/gui_x11_pm.h \
+		src/auto/wayland/README.txt \
+		src/auto/wayland/Makefile \
+		src/auto/wayland/protocols/ext-data-control-v1.xml \
+		src/auto/wayland/protocols/wlr-data-control-unstable-v1.xml \
+		src/auto/wayland/protocols/xdg-shell.xml \
+		src/auto/wayland/protocols/primary-selection-unstable-v1.xml \
 		src/if_xcmdsrv.c \
 		src/link.sh \
 		src/installman.sh \
@@ -495,18 +525,22 @@ SRC_UNIX =	\
 		src/proto/gui_motif.pro \
 		src/proto/gui_xmdlg.pro \
 		src/proto/gui_x11.pro \
+		src/proto/wayland.pro \
 		src/proto/if_xcmdsrv.pro \
 		src/proto/os_unix.pro \
 		src/proto/pty.pro \
 		src/pty.c \
 		src/testdir/Makefile \
-		src/testdir/unix.vim \
+		src/testdir/util/unix.vim \
 		src/toolcheck \
 		src/vim_icon.xbm \
 		src/vim_mask.xbm \
 		src/vimtutor \
 		src/gvimtutor \
+		src/wayland.c \
+		src/wayland.h \
 		src/which.sh \
+		src/gen-wayland-protocols.sh \
 		src/xxd/Makefile \
 
 # Source files for both MS Windows and Unix-like.
@@ -517,7 +551,6 @@ SRC_DOS_UNIX =	\
 		src/if_mzsch.c \
 		src/if_mzsch.h \
 		src/if_perl.xs \
-		src/if_perlsfio.c \
 		src/if_python.c \
 		src/if_python3.c \
 		src/if_py_both.h \
@@ -528,7 +561,6 @@ SRC_DOS_UNIX =	\
 		src/proto/if_lua.pro \
 		src/proto/if_mzsch.pro \
 		src/proto/if_perl.pro \
-		src/proto/if_perlsfio.pro \
 		src/proto/if_python.pro \
 		src/proto/if_python3.pro \
 		src/proto/if_ruby.pro \
@@ -537,6 +569,7 @@ SRC_DOS_UNIX =	\
 
 # Source files for MS Windows (also in the extra archive).
 SRC_DOS =	\
+		src/auto/nmake/tools.mak \
 		src/GvimExt/*.mak \
 		src/GvimExt/GvimExt.reg \
 		src/GvimExt/Makefile \
@@ -592,7 +625,7 @@ SRC_DOS =	\
 		src/testdir/Make_dos.mak \
 		src/testdir/Make_mvc.mak \
 		src/testdir/Make_ming.mak \
-		src/testdir/dos.vim \
+		src/testdir/util/dos.vim \
 		src/uninstall.c \
 		src/vim.rc \
 		src/vim.manifest \
@@ -605,8 +638,10 @@ SRC_DOS =	\
 		src/tee/tee.c \
 		src/xxd/Make_ming.mak \
 		src/xxd/Make_mvc.mak \
+		nsis/auxiliary.nsh \
 		nsis/gvim.nsi \
-		nsis/gvim_version.nsh \
+		nsis/Makefile \
+		nsis/Make_mvc.mak \
 		nsis/README.txt \
 		nsis/lang/*.nsi \
 		nsis/lang/README.txt \
@@ -643,7 +678,7 @@ SRC_AMI =	\
 		src/os_amiga.h \
 		src/proto/os_amiga.pro \
 		src/testdir/Make_amiga.mak \
-		src/testdir/amiga.vim \
+		src/testdir/util/amiga.vim \
 		src/xxd/Make_amiga.mak \
 
 # Source files for Haiku (also in the extra archive).
@@ -674,7 +709,7 @@ SRC_VMS =	\
 		src/os_vms_mms.c \
 		src/proto/os_vms.pro \
 		src/testdir/Make_vms.mms \
-		src/testdir/vms.vim \
+		src/testdir/util/vms.vim \
 		src/xxd/Make_vms.mms \
 		vimtutor.com \
 
@@ -708,8 +743,6 @@ RT_ALL =	\
 		README_VIM9.md \
 		LICENSE \
 		CONTRIBUTING.md \
-		lang/LICENSE.itx \
-		lang/README.itx \
 		runtime/bugreport.vim \
 		runtime/doc/*.awk \
 		runtime/doc/*.pl \
@@ -769,8 +802,8 @@ RT_ALL =	\
 		runtime/tutor/tutor1 \
 		runtime/tutor/en/vim-01-beginner.tutor \
 		runtime/tutor/en/vim-01-beginner.tutor.json \
-		runtime/tutor/it/vim-01-beginner.tutor \
-		runtime/tutor/it/vim-01-beginner.tutor.json \
+		runtime/tutor/en/vim-02-beginner.tutor \
+		runtime/tutor/en/vim-02-beginner.tutor.json \
 		runtime/tutor/tutor.tutor \
 		runtime/tutor/tutor.tutor.json \
 		runtime/tutor/tutor.vim \
@@ -796,8 +829,15 @@ RT_ALL =	\
 		runtime/pack/dist/opt/editorconfig/doc/editorconfig.txt \
 		runtime/pack/dist/opt/editorconfig/ftdetect/editorconfig.vim \
 		runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim \
+		runtime/pack/dist/opt/helpcurwin/autoload/helpcurwin.vim \
+		runtime/pack/dist/opt/helpcurwin/doc/helpcurwin.txt \
+		runtime/pack/dist/opt/helpcurwin/doc/tags \
+		runtime/pack/dist/opt/helpcurwin/plugin/helpcurwin.vim \
 		runtime/pack/dist/opt/helptoc/autoload/helptoc.vim \
+		runtime/pack/dist/opt/helptoc/doc/helptoc.txt \
+		runtime/pack/dist/opt/helptoc/doc/tags \
 		runtime/pack/dist/opt/helptoc/plugin/helptoc.vim \
+		runtime/pack/dist/opt/hlyank/plugin/hlyank.vim \
 		runtime/pack/dist/opt/justify/plugin/justify.vim \
 		runtime/pack/dist/opt/matchit/plugin/matchit.vim \
 		runtime/pack/dist/opt/matchit/doc/matchit.txt \
@@ -807,6 +847,20 @@ RT_ALL =	\
 		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/pack/dist/opt/netrw/LICENSE.txt \
+		runtime/pack/dist/opt/netrw/README.md \
+		runtime/pack/dist/opt/netrw/autoload/netrw.vim \
+		runtime/pack/dist/opt/netrw/autoload/netrw/fs.vim \
+		runtime/pack/dist/opt/netrw/autoload/netrw/os.vim \
+		runtime/pack/dist/opt/netrw/autoload/netrw/msg.vim \
+		runtime/pack/dist/opt/netrw/autoload/netrw_gitignore.vim \
+		runtime/pack/dist/opt/netrw/doc/netrw.txt \
+		runtime/pack/dist/opt/netrw/plugin/netrwPlugin.vim \
+		runtime/pack/dist/opt/netrw/syntax/netrw.vim \
+		runtime/pack/dist/opt/osc52/plugin/osc52.vim \
+		runtime/pack/dist/opt/osc52/autoload/osc52.vim \
+		runtime/pack/dist/opt/osc52/doc/osc52.txt \
+		runtime/pack/dist/opt/osc52/doc/tags
 
 # Runtime files for all distributions without CR/LF translation.
 RT_ALL_BIN =	\
@@ -841,6 +895,7 @@ RT_SCRIPTS =	\
 		runtime/indent/testdir/*.vim \
 		runtime/indent/testdir/*.in \
 		runtime/indent/testdir/*.ok \
+		runtime/indent/testdir/tools/* \
 		runtime/ftplugin/*.vim \
 		runtime/ftplugin/logtalk.dict \
 		runtime/ftplugin/README.txt \
@@ -861,6 +916,7 @@ RT_SCRIPTS =	\
 		runtime/syntax/testdir/input/setup/*.* \
 		runtime/syntax/testdir/dumps/*.dump \
 		runtime/syntax/testdir/dumps/*.vim \
+		runtime/syntax/testdir/tools/* \
 		runtime/syntax/generator/Makefile \
 		runtime/syntax/generator/README.md \
 		runtime/syntax/generator/gen_syntax_vim.vim \
@@ -903,7 +959,6 @@ RT_DOS =	\
 		README_dos.txt \
 		runtime/doc/Make_mvc.mak \
 		runtime/indent/Make_mvc.mak \
-		runtime/tutor/Make_mvc.mak \
 		runtime/lang/Make_mvc.mak \
 		vimtutor.bat \
 
@@ -1033,7 +1088,8 @@ IN_README_DIR = \
 
 # Generic language files.
 LANG_GEN = \
-		README.??x.txt \
+		lang/README.*.txt \
+		lang/LICENSE.*.txt \
 		runtime/doc/*-da.1 \
 		runtime/doc/*-da.UTF-8.1 \
 		runtime/doc/*-de.1 \
@@ -1049,7 +1105,6 @@ LANG_GEN = \
 		runtime/doc/*-ru.UTF-8.1 \
 		runtime/doc/*-tr.1 \
 		runtime/doc/*-tr.UTF-8.1 \
-		runtime/doc/uganda.??x \
 		runtime/lang/README.txt \
 		runtime/lang/Makefile \
 		runtime/lang/Make_all.mak \
@@ -1057,24 +1112,20 @@ LANG_GEN = \
 		runtime/keymap/README.txt \
 		runtime/keymap/*.vim \
 		runtime/tutor/README.*.txt \
-		runtime/tutor/Makefile \
-		runtime/tutor/Make_all.mak \
-		runtime/tutor/tutor1.utf-8 \
+		runtime/tutor/it/vim-01-beginner.tutor \
+		runtime/tutor/it/vim-01-beginner.tutor.json \
+		runtime/tutor/ru/vim-01-beginner.tutor \
+		runtime/tutor/ru/vim-01-beginner.tutor.json \
+		runtime/tutor/ru/vim-02-beginner.tutor \
+		runtime/tutor/ru/vim-02-beginner.tutor.json \
+		runtime/tutor/sr/vim-01-beginner.tutor \
+		runtime/tutor/sr/vim-01-beginner.tutor.json \
+		runtime/tutor/sr/vim-02-beginner.tutor \
+		runtime/tutor/sr/vim-02-beginner.tutor.json \
 		runtime/tutor/tutor1.?? \
-		runtime/tutor/tutor1.??.utf-8 \
-		runtime/tutor/tutor1.??.euc \
-		runtime/tutor/tutor1.??.sjis \
-		runtime/tutor/tutor1.??.iso9 \
-		runtime/tutor/tutor1.??.big5 \
-		runtime/tutor/tutor1.??.cp1250 \
-		runtime/tutor/tutor1.??.cp1251 \
-		runtime/tutor/tutor1.??.cp737 \
-		runtime/tutor/tutor1.??_??.utf-8 \
+		runtime/tutor/tutor1.??_?? \
 		runtime/tutor/tutor1.bar \
-		runtime/tutor/tutor1.bar.utf-8 \
-		runtime/tutor/tutor2.utf-8 \
 		runtime/tutor/tutor2.?? \
-		runtime/tutor/tutor2.??.utf-8 \
 		runtime/spell/README.txt \
 		runtime/spell/??/*.diff \
 		runtime/spell/??/main.aap \
@@ -1118,6 +1169,7 @@ LANG_SRC = \
 		src/po/sjiscorr.c \
 		src/po/big5corr.c \
 		src/po/*.po \
+		src/po/vim.pot \
 
 # The language files for the Win32 lang archive.
 LANG_DOS = \
@@ -1133,6 +1185,8 @@ IGNORE = \
 		.github/workflows/label.yml \
 		SECURITY.md \
 		ci/unlisted.make \
+		ci/hlgroups.make \
+		ci/hlgroups.ignore \
 		src/libvterm/CODE-MAP \
 		runtime/syntax/testdir/input/html_html \
 

Makefile

@@ -63,6 +63,7 @@ VIM_FOR_SYNTAXTEST = ../../src/vim
 
 # (For local testing only with GNU Make.)
 VIM_SYNTAX_TEST_FILTER =
+VIM_SYNTAX_TEST_WAIT_TIME =
 
 syntaxtest:
 	cd runtime/syntax && \
@@ -104,7 +105,7 @@ MINOR = 1
 # - 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,
-#   runtime/doc/*.txt and make nsis/gvim_version.nsh.
+#   runtime/doc/*.txt.
 #   For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.manifest.
 # - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, Lua, Cscope and
 #   "huge" features.  Add MZscheme if you can make it work.
@@ -114,6 +115,7 @@ MINOR = 1
 # - With these features: "make depend" (works best with gcc).
 # - If you have a lint program: "make lint" and check the output (ignore GTK
 #   warnings).
+# - compile release versions using -DNDEBUG to disable assert()s
 # - 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.
@@ -161,12 +163,12 @@ MINOR = 1
 # - See src/INSTALLpc.txt for installing the compiler and SDK.
 # - Set environment for Visual C++ 2015:
 #   > cd src
-#   > msvc2015.bat
+#   > msvc-latest.bat
 # - Build the console binary:
-#   > nmake -f Make_mvc.mak
+#   > nmake.exe -f Make_mvc.mak
 # - Run the tests and check the output:
-#   > nmake -f Make_mvc.mak testclean
-#   > nmake -f Make_mvc.mak test
+#   > nmake.exe -f Make_mvc.mak testclean
+#   > nmake.exe -f Make_mvc.mak test
 # - Rename (using ../tools/rename.bat):
 #           vim.exe to vimw32.exe
 #           tee/tee.exe to teew32.exe
@@ -176,10 +178,10 @@ MINOR = 1
 #           uninstall.exe to uninstallw32.exe
 # Win32 GUI version build:
 # - > cd src
-#   > nmake -f Make_mvc.mak GUI=yes
+#   > nmake.exe -f Make_mvc.mak "GUI=yes"
 # - Run the tests and check the output:
-#   > nmake -f Make_mvc.mak testclean
-#   > nmake -f Make_mvc.mak testgvim
+#   > nmake.exe -f Make_mvc.mak testclean
+#   > nmake.exe -f Make_mvc.mak testgvim
 # - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
 # - Move gvim.pdb to here.
 # - Copy "GvimExt/gvimext.dll" to here.
@@ -191,8 +193,8 @@ MINOR = 1
 #   > cd src
 #   > bigvim.bat
 # - Run the tests:
-#   > nmake -f Make_mvc.mak testclean
-#   > nmake -f Make_mvc.mak testgvim
+#   > nmake.exe -f Make_mvc.mak testclean
+#   > nmake.exe -f Make_mvc.mak testgvim
 #   - check the output.
 # - Rename "gvim.exe" to "gvim_ole.exe".
 # - Rename gvim.pdb to "gvim_ole.pdb".
@@ -216,9 +218,9 @@ MINOR = 1
 # - 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.
 # - go to ../nsis and do:
-#   > unzip icons.zip
-#   > makensis gvim.nsi  (takes a few minutes).
-#      ignore warning for libwinpthread-1.dll
+#   > nmake.exe -f Make_mvc.mak all
+#    (takes a few minutes).
+#    See nsis/README.txt for details.
 # - Copy gvim##.exe to the dist directory.
 #
 # 64 bit builds (these are not in the normal distribution, the 32 bit build
@@ -226,9 +228,9 @@ MINOR = 1
 # Like the console and GUI version, but first run vcvars64.bat or
 #   "..\VC\vcvarsall.bat x86_amd64".
 # - Build the console version:
-#   > nmake -f Make_mvc.mak
+#   > nmake.exe -f Make_mvc.mak
 # - Build the GUI version:
-#   > nmake -f Make_mvc.mak GUI=yes
+#   > nmake.exe -f Make_mvc.mak "GUI=yes"
 # - Build the OLE version with interfaces:
 #   > bigvim64.bat
 #
@@ -266,8 +268,8 @@ dist:
 # Clean up some files to avoid they are included.
 # Copy README files to the top directory.
 prepare:
-	if test -f runtime/doc/uganda.nsis.txt; then \
-		rm runtime/doc/uganda.nsis.???; fi
+	if test -f lang/LICENSE.nsis.txt; then \
+		rm -f lang/LICENSE*.nsis.txt; fi
 	for name in $(IN_README_DIR); do \
 	  cp READMEdir/"$$name" .; \
 	  done
@@ -408,8 +410,7 @@ amisrc: dist prepare
 	mv dist/vim$(VERSION)src.tar.gz dist/vim$(VERSION)src.tgz
 
 # MS-DOS sources
-dossrc: dist dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt \
-	nsis/gvim_version.nsh
+dossrc: dist dist/$(COMMENT_SRC) license
 	-rm -rf dist/vim$(VERSION)src.zip
 	-rm -rf dist/vim
 	mkdir dist/vim
@@ -420,23 +421,15 @@ dossrc: dist dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt \
 		$(SRC_DOS_BIN) \
 		$(SRC_AMI_DOS) \
 		$(SRC_DOS_UNIX) \
-		runtime/doc/uganda.nsis.??? \
-		nsis/gvim_version.nsh \
+		lang/LICENSE.*.txt \
+		lang/README.*.txt \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
 	mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
 	rmdir dist/vim/$(VIMRTDIR)/runtime
 	cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC)
 
-runtime/doc/uganda.nsis.txt: runtime/doc/uganda.???
-	cd runtime/doc && $(MAKE) uganda.nsis.txt
-
-nsis/gvim_version.nsh: Makefile
-	echo "# Generated from Makefile: define the version numbers" > $@
-	echo "!ifndef __GVIM_VER__NSH__"  >> $@
-	echo "!define __GVIM_VER__NSH__"  >> $@
-	echo "!define VER_MAJOR $(MAJOR)" >> $@
-	echo "!define VER_MINOR $(MINOR)" >> $@
-	echo "!endif" >> $@
+license:
+	cd nsis && $(MAKE) -f Makefile $@
 
 dosrt: dist dist/$(COMMENT_RT) dosrt_files
 	-rm -rf dist/vim$(VERSION)rt.zip

README.md

@@ -1,15 +1,78 @@
-Vim - the text editor - for macOS
+<h1 align=center>
+<img src=https://macvim.org/docs/MacVim.png alt="MacVim logo" style="height:4em"><br>
+MacVim
+</h1>
+
+<p align="center">
+<a href="https://macvim.org/">Website</a> · <a href="https://macvim.org/docs/gui_mac.txt">Documentation</a>
+</p>
+<p align="center">
+<a href="https://github.com/macvim-dev/macvim/actions/workflows/ci-macvim.yaml?query=branch%3Amaster+event%3Apush"><img src="https://github.com/macvim-dev/macvim/actions/workflows/ci-macvim.yaml/badge.svg" alt="MacVim GitHub CI"></a>
+<a href="https://github.com/macvim-dev/macvim/releases/latest"><img src="https://img.shields.io/github/v/release/macvim-dev/macvim?label=GitHub%20Release&display=release" alt="GitHub release"></a>
+<a href="https://repology.org/project/macvim/versions"><img src="https://repology.org/badge/tiny-repos/macvim.svg" alt="Packaging status"></a>
+</p>
 
 
-- MacVim homepage: <https://macvim-dev.github.io/macvim>
+MacVim is a macOS version of the [Vim](https://github.com/vim/vim) text editor, providing a graphical user interface for Vim, while tightly integrating with macOS and providing features specific to the platform.
 
-- Download the latest version from [Releases](https://github.com/macvim-dev/macvim/releases/latest)
+<hr>
 
-- How to [build MacVim from source](https://github.com/macvim-dev/macvim/wiki/Building)
+<p align="center">
+  <picture>
+    <source srcset="https://macvim.org/images/macvim-screenshot-light.png"  media="(prefers-color-scheme: light)"/>
+    <source srcset="https://macvim.org/images/macvim-screenshot-dark.png"  media="(prefers-color-scheme: dark)"/>
+    <img width="535" alt="macvim-screenshot-light" src="https://macvim.org/images/macvim-screenshot-light.png" />
+  </picture>
+</p>
 
-- Vim README: [README_vim.md](README_vim.md)
+## Features
 
-- [![MacVim GitHub CI](https://github.com/macvim-dev/macvim/actions/workflows/ci-macvim.yaml/badge.svg)](https://github.com/macvim-dev/macvim/actions/workflows/ci-macvim.yaml)
+- Smooth native GUI that supports menus, dialog boxes, toolbars, and scroll bars.
+- Native and non-native full-screen modes.
+- Trackpad gestures, Touch Bar, and Command key shortcuts can be mapped to Vim actions.
+- Integrates with system services, dictionary lookup, and Apple Intelligence Writing Tools.
+- Vim GUI tabs with customizable colors.
+- Font ligatures and accurate text rendering.
 
-- 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)
+## Getting Started
+
+See [installation documentation](https://github.com/macvim-dev/macvim/wiki/Installing) for more details and alternative methods to install.
+
+### Download
+
+You can download the latest version of MacVim from the [Releases](https://github.com/macvim-dev/macvim/releases/latest) page.
+
+### Install via Package Manager
+
+If you would like to install using a package manager, MacVim can be installed via Homebrew:
+
+  ```zsh
+  brew install macvim
+  ```
+
+MacVim is also available as a Homebrew cask. It will install the same pre-built binary as the one available from GitHub release:
+
+  ```zsh
+  brew install --cask macvim-app
+  ```
+
+After installation, MacVim can be launched using the Dock or in the terminal using the `mvim` command.
+
+### Building from Source
+
+If you prefer to build MacVim from source, detailed instructions are provided in the [Building MacVim](https://github.com/macvim-dev/macvim/wiki/Building) guide.
+
+## Relationship with Vim
+
+MacVim is a downstream fork of Vim, and routinely [merges from upstream](https://github.com/macvim-dev/macvim/wiki/Merging-from-upstream-Vim). The original Vim README can be found at [README_vim.md](README_vim.md). Vim itself is also available for macOS, but it does not have a GUI.
+
+In Homebrew, there are both a `macvim` and `vim` package. Both packages will provide a terminal version of Vim with similar features. The `vim` package is from the upstream Vim project and is usually a bit more up-to-date in core Vim features, while the `macvim` package will provide the additional GUI version bundled as an app.
+
+## License
+
+MacVim is released under the [Vim License](https://github.com/macvim-dev/macvim/blob/master/LICENSE).
+
+## Support
+
+If you encounter any issues or have questions, feel free to [open an issue](https://github.com/macvim-dev/macvim/issues) or visit the [discussions](https://github.com/macvim-dev/macvim/discussions) page.
 

README.txt

@@ -15,6 +15,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 also aims to provide a (mostly) POSIX-compatible vi implementation, when
+compiled with a minimal feature set (typically called vim.tiny), which is used
+by many Linux distributions as the default vi editor.
+
 Vim runs under MS-Windows (7, 8, 10, 11), 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/XP/Vista,

README_vim.md

@@ -32,6 +32,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 also aims to provide a (mostly) POSIX-compatible vi implementation, when
+compiled with a minimal feature set (typically called vim.tiny), which is used
+by many Linux distributions as the default vi editor.
+
 Vim runs under MS-Windows (7, 8, 10, 11), 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/XP/Vista,

ci/appveyor.bat

@@ -71,7 +71,7 @@ cd src
 echo "Building MSVC 64bit console Version"
 nmake -f Make_mvc.mak CPU=AMD64 ^
     OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
-    FEATURES=%FEATURE%
+    FEATURES=%FEATURE% CI_CFLAGS=/we4267
 if not exist vim.exe (
     echo Build failure.
     exit 1
@@ -85,11 +85,11 @@ if "%FEATURE%" == "HUGE" (
         OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
         PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
         PYTHON3_VER=%PYTHON3_VER% DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
-        FEATURES=%FEATURE%
+        FEATURES=%FEATURE% CI_CFLAGS=/we4267
 ) ELSE (
     nmake -f Make_mvc.mak CPU=AMD64 ^
         OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
-        FEATURES=%FEATURE%
+        FEATURES=%FEATURE% CI_CFLAGS=/we4267
 )
 if not exist gvim.exe (
     echo Build failure.

ci/config.mk.brew-libiconv.sed

@@ -0,0 +1,8 @@
+# Use Homebrew GNU libiconv to work around broken Apple iconv. Use static
+# linking as we don't want our binary releases to pull in third-party
+# dependencies.
+#
+# If gettext is configured in the build, it also needs to be built against GNU
+# libiconv. Otherwise we would get a link error from this.
+/^CFLAGS[[:blank:]]*=/s/$/ -I\/opt\/homebrew\/opt\/libiconv\/include/
+/^LIBS[[:blank:]]*=/s/-liconv/\/opt\/homebrew\/opt\/libiconv\/lib\/libiconv.a/

ci/config.mk.sed

@@ -1,3 +1,3 @@
 /^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Werror -Wno-deprecated-declarations/
-/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function -Wno-shadow/
+/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function -Wno-strict-prototypes -Wno-shadow/
 /^RUBY_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-parameter -Wno-strict-prototypes/

ci/ddebs.list

@@ -0,0 +1,3 @@
+deb http://ddebs.ubuntu.com noble main restricted universe multiverse
+deb http://ddebs.ubuntu.com noble-updates main restricted universe multiverse
+deb http://ddebs.ubuntu.com noble-proposed main restricted universe multiverse

ci/hlgroups.ignore

@@ -0,0 +1,69 @@
+ColorColumn
+ComplMatchIns
+Conceal
+Cursor
+CursorColumn
+CursorIM
+CursorLine
+CursorLineNr
+debugBreakpoint
+debugPC
+DiffAdd
+DiffChange
+DiffDelete
+DiffText
+Directory
+ErrorMsg
+FoldColumn
+Folded
+Ignore
+IncSearch
+lCursor
+LineNr
+LineNrAbove
+LineNrBelow
+MatchParen
+Menu
+ModeMsg
+MoreMsg
+MsgArea
+NonText
+Normal
+Pmenu
+PmenuSbar
+PmenuSel
+PmenuThumb
+PmenuShadow
+Question
+Scrollbar
+Search
+SignColumn
+SpecialKey
+SpellBad
+SpellCap
+SpellLocal
+SpellRare
+StatusLine
+StatusLineNC
+StatusLineTerm
+StatusLineTermNC
+TabLine
+TabLineFill
+TabLineSel
+Terminal
+Title
+TitleBar
+TitleBarNC
+TOhtmlProgress
+TOhtml-progress-color
+ToolbarButton
+ToolbarLine
+Tooltip
+User1
+User1..9
+User9
+VertSplit
+Visual
+VisualNOS
+WarningMsg
+WildMenu

ci/hlgroups.make

@@ -0,0 +1,18 @@
+# vim: ft=make
+SHELL = /bin/bash
+
+# Default target to actually run the comparison:
+.PHONY: check
+.INTERMEDIATE: hlgroups deflinks hlgroups.stripped
+
+check: hlgroups.stripped deflinks
+	diff hlgroups.stripped deflinks
+
+hlgroups:
+	grep '\*hl-' ../runtime/doc/*txt | sed -E -e 's/.*:<?\s*//' -e 's/hl-//g' -e 's/\*//g' -e 's/ /\n/g' | sort > hlgroups
+
+deflinks: ../src/highlight.c
+	grep '"default link'  $< | sed 's/.*default link\s*\(.*\)\s.*/\1/' | sort > deflinks
+
+hlgroups.stripped: hlgroups.ignore hlgroups
+	grep -v -x -F -f hlgroups.ignore hlgroups > hlgroups.stripped

ci/if_feat_check.vim

@@ -0,0 +1,15 @@
+if 1 " This prevents it from being run in tiny versions
+  " Check for required features
+  if exists("g:required")
+    for feature in g:required
+      if !has(feature)
+        echo "Error: Feature '" .. feature .. "' not found"
+        echo ''
+        cquit
+      endif
+    endfor
+    echo "\nChecked features: " .. string(g:required)
+    echo ''
+  endif
+endif
+" vim: sts=2 sw=2 et

ci/if_ver-1.vim

@@ -1,6 +1,6 @@
-" Print all interface versions for Ubuntu. Part 1.
+" Print all interface versions. Part 1.
 
-if 1
+if 1 " This prevents it from being run in tiny versions
   execute 'source' expand('<sfile>:h') .. '/if_ver-cmd.vim'
 
   echo "*** Interface versions ***\n"

ci/if_ver-2.vim

@@ -1,6 +1,8 @@
-" Print py3 interface versions for Ubuntu. Part 2.
+" Print py3 interface versions. Part 2.
+" This is done separately from part 1 because Vim cannot concurrently load
+" Python 2 and 3 together.
 
-if 1
+if 1 " This prevents it from being run in tiny versions
   execute 'source' expand('<sfile>:h') .. '/if_ver-cmd.vim'
 
   echo 'Python 3:'

ci/lychee.toml

@@ -0,0 +1,47 @@
+#############################  Runtime  #############################
+
+# Reasonable concurrency to avoid rate-limiting small hosts.
+max_concurrency = 14
+
+# File extensions to scan
+extensions = ["c", "h", "md", "html", "txt"]
+
+#############################  Requests  ############################
+
+# Accepted status codes
+# - Include 429 (Too Many Requests) to avoid marking throttled links as dead.
+accept = ["100..=103", "200..=299", "429"]
+
+# Retry each request a few times on transient network errors
+retries = 2
+retry_wait_time = 2
+
+# Timeout per request in seconds
+timeout = 60
+
+#############################  Exclusions  ##########################
+
+exclude = [
+  '^https?://sys/file$',
+  '^file://.*',
+  '^https?://(www\.)?badges\.debian\.net/.*$',
+  '^https?://(www\.)?repology\.org/.*$',
+  '^https?://scan\.coverity\.com/.*$',
+  '^https?://(www\.)?img\.shields\.io/.*$',
+  '^https?://(www\.)?fossies\.org/.*$',
+  '^https?://(www\.)?adobe\.com.*$',
+  '^https?://(www\.)?google\.com.*$',
+  '^https?://(www\.)?forum\.vmssoftware\.com/.*$',
+  '^http://vim\.sourceforge\.net/scripts/script\.php\?script_id=40$',
+  '^https://is\.gd/.*$',
+  '^https://wiki\.contextgarden\.net/Vim$',
+  '^https://github\.com/you/foobar\.git$',
+  '^https?://flatassembler\.net',
+  '^https?://www\.fleiner\.com/vim/download.html',
+]
+
+# Lychee only reads UTF-8 files
+exclude_path = [
+  'src/po',
+  'src/testdir',
+]

ci/pinned-pkgs

@@ -0,0 +1,69 @@
+# Unfortunately ubtunu does not keep the debug packages strictly up-to-date
+# with the main packages. So this file needs to pin the main packages back to
+# the version for which debug packages are available.
+
+Package: libwayland-client0
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-client0
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+Package: libwayland-cursor0
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-cursor0
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+Package: libwayland-egl1
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-egl1
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+Package: libwayland-dev
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-dev
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+Package: libwayland-server0
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-server0
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+Package: libwayland-bin
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-bin
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+# As of 2025-04-27 the base library package libgtk-3-0t64 is still at 3.24.41-4ubuntu1.2
+Package: libgtk-3-0t64-dbgsym
+Pin: version 3.24.41-4ubuntu1.2
+Pin-Priority: 1000
+
+Package: libgtk-3-0t64-dbgsym
+Pin: version 3.24.41-4ubuntu1.3
+Pin-Priority: 100
+
+# As of 2025-04-27 the base binary package libgtk-3-bin is still at 3.24.41-4ubuntu1.2
+Package: libgtk-3-bin-dbgsym
+Pin: version 3.24.41-4ubuntu1.2
+Pin-Priority: 1000
+
+Package: libgtk-3-bin-dbgsym
+Pin: version 3.24.41-4ubuntu1.3
+Pin-Priority: 100

ci/unlisted.make

@@ -21,7 +21,7 @@ $(eval all_patterns := $(shell \
 			p; \
 		}'))
 
-# In Makefile's `prepeare` target, all the IN_README_DIR files are moved from
+# In Makefile's `prepare` target, all the IN_README_DIR files are moved from
 # READMEdir to the root, so add those files in their Git-tracked location:
 all_patterns := $(all_patterns) \
 	$(foreach readme, $(IN_README_DIR), READMEdir/$(readme))

lang/LICENSE.pt_br.txt

@@ -0,0 +1,81 @@
+LICENÇA DO VIM
+
+I) Não há restrições para distribuir cópias não modificadas do Vim, exceto
+   que elas devem incluir este texto de licença. Você também pode distribuir
+   partes não modificadas do Vim, igualmente irrestritas, exceto que elas
+   devem incluir este texto de licença. Você também tem permissão para incluir
+   executáveis que você fez a partir das fontes não modificadas do Vim, além 
+   de seus próprios exemplos de uso e scripts do Vim.
+
+II) É permitido distribuir uma versão modificada (ou estendida) do Vim,
+    incluindo executáveis e/ou código-fonte, quando as quatro
+    condições a seguir forem atendidas:
+    1) Este texto de licença deve ser incluído sem modificações.
+    2) O Vim modificado deve ser distribuído de uma das cinco formas a seguir:
+       a) Se você fizer alterações no Vim, deverá descrever claramente na
+          distribuição como entrar em contato com você. Quando o mantenedor
+          solicitar a você (de qualquer forma) uma cópia do Vim modificado que
+          você distribuiu, você deverá disponibilizar suas alterações,
+          incluindo o código-fonte, ao mantenedor sem taxa. O mantenedor
+          reserva o direito de incluir suas alterações na versão oficial
+          do Vim. O que o mantenedor fará com suas alterações e sob qual
+          licença elas serão distribuídas é negociável. Se não houve negociação
+          então esta licença, ou uma versão posterior, também se aplica às suas
+          alterações. Os mantenedores atuais estão listados aqui:
+          https://github.com/orgs/vim/people. Se isso mudar, será anunciado em
+          lugares apropriados (provavelmente vim.sf.net, www.vim.org e/ou
+          comp.editors). Quando for completamente impossível contatar o
+          mantenedor, a obrigação de enviar a ele suas alterações cessa.
+          Uma vez que o mantenedor tenha confirmado que ele recebeu suas
+          alterações, elas não precisarão ser enviadas novamente.
+       b) Se você recebeu um Vim modificado que foi distribuído como
+          mencionado em a), você tem permissão para distribuí-lo sem
+          modificações, como mencionado em I). Se você fizer alterações
+          adicionais, o texto em a) se aplica a essas alterações.
+       c) Forneça todas as alterações, incluindo o código-fonte, com cada cópia
+          do Vim modificado que você distribuir. Isso pode ser feito na forma
+          de um diff de contexto. Você pode escolher qual licença usar para o
+          novo código que você adicionar. As alterações e sua licença não devem
+          restringir outros de fazer suas próprias alterações na versão oficial
+          do Vim.
+       d) Quando você tem um Vim modificado que inclui alterações conforme
+          mencionado em c), você pode distribuí-lo sem o código-fonte para as
+          alterações se as três condições a seguir forem atendidas:
+          - A licença que se aplica às alterações permite que você distribua
+            as alterações para o mantenedor do Vim sem taxa ou restrição, e
+            permite que o mantenedor do Vim inclua as alterações na
+            versão oficial do Vim sem taxa ou restrição.
+          - Você mantém as alterações por pelo menos três anos após a última
+            distribuição do Vim modificado correspondente. Quando o mantenedor
+            ou alguém para quem você distribuiu o Vim modificado solicitar a
+            você (de qualquer forma) as alterações dentro deste período, você
+            deve disponibilizá-las a ele.
+          - Você descreve claramente na distribuição como entrar em contato
+            com você. Estas informações de contato devem permanecer válidas por
+            pelo menos três anos após a última distribuição do Vim modificado
+            correspondente, ou pelo maior tempo possível.
+       e) Quando a Licença Pública Geral GNU (GPL) se aplica às alterações,
+          você pode distribuir o Vim modificado sob a GNU GPL versão 2 ou
+          qualquer versão posterior.
+    3) Uma mensagem deve ser adicionada, no mínimo na saída do comando
+       ":version" e na tela de introdução, de modo que o usuário do Vim
+       modificado seja capaz de ver que ele foi modificado. Ao distribuir
+       conforme mencionado em 2)e), só é necessário adicionar a mensagem
+       na medida em que isso não entre em conflito com a licença usada para
+       as alterações.
+    4) As informações de contato conforme exigido em 2)a) e 2)d) não devem ser
+       removidas ou alteradas, exceto que a própria pessoa pode fazer
+       correções.
+
+III) Se você distribuir uma versão modificada do Vim, encorajamos que use
+     a licença do Vim para suas alterações e disponibilizá-las ao
+     mantenedor, incluindo o código-fonte. A maneira preferida de fazer isso é
+     por e-mail ou enviando os arquivos para um servidor e enviando a URL por
+     e-mail. Se o número de alterações for pequeno (por exemplo, um Makefile
+     modificado), enviar um diff de contexto por e-mail será suficiente.
+     O endereço de e-mail a ser usado é <maintainer@vim.org>
+
+IV) Não é permitido remover esta licença da distribuição das fontes do Vim,
+    partes dela ou de uma versão modificada. Você pode usar esta licença
+    para versões anteriores do Vim em vez da licença com a qual elas vieram,
+    a seu critério.

lang/LICENSE.ru.txt

@@ -0,0 +1,114 @@
+Примечание. Данный текст перевода лицензии Vim предоставляется с целью
+ознакомления и не является юридически значимым. Переводчик не несёт
+ответственности за возможные неточности и ошибки при переводе лицензии.
+Единственно юридически значимым является текст лицензии Vim на английском языке.
+
+ЛИЦЕНЗИЯ VIM
+
+I)  Неизменённые копии программы Vim могут распространяться без ограничения
+    при условии включения данного текста лицензии. Распространение
+    неизменённых копий отдельных частей программы Vim также возможно
+    при соблюдении условия о включении данного текста лицензии. Подобным
+    образом разрешается добавлять исполняемые файлы, скомпилированные
+    из неизменённого исходного кода программы Vim, а также собственные
+    примеры использования и командные файлы редактора Vim.
+
+II) Изменённую (или дополненную) версию программы Vim, включающую
+    исполняемые файлы и/или исходный код, допускается распространять
+    при соблюдении следующих четырёх условий:
+    1) Текст настоящей лицензии должен включаться в состав распространяемой
+    версии программы Vim без изменений.
+    2) Изменённая версия программы Vim должна распространяться одним
+    из следующих пяти способов:
+       a) При внесении изменений в программу Vim, в дистрибутиве должны
+	  быть явно указаны контактные данные лица, внёсшего эти изменения.
+	  Ответственному разработчику по его запросу (в любой форме) должна
+	  быть безвозмездно предоставлена копия распространяемой изменённой
+	  версии программы Vim, включая её исходный код. Ответственный
+	  разработчик оставляет за собой право включать сделанные изменения
+	  в официальную версию программы Vim. Конкретные действия
+	  ответственного разработчика, относительно переданных изменений,
+	  а также лицензионные условия, на основании которых будет
+	  осуществляться их распространение, могут быть дополнительно
+	  согласованы. Если согласование не проводилось, сделанные изменения
+	  будут распространяться на условиях настоящей лицензии или более
+	  поздней её версии. Лица, в данное время являющиеся ответственными
+	  за разработку, указаны в перечне, размещённом по адресу:
+	  https://github.com/orgs/vim/people.
+	  При изменении этой информации, актуальные данные будут
+	  опубликованы на соответствующих ресурсах (вероятнее всего
+	  по интернет‐адресам vim.sf.net, www.vim.org и/или comp.editors).
+	  В случае полной невозможности связаться с ответственным
+	  разработчиком, обязательства по отправке изменений утрачивают
+	  силу. После передачи подтверждения о получении изменений
+	  от ответственного разработчика, необходимость в повторной
+	  отправке копии изменённой программы Vim неприменима.
+       b) Если лицом получена изменённая версия программа Vim,
+	  распространяющаяся на условиях, указанных в ч. II) п. 2) пп. а)
+	  допускается дальнейшее её распространение этим лицом без внесения
+	  изменений и согласно ч. I) настоящей лицензии. В случае внесения
+	  дополнительных изменений, на эти изменения будут распространяться
+	  условия, указанные в ч. II) п. 2) пп. a).
+       c) Каждая копия распространяемой изменённой версии программы Vim
+	  должна включать информацию обо всех произведённых изменениях,
+	  включая исходный код. Эта информация может быть представлена
+	  в виде построчного сравнения файлов. Выбор лицензии, по условиям
+	  которой будет распространяться добавленный код, остаётся
+	  за автором этих изменений. Изменения и лицензия на эти изменения
+	  не должны запрещать другим лицам внесение своих собственных
+	  изменений в официальную версию программы Vim.
+       d) Изменённая версия программы Vim, содержащая изменения в
+	  соответствии с ч. II) п. 2 пп. c), может распространяться без
+	  исходного кода для этих изменений, при соблюдении следующих трёх
+	  условий:
+	  - Лицензия, применяемая к внесённым изменениям, предоставляет
+	    ответственному разработчику программы Vim возможность
+	    безвозмездного и неограниченного распространения этих изменений,
+	    а также право на безвозмездное и неограниченное включение этих
+	    изменений в официальную версию программы Vim.
+	  - Изменения должны сохраняться не менее трёх лет со времени
+	    распространения соответствующей изменённой версии программы Vim.
+	    В течение этого периода по запросу ответственного разработчика
+	    или другого пользователя изменённой версии программы Vim
+	    (в любой форме) необходимо предоставить исходный код данных
+	    изменений.
+	  - В дистрибутиве изменённой версии программы Vim должны быть явно
+	    указаны контактные данные лица, внёсшего эти изменения.
+	    Контактные данные должны сохранять актуальность в течение
+	    не менее трёх лет со времени последнего распространения
+	    соответствующей изменённой версии программы Vim или как можно
+	    дольше.
+       e) Если к изменениям, внесённым в программу Vim, применимы условия
+	  лицензии GNU General Public License (GNU GPL), допускается
+	  распространение изменённой версия программы Vim на условиях
+	  лицензии GNU GPL версии 2 или любой более поздней версии этой
+	  лицензии.
+    3) Необходимо добавить соответствующую информацию, которая должна быть
+       выведена в результате выполнения команды ":version" в программе Vim,
+       а также на экране приветствия программы Vim, чтобы пользователь
+       изменённой версии программы Vim имел возможность определить,
+       что он пользуется изменённой версией. При распространении
+       на условиях, указанных в ч. II) п. 2) пп. e) такую информацию
+       требуется добавлять только в том случае, когда она не противоречит
+       лицензии, распространяющейся на эти изменения.
+    4) Контактная информация, которая указывается по требованию ч. II) п. 2)
+       пп. a) и ч. II) п. 2) пп. d) не должна удаляться или изменяться никем
+       другим, кроме лица, указавшего данную контактную информацию.
+
+III) При распространении изменённой версии программы Vim рекомендуется
+     пользоваться лицензией Vim для произведённых изменений и обеспечить
+     доступ к этим изменениям ответственного разработчика, включая исходный
+     код изменений. Предпочтительным способом предоставления доступа
+     к произведённым изменениям является отправка этих изменений через
+     электронную почту или размещение файлов на сервер с отправкой
+     URL-адреса по электронной почте. Если количество изменений
+     незначительно (например, изменения в файле Makefile), достаточно будет
+     отправить через электронную почту файл построчного сравнения. Изменения
+     или URL-адреса должны быть направлены на адрес электронной почты
+     maintainer@vim.org
+
+IV)  Не допускается удаление настоящей лицензия из дистрибутива исходного
+     кода программы Vim, его отдельных частей или изменённой версии.
+     Допускается использование настоящей лицензию для предыдущих
+     изменённых выпусков программы Vim, взамен тех лицензий, с которыми
+     они распространялись.

lang/LICENSE.zh_cn.txt

@@ -0,0 +1,60 @@
+注意: 本译文仅供参考。若因译文错漏引发任何问题，译者概不承担责任。VIM 许可证的
+完整英文版本为唯一法律依据。如有任何疑问，以英文原文为准。
+
+VIM 许可证
+
+I)  可以任意发布没有修改的 Vim 的拷贝，但是必须保证包含本许可证。您也可以发布
+    未经修改的部分 Vim，同样也必须包含这份许可证。发布由未经修改的 Vim 源代码
+    所编译出的 Vim 可执行文件，外加您自己的应用实例和 Vim 脚本也是允许的。
+
+II) 在满足以下全部四个条件的前提下，您可以发布经过修改 (或扩充) 的 Vim 版本，
+    包括可执行文件 和/或 源代码:
+    1) 本许可证必须包含在内，并且不能被修改。
+    2) 经过修改的 Vim 必须以下述五种方式之一发布:
+      a) 如果您本人对 Vim 做了改动，您必须在发布版本里清楚地说明如何与您联系。
+         当 Vim 的维护者 (以任何方式) 向您索取您所发布的 Vim 时，您必须把所做
+         的改动包括源代码无偿地提供出来。维护者保留把这些改动加入 Vim 正式版本
+         的权利。至于维护者怎样处理这些改动，以及用什么许可证发布，可以协商。
+         如果没有协商，那么，本许可证，或者它更新的版本，同样适用于您做出的改
+         动。Vim 现在的几位维护者可见:
+              https://github.com/orgs/vim/people
+         如果维护者发生变动，会在合适的地方 (很可能是 vim.sf.net、www.vim.org
+         和/或 comp.editors) 公布，当完全不能与维护者联系时，发送变更的约定自
+         动终止。一旦维护者确认收到了您所做的修改，您就不必再次发送了。
+
+      b) 如果您得到的是一个修改过的 Vim，并且它是在条件 a) 下发布的，那么您可
+         以不加改动地在条件 I) 下发布它；如果您又做了额外的改动，则这些改动受
+         到 a) 款条文的约束。
+
+      c) 在您发布的经过修改的 Vim 的每一份拷贝里，提供所有的变更部分，包括源代
+         码。提供的形式可以采用上下文风格的差异比较记录 (context diff)。您可以
+         为添加的新代码选择许可证，但是这些更改和为其选择的许可证不能限制他人
+         对 Vim 正式版本作出自己的改动。
+
+      d) 在满足以下全部三个条件的前提下，您可以继续发布带有条件 c) 所提及之变
+         更的经过修改的 Vim，而不必在发布时提供更改部分的源代码:
+         - 这些变更所附带的许可证允许您把这些变更无偿地并且没有任何限制地提供
+           给 Vim 的维护者，而且允许 Vim 的维护者无偿地并且没有任何限制地把这
+           些更改加入到 Vim 的正式版本中。
+         - 从您最后一次发布更改的 Vim 之日起，您要保存这些改动至少三年时间。在
+           这期间，维护者或别人 (以任何方式) 向您要求提供这些变更时，您必须提
+           供给他。
+         - 您要在发布版本中清楚地说明如何与您联系，这个联系方式必须保证自最后
+           一次发布相应的经过修改的 Vim 之日起至少三年有效，或尽可能长。
+      e) 当这些变更以 GPL (GNU General Public License，GNU 通用公共许可证) 发
+         布时，您可以在 GPL 版本 2，或更高版本的 GPL 下发布修改过的 Vim。
+    3) 必须添加一条改动的信息。至少要放在 "version" 命令的输出和启动画面里，好
+       让用户知道自己用的是一个修改过的 Vim。当以 2)e) 条件发布时，只有不与变
+       更适用的许可证冲突，这个信息的添加才是必要的。
+    4) 在 2)a) 和 2)d) 条件里要求的联系方式不能随便更改或删除，除非是作者自己
+       作出的更正。
+
+III) 如果您发布一个更改过的 Vim，强烈建议您对变更部分使用 Vim 的许可证，并且对
+     维护者提供变更部分并开放源代码。最好的方式是通过电子邮件或者把文件放到服
+     务器上，通过电子邮件传送 URL。如果只修改了很少的部分 (例如，只是一个修改
+     过的 Makefile)，那么传送一个上下文风格的差异比较记录 (context diff) 就可
+     以了。电子邮件的地址是 <maintainer@vim.org>
+
+IV)  不允许从 Vim 的源代码的发行版本或其中部分的源代码里删除本许可证，即使来自
+     更改过的版本也是如此。您可能想用这份许可证代替以前版本的 Vim 里的许可证，
+     这可以由您自行决定。

lang/README.pt_br.txt

@@ -0,0 +1,131 @@
+README.txt para a versão 9.1 do Vim: Vi IMproved.
+
+O QUE É VIM?
+
+Vim é uma versão muito melhorada do bom e velho editor UNIX Vi. Muitos novos
+recursos foram adicionados: desfazer multinível, destaque de sintaxe, histórico
+de linha de comando, ajuda on-line, verificação ortográfica, completar
+nome de arquivo, operações de bloco, linguagem de script, etc. Há também uma
+interface gráfica (GUI) disponível. Ainda assim, a compatibilidade com Vi é
+mantida, aqueles que têm Vi "nos dedos" se sentirão em casa.
+Veja "runtime/doc/vi_diff.txt" para diferenças com Vi.
+
+Este editor é muito útil para editar programas e outros arquivos de texto
+simples. Todos os comandos são fornecidos com caracteres normais do teclado,
+então aqueles que podem digitar com dez dedos podem trabalhar muito rápido.
+Além disso, as teclas de função podem ser mapeadas para comandos pelo usuário,
+e o mouse pode ser usado.
+
+O Vim funciona em MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS e quase todos
+os sabores do UNIX. A portabilidade para outros sistemas não deve ser difícil.
+Versões mais antigas do Vim rodam em MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
+Amiga DOS, Atari MiNT, BeOS, RISC OS e OS/2. Eles não são mais mantidos.
+
+DISTRIBUIÇÃO
+
+Você pode frequentemente usar seu gerenciador de pacotes favorito para
+instalar o Vim. No Mac e Linux, uma pequena versão do Vim é pré-instalada,
+você ainda precisa instalar o Vim se quiser mais recursos.
+
+Existem distribuições separadas para Unix, PC, Amiga e alguns outros sistemas.
+Este arquivo README.txt vem com o arquivo de tempo de execução. Ele inclui a
+documentação, arquivos de sintaxe e outros arquivos que são usados ​​em
+tempo de execução. Para executar o Vim, você deve obter um dos arquivos
+binários ou um arquivo fonte. Qual deles você precisa depende do sistema em
+que deseja executá-lo e se você deseja ou deve compilá-lo você mesmo.
+Verifique "https://www.vim.org/download.php" para uma visão geral das
+distribuições disponíveis atualmente.
+
+Alguns lugares populares para obter o Vim mais recente:
+* Confira o repositório git do github: https://github.com/vim/vim.
+* Obtenha o código-fonte como um arquivo: https://github.com/vim/vim/tags.
+* Obtenha um executável do Windows do repositório vim-win32-installer:
+https://github.com/vim/vim-win32-installer/releases.
+
+COMPILAR
+
+Se você obteve uma distribuição binária, não precisa compilar o Vim. Se você
+obteve uma distribuição de origem, todo o material para compilar o Vim está no
+diretório "src". Veja src/INSTALL para instruções.
+
+INSTALAÇÃO
+
+Veja um desses arquivos para instruções específicas do sistema. No diretório
+READMEdir (no repositório) ou no diretório superior (se você descompactar um
+arquivo):
+
+README_ami.txt		Amiga
+README_unix.txt		Unix
+README_dos.txt		MS-DOS e MS-Windows
+README_mac.txt		Macintosh
+README_haiku.txt	Haiku
+README_vms.txt		VMS
+
+Existem outros arquivos README_*.txt, dependendo da distribuição que você usou.
+
+DOCUMENTAÇÃO
+
+O tutor do Vim é um curso de treinamento de uma hora para iniciantes.
+Frequentemente, ele pode ser iniciado como "vimtutor". Veja ":help tutor"
+para mais informações.
+
+O melhor é usar ":help" no Vim. Se você ainda não tem um executável, leia
+"runtime/doc/help.txt". Ele contém direcionamentos para os outros arquivos
+de documentação. O Manual do Usuário é lido como um livro e é recomendado
+para aprender a usar o Vim. Veja ":help user-manual".
+
+CÓPIA
+
+O Vim é um Charityware. Você pode usá-lo e copiá-lo o quanto quiser, mas
+encorajamos que faça uma doação para ajudar órfãos em Uganda. Leia o arquivo
+"runtime/doc/uganda.txt" para detalhes (execute ":help uganda" dentro do Vim).
+
+Resumo da licença: Não há restrições quanto ao uso ou distribuição de uma
+cópia não modificada do Vim. Partes do Vim também podem ser distribuídas, mas
+o texto da licença deve sempre ser incluído. Para versões modificadas, algumas
+restrições se aplicam. A licença é compatível com GPL, você pode compilar o Vim
+com bibliotecas GPL e distribuí-lo.
+
+PATROCÍNIO
+
+Corrigir bugs e adicionar novos recursos exige muito tempo e esforço.
+Para mostrar seu apreço pelo trabalho e motivar os desenvolvedores a continuar
+trabalhando no Vim, envie uma doação.
+
+O dinheiro que você doou será usado principalmente para ajudar crianças em
+Uganda. Veja "runtime/doc/uganda.txt". Mas, ao mesmo tempo, as doações aumentam
+a motivação da equipe de desenvolvimento para continuar trabalhando no Vim!
+
+Para as informações mais recentes sobre patrocínio, consulte o site do Vim:
+  https://www.vim.org/sponsor/
+
+CONTRIBUIÇÕES
+
+Se você gostaria de ajudar a tornar o Vim melhor, veja o arquivo CONTRIBUTING.md.
+
+INFORMAÇÕES
+
+Se você estiver no macOS, pode usar o MacVim: https://macvim.org
+
+As últimas notícias sobre o Vim podem ser encontradas na página inicial do Vim:
+  https://www.vim.org/
+
+Se você tiver problemas, dê uma olhada na documentação ou dicas do Vim:
+  https://www.vim.org/docs.php
+  https://vim.fandom.com/wiki/Vim_Tips_Wiki
+
+Se você ainda tiver problemas ou quaisquer outras perguntas, use uma das listas
+de discussão para discuti-las com usuários e desenvolvedores do Vim:
+  https://www.vim.org/maillist.php
+
+Se nada mais funcionar, relate os bugs diretamente para a lista de discussão
+vim-dev:
+  <vim-dev@vim.org>
+
+AUTOR PRINCIPAL
+
+A maior parte do Vim foi criada por Bram Moolenaar <Bram@vim.org>,
+":help Bram-Moolenaar"
+
+Envie quaisquer outros comentários, patches, flores e sugestões para
+a lista de discussão vim-dev: <vim-dev@vim.org>

lang/README.ru.txt

@@ -1,4 +1,4 @@
-README.rux.txt для версии 9.1 программы Vim — Vi IMproved.
+README.ru.txt для версии 9.1 программы Vim — Vi IMproved.
 
 
 ЧТО ТАКОЕ РЕДАКТОР VIM?
@@ -20,6 +20,11 @@ README.rux.txt для версии 9.1 программы Vim — Vi IMproved.
 функциональные клавиши клавиатуры необходимые команды, и использовать
 манипулятор «мышь».
 
+В редакторе Vim также обеспечивается (насколько это возможно) совместимость
+с POSIX-реализацией редактора vi, если он скомпилирован с минимальным набором
+функционала (обычно называемый vim.tiny). Данная сборка чаще всего используется
+во многих дистрибутивах Linux в качестве предустановленного редактора vi.
+
 Редактор Vim работает в ОС MS Windows (7, 8, 10, 11), macOS, Haiku, VMS и
 практически во всех UNIX-подобных системах.  А перенос на другие платформы не
 должен представлять особой сложности.
@@ -36,7 +41,7 @@ MS Windows 95/98/Me/NT/2000/XP/Vista, AmigaDOS, Atari MiNT, BeOS и RISC OS.
 возможностей.
 
 Существуют отдельные версии для Unix, PC, Amiga и некоторых других систем.
-Данный файл README.rux.txt поставляется вместе с архивом рабочих файлов
+Данный файл README.ru.txt поставляется вместе с архивом рабочих файлов
 программы.  Этот архив включает в себя документацию, файлы подсветки синтаксиса
 и другие файлы, которые используются редактором во время работы.  Чтобы
 запустить программу Vim, вы должны получить либо архив с исполняемыми файлами,
@@ -96,7 +101,7 @@ README_vms.txt		VMS
 Редактор Vim является благотворительным программным обеспечением.
 Использование и копирование программы Vim не ограничено, однако рекомендуется
 сделать добровольное пожертвование для нуждающихся детей в Уганде.  Чтобы узнать
-подробности, прочитайте, пожалуйста, файл "runtime/doc/uganda.rux" (введите
+подробности, прочитайте, пожалуйста, файл "runtime/doc/uganda.txt" (введите
 команду ":help uganda" в редакторе Vim).
 
 Краткое описание лицензии.
@@ -116,7 +121,7 @@ README_vms.txt		VMS
 над редактором Vim можно с помощью оказания финансовой поддержки.
 
 Пожертвованные вами деньги будут в основном направлены на оказание помощи детям
-Уганды, см. "runtime/doc/uganda.rux".  Однако в любом случае финансирование
+Уганды, см. "runtime/doc/uganda.txt".  Однако в любом случае финансирование
 будет способствовать повышению заинтересованности команды разработчиков
 в продолжении работы над редактором Vim!
 

lang/README.zh_cn.txt

@@ -0,0 +1,122 @@
+Vim: Vi IMproved 9.1 版本的 README.txt 文件
+
+
+什 么 是 VIM ？
+
+Vim 是经典 UNIX 编辑器 Vi 的一个极大改进版本。它新增了许多功能：多级撤销、语法高
+亮、命令行历史、在线帮助、拼写检查、文件名补全、块操作、脚本语言等。同时也提供了
+图形用户界面（GUI）。尽管如此，Vi 兼容性依然得以保留，习惯使用 Vi 的用户操作时仍
+会感到得心应手。与 Vi 的差异请参阅 "runtime/doc/vi_diff.txt"。
+
+此编辑器对于编辑代码和其他纯文本文件非常有用。所有命令都通过常规键盘字符输入，因
+此熟练盲打的用户能够高效工作。此外，用户可以将功能键映射到命令，并且可以使用鼠标。
+
+Vim 也致力于提供一个（基本）符合 POSIX 标准的 vi 实现。当它以最小功能集（通常称
+为 vim.tiny）编译时，被许多 Linux 发行版用作默认的 vi 编辑器。
+
+Vim 可在 MS-Windows (7, 8, 10, 11)、macOS、Haiku、VMS 以及几乎所有 UNIX 变体上运
+行。移植到其他系统应该不太困难。旧版本的 Vim 曾在 Amiga DOS、Atari MiNT、BeOS、
+MS-DOS、MS-Windows 95/98/Me/NT/2000/XP/Vista、RISC OS 和 OS/2 上运行。这些版本的
+维护现已终止。
+
+
+获 取 途 径
+
+通常你可以使用你喜欢的软件包管理器来安装 Vim。在 Mac 和 Linux 上，会预装一个简化
+版的 Vim，如果你需要更多功能，仍需要安装完整的 Vim。
+
+有针对 Unix、PC、Amiga 和其他一些系统的独立发行版。本 README.txt 文件随运行时存
+档一起提供。该存档包含文档、语法文件以及其他运行时使用的文件。要运行 Vim，你必须
+获取二进制存档或源代码存档之一。您需要哪一种取决于您想要运行 Vim 的系统以及您是
+否希望或必须自行编译。请查阅 "https://www.vim.org/download.php" 以了解当前可用的
+发行版概览。
+
+获取最新版 Vim 的常见方式：
+* 从 github 检出 git 仓库：https://github.com/vim/vim。
+* 以存档形式获取源代码：https://github.com/vim/vim/tags。
+* 从 vim-win32-installer 仓库获取 Windows 可执行文件：
+  https://github.com/vim/vim-win32-installer/releases。
+
+
+编 译
+
+如果你获得的是二进制发行版，则无需编译 Vim。如果你获得的是源代码发行版，编译 Vim
+所需的所有内容都在 "src" 目录中。请参阅 src/INSTALL 文件中的说明。
+
+
+安 装
+
+请查阅以下文件之一以获取系统特定的安装说明。这些文件位于仓库中的 READMEdir 目录，
+或者在你解压缩存档后的顶级目录中：
+
+README_ami.txt		Amiga
+README_unix.txt		Unix
+README_dos.txt		MS-DOS 和 MS-Windows
+README_mac.txt		Macintosh
+README_haiku.txt	Haiku
+README_vms.txt		VMS
+
+根据你使用的发行版，可能还有其他 README_*.txt 文件。
+
+
+文 档
+
+Vim tutor 是为初学者设计的一小时培训课程。通常可以通过 "vimtutor" 命令启动。更多
+信息请参阅 ":help tutor"。
+
+最佳方式是在 Vim 中使用 ":help" 命令。如果您尚未安装可执行文件，请阅读
+"runtime/doc/help.txt"。该文件包含指向其他文档文件的指引。用户手册采用书籍体例编
+排，是学习使用 Vim 的推荐资料。具体请参阅 ":help user-manual"。
+
+
+复 制 与 版 权
+
+Vim 是慈善软件。您可以尽情使用和复制它，但鼓励您捐款以帮助乌干达的孤儿。请阅读
+"runtime/doc/uganda.txt" 文件了解详情（在 Vim 中执行 ":help uganda"）。
+
+许可摘要：对于未经修改的 Vim 副本，其使用或分发不受任何限制。Vim 的部分内容亦可
+分发，但必须始终包含许可文本。对于修改版本，则需遵循若干限制条款。本许可证与 GPL
+兼容，您可使用 GPL 库编译 Vim 并进行分发。
+
+
+赞 助
+
+修复错误与增添新功能均需投入大量时间与精力。为支持开发工作并激励开发者持续完善
+Vim，敬请通过捐赠表达您的认可。
+
+您捐赠的资金将主要用于帮助乌干达的儿童。请参阅 "runtime/doc/uganda.txt"。但同时，
+您的捐赠也将激励开发团队持续投入 Vim 的开发工作。
+
+关于赞助的最新信息，请查看 Vim 网站：
+	https://www.vim.org/sponsor/
+
+
+贡 献
+
+如果您想帮助改进 Vim，请参阅 CONTRIBUTING.md 文件。
+
+
+信 息 与 支 持
+
+如果您在 macOS 上，可以使用 MacVim：https://macvim.org
+
+关于 Vim 的最新消息可以在 Vim 主页上找到：
+	https://www.vim.org/
+
+如果您遇到问题，请查阅 Vim 文档或使用技巧：
+	https://www.vim.org/docs.php
+	https://vim.fandom.com/wiki/Vim_Tips_Wiki
+
+如果您仍有问题或其他疑问，请使用其中一个邮件列表与 Vim 用户和开发者讨论：
+	https://www.vim.org/maillist.php
+
+如果其他方法都无效，请直接将错误报告发送到 vim-dev 邮件列表：
+	<vim-dev@vim.org>
+
+
+主 要 作 者
+
+Vim 主要由 Bram Moolenaar <Bram@vim.org> 创建，可通过 ":help Bram-Moolenaar" 命
+令了解更多信息。
+
+请将任何其他评论、补丁、鲜花和建议发送到 vim-dev 邮件列表：<vim-dev@vim.org>

nsis/Make_mvc.mak

@@ -0,0 +1,95 @@
+#
+# Makefile for MS Windows for create self-installing exe of Vim.
+# 2025-10-03, Restorer, restorer@mail2k.ru
+#
+
+
+# included common tools
+!INCLUDE ..\src\auto\nmake\tools.mak
+
+.SUFFIXES :
+
+!IFDEF PROGRAMW6432
+ProgFiles=%%PROGRAMFILES(x86)%%
+!ELSE
+ProgFiles=$(PROGRAMFILES)
+!ENDIF
+
+!IFDEF VIMSRC
+MKNSISFLAGS = /D"VIMSRC=$(VIMSRC)"
+!ENDIF
+
+!IFDEF VIMRT
+MKNSISFLAGS = $(MKNSISFLAGS) /D"VIMRT=$(VIMRT)"
+!ENDIF
+
+!IFDEF VIMTOOLS
+MKNSISFLAGS = $(MKNSISFLAGS) /D"VIMTOOLS=$(VIMTOOLS)"
+!ENDIF
+
+!IFDEF GETTEXT
+MKNSISFLAGS = $(MKNSISFLAGS) /D"GETTEXT=$(GETTEXT)"
+!ENDIF
+
+!IFDEF HAVE_UPX
+MKNSISFLAGS = $(MKNSISFLAGS) /DHAVE_UPX=$(HAVE_UPX)
+!ENDIF
+
+!IFDEF HAVE_NLS
+MKNSISFLAGS = $(MKNSISFLAGS) /DHAVE_NLS=$(HAVE_NLS)
+!ENDIF
+
+!IFDEF HAVE_MULTI_LANG
+MKNSISFLAGS = $(MKNSISFLAGS) /DHAVE_MULTI_LANG=$(HAVE_MULTI_LANG)
+!ENDIF
+
+!IFDEF WIN64
+MKNSISFLAGS = $(MKNSISFLAGS) /DWIN64=$(WIN64)
+!ENDIF
+
+!IFDEF ARM64
+MKNSISFLAGS = $(MKNSISFLAGS) /DARM64=$(ARM64)
+!ENDIF
+
+!IFDEF INCLUDE_LIBGCC
+MKNSISFLAGS = $(MKNSISFLAGS) /DINCLUDE_LIBGCC=$(INCLUDE_LIBGCC)
+!ENDIF
+
+!IFDEF X
+XX = /X"$(X:;=" /X")"
+!ENDIF
+
+# If necessary, correct the full path of the NSIS compiler in the next line.
+# Please do not enclose the path in quotation marks.
+MKNSIS = $(ProgFiles)\NSIS\makensis.exe
+
+MKNSISFLAGS = /INPUTCHARSET UTF8 $(MKNSISFLAGS)
+
+
+all : makeinst
+
+makeinst : prepare
+	^"$(MKNSIS)" $(MKNSISFLAGS) gvim.nsi $(XX)
+
+prepare : unzipicons license rename
+
+unzipicons : icons.zip
+	@ if exist %|fF\nul $(RD) %|fF
+	@ $(PS) $(PSFLAGS) \
+		Add-Type -AssemblyName 'System.IO.Compression.FileSystem'; \
+		[System.IO.Compression.ZipFile]::ExtractToDirectory('$**', '.')
+
+license : ..\lang\LICENSE.*.txt ..\LICENSE
+	!@ $(PS) $(PSFLAGS) \
+		Get-Content -Path '$**' -Encoding UTF8 ^| \
+		Set-Content -Path '..\lang\$(**B).nsis.txt' -Enc Unicode -Force
+
+rename :
+	@ ..\tools\rename.bat "$(SRC)" "$(DST)" 1> nul
+
+clean :
+	@ if exist ..\lang\LICENSE*.nsis.txt $(RM) ..\lang\LICENSE*.nsis.txt
+	@ if exist .\icons\nul $(RD) .\icons
+	@ if exist .\gvim??.exe $(RM) .\gvim??.exe
+
+# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=79 ft=make:

nsis/Makefile

@@ -0,0 +1,82 @@
+#
+# Makefile for UNIX-like for create self-installing exe of Vim.
+# 2025-10-03, Restorer, restorer@mail2k.ru
+#
+
+
+.SUFFIXES:
+.PHONY: all makeinst prepare rename clean 
+
+ifdef VIMSRC
+MKNSISFLAGS := -D"VIMSRC=$(VIMSRC)"
+endif
+
+ifdef VIMRT
+MKNSISFLAGS := $(MKNSISFLAGS) -D"VIMRT=$(VIMRT)"
+endif
+
+ifdef VIMTOOLS
+MKNSISFLAGS := $(MKNSISFLAGS) -D"VIMTOOLS=$(VIMTOOLS)"
+endif
+
+ifdef GETTEXT
+MKNSISFLAGS := $(MKNSISFLAGS) -D"GETTEXT=$(GETTEXT)"
+endif
+
+ifdef HAVE_UPX
+MKNSISFLAGS := $(MKNSISFLAGS) -DHAVE_UPX=$(HAVE_UPX)
+endif
+
+ifdef HAVE_NLS
+MKNSISFLAGS := $(MKNSISFLAGS) -DHAVE_NLS=$(HAVE_NLS)
+endif
+
+ifdef HAVE_MULTI_LANG
+MKNSISFLAGS := $(MKNSISFLAGS) -DHAVE_MULTI_LANG=$(HAVE_MULTI_LANG)
+endif
+
+ifdef WIN64
+MKNSISFLAGS := $(MKNSISFLAGS) -DWIN64=$(WIN64)
+endif
+
+ifdef ARM64
+MKNSISFLAGS := $(MKNSISFLAGS) -DARM64=$(ARM64)
+endif
+
+ifdef INCLUDE_LIBGCC
+MKNSISFLAGS := $(MKNSISFLAGS) -DINCLUDE_LIBGCC=$(INCLUDE_LIBGCC)
+endif
+
+ifdef X
+XX := -X"$(X:;=" -X")"
+endif
+
+MKNSISFLAGS := -INPUTCHARSET UTF8 $(MKNSISFLAGS)
+
+all: makeinst
+
+makeinst: prepare
+	makensis $(MKNSISFLAGS) gvim.nsi $(XX)
+
+prepare: unzipicons license rename
+
+unzipicons: icons.zip
+	if test -d `basename $? .zip` ; then rm -rf `basename $? .zip` ; fi
+	unzip $?
+
+license: ../lang/LICENSE.*.txt ../LICENSE
+	for lic in $? ; do \
+		bn=`basename $$lic .txt` ; \
+		awk 'sub("$$", "\r")' < $$lic | \
+		iconv -f UTF-8 -t UTF-16 > ../lang/$$bn.nsis.txt ; \
+	done
+
+rename:
+	../tools/rename.bat "$(SRC)" "$(DST)"
+
+clean:
+	rm -f ../lang/LICENSE*.nsis.txt
+	if test -d icons ; then rm -rf icons ; fi
+	if test -f gvim??.exe ; then rm -f gvim??.exe ; fi
+
+# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0 ft=make:

nsis/README.txt

@@ -3,22 +3,15 @@ Installation System (NSIS), available at http://nsis.sourceforge.net/
 
 To build the installable .exe file:
 
-1.  Unpack three archives:
-	PC sources
-	PC runtime
-	PC language files
-    You can generate these from the Unix sources and runtime plus the extra
-    archive (see the Makefile in the top directory).
+Preparatory stage
 
-2.  Go to the src directory and build:
-	gvim.exe (the OLE version),
-	vimrun.exe,
-	install.exe,
-	uninstall.exe,
-	tee/tee.exe,
-	xxd/xxd.exe
+1.  Clone using the git tool the Vim repository or download its zip file
+    available at:
+	https://github.com/vim/vim
 
-    Then execute tools/rename.bat to rename the executables.
+2.  Go to the "/src" directory and build the Vim editor, making sure to use the
+    following variable values: "GUI=yes"; "OLE=yes"; "VIMDLL=yes". See
+    INSTALLpc.txt and Make_mvc.mak for details.
 
 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
@@ -32,8 +25,8 @@ To build the installable .exe file:
 	https://www.mediafire.com/file/9edk4g3xvfgzby0/diff4Vim.zip/file
     When will you have "diff.exe" put it in the "../.." directory (above the
     "vim91" directory, it's the same for all Vim versions).  However, you can
-    specify another directory by passing /DVIMTOOLS=<dir> option to the
-    "makensis.exe" program via the command line.
+    specify a different directory by specifying the appropriate makefile value.
+    How to do this is described below.
 
 5.  For the terminal window to work in Vim, the library winpty is required.
     You can get it at the following url:
@@ -41,8 +34,8 @@ To build the installable .exe file:
     For the 32-bit version, rename "winpty.dll" from ia32/bin to "winpty32.dll",
     and for the 64-bit version — "winpty.dll" from x64/bin to "winpty64.dll".
     Put the renamed file and "winpty-agent.exe" in "../.." (above the "vim91"
-    directory).  However, you can specify another directory by passing
-    /DVIMTOOLS=<dir> option to the "makensis.exe" program via the command line.
+    directory).  However, you can specify a different directory by specifying
+    the appropriate makefile value. How to do this is described below.
 
 6.  To use stronger encryption, add the Sodium library.  You can get it here:
 	https://github.com/jedisct1/libsodium/releases/download/1.0.19-RELEASE/libsodium-1.0.19-msvc.zip
@@ -52,12 +45,7 @@ To build the installable .exe file:
     "../.." directory (above the "vim91" directory, where "diff.exe" and
     "winpty{32|64}.dll").
 
-7.  On MS Windows do "nmake.exe -f Make_mvc.mak uganda.nsis.txt" in runtime/doc.
-    On Unix-like system do "make runtime/doc/uganda.nsis.txt" in top directory
-    or "make uganda.nsis.txt" in runtime/doc.  The created files
-    "uganda.nsis.???" will be automatically converted to DOS file format.
-
-8.  Get gettext and iconv DLLs from the following site:
+7.  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
@@ -74,35 +62,51 @@ To build the installable .exe file:
 		libintl-8.dll
 		libiconv-2.dll
 
-    The default <GETTEXT directory> is "..", however, you can specify another
-    directory by passing /DGETTEXT=<dir> option to "makensis.exe" program via
-    the command line.
+    The default <GETTEXT directory> is "../..".  However, you can specify a
+    different directory by specifying the appropriate makefile value. How to do
+    this is described below.
 
-
-Install NSIS if you didn't do that already.
-Download Unicode version the ShellExecAsUser plug-in for NSIS from:
+8.  Install NSIS if you didn't do that already.
+    Download Unicode version the ShellExecAsUser plug-in for NSIS from:
 	https://nsis.sourceforge.io/ShellExecAsUser_plug-in
-and put ShellExecAsUser.dll to path\to\NSIS\Plugins\x86-unicode
+    and put "ShellExecAsUser.dll" to path\to\NSIS\Plugins\x86-unicode
 
+Installer assembly stage
 
-Unpack the images:
-	cd nsis
-	unzip icons.zip or 7z x icons.zip (on Unix-like or MS Windows)
-	WinRar.exe x icons.zip (on MS Windows)
+    On MS Windows, open the Developer Command Prompt for VS and go to the
+    "/nsis" directory and type the command
+	    nmake.exe -lf Make_mvc.mak [variables] all
 
-Then build gvim.exe:
-	cd nsis
-	makensis.exe [options] gvim.nsi
+    After the installer is created and you copy it to the desired location, run
+    the following command in the "/nsis" directory
+	    nmake.exe -lf Make_mvc.mak clean
 
-Options (not mandatory):
-    /DVIMSRC=<dir>	— directory where location of gvim_ole.exe, vimw32.exe,
+    On UNIX-like systems, go to the "/nsis" directory and type the command
+	    make -f Makefile [variables] all
+
+    After the installer is created and you copy it to the desired location, run
+    the following command in the "/nsis" directory
+	    make -f Makefile clean
+
+Variables and their values available for building the installer (not mandatory):
+
+    "VIMSRC=<dir>"	— directory where location of gvim_ole.exe, vimw32.exe,
 			    GvimExt/*, etc.
-    /DVIMRT=<dir>	— directory where location of runtime files
-    /DVIMTOOLS=<dir>    — directory where location of extra tools: diff.exe,
-			    winpty{32|64}.dll, winpty-agent.exe, libsodium.dll
-    /DGETTEXT=<dir>     — directory where location of gettext libraries
-    /DHAVE_UPX=1	— additional compression of the installer.  UPX program
+    "VIMRT=<dir>"	— directory where location of runtime files.
+    "VIMTOOLS=<dir>"    — directory where location of extra tools: diff.exe,
+			    winpty{32|64}.dll, winpty-agent.exe, libsodium.dll.
+    "GETTEXT=<dir>"     — directory where location of gettext libraries.
+    "HAVE_UPX=1"	— additional compression of the installer.  UPX program
 			    must be installed.
-    /DHAVE_NLS=0	— do not add native language support
-    /DHAVE_MULTI_LANG=0 — to create an English-only the installer
-    /DWIN64=1		— to create a 64-bit the installer
+    "HAVE_NLS=0"	— do not add native language support.
+    "HAVE_MULTI_LANG=0" — to create an English-only the installer.
+    "WIN64=1"		— to create a 64-bit the installer.
+    "ARM64=1"		— to create the installer for ARM64. The WIN64 variable
+			    must be set to 1.
+    "X=<scriptcmd>"	— executes scriptcmd in script.  If multiple scriptcmd
+			    are specified, they are separated by a semicolon.
+			    Example "X=OutFile MyVim.exe;XPMode on"
+    "MKNSIS=<dir>"	— the directory where the "makensis.exe" program is
+			    located.
+
+Note: for icons used in the installer, see the README.txt in the icons.zip

nsis/auxiliary.nsh

@@ -0,0 +1,148 @@
+# -*- coding: utf-8 -*-
+# NSIS helper file for creating a self-installing exe for Vim.
+# Contains service macros and functions. 
+# Last Change:	2025-09-03
+#
+
+!ifndef __AUXILIARY__NSH__
+  !define __AUXILIARY__NSH__
+
+# See https://nsis.sourceforge.io/LogicLib
+;FileExists is already part of LogicLib, but returns true for directories
+;as well as files
+  !macro _FileExists2 _a _b _t _f
+    !insertmacro _LOGICLIB_TEMP
+    StrCpy $_LOGICLIB_TEMP "0"
+;if path is not blank, continue to next check
+    StrCmp `${_b}` `` +4 0
+;if path exists, continue to next check (IfFileExists returns true if this
+;is a directory)
+    IfFileExists `${_b}` `0` +3
+;if path is not a directory, continue to confirm exists
+    IfFileExists `${_b}\*.*` +2 0
+    StrCpy $_LOGICLIB_TEMP "1" ;file exists
+;now we have a definitive value - the file exists or it does not
+    StrCmp $_LOGICLIB_TEMP "1" `${_t}` `${_f}`
+  !macroend
+  !undef FileExists
+  !define FileExists `"" FileExists2`
+  !macro _DirExists _a _b _t _f
+    !insertmacro _LOGICLIB_TEMP
+    StrCpy $_LOGICLIB_TEMP "0"
+;if path is not blank, continue to next check
+    StrCmp `${_b}` `` +3 0
+;if directory exists, continue to confirm exists
+    IfFileExists `${_b}\*.*` 0 +2
+    StrCpy $_LOGICLIB_TEMP "1"
+    StrCmp $_LOGICLIB_TEMP "1" `${_t}` `${_f}`
+  !macroend
+  !define DirExists `"" DirExists`
+
+# Get parent directory
+# Share this function both on installer and uninstaller
+  !macro GetParent un
+    Function ${un}GetParent
+      Exch $0  ; old $0 is on top of stack
+      Push $1
+      Push $2
+      StrCpy $1 -1
+      ${Do}
+	StrCpy $2 $0 1 $1
+	${If} $2 == ""
+	${OrIf} $2 == "\"
+	  ${ExitDo}
+	${EndIf}
+	IntOp $1 $1 - 1
+      ${Loop}
+      StrCpy $0 $0 $1
+      Pop $2
+      Pop $1
+      Exch $0  ; put $0 on top of stack, restore $0 to original value
+    FunctionEnd
+  !macroend
+
+  !insertmacro GetParent ""
+  !insertmacro GetParent "un."
+
+# Get home directory
+  !macro GetHomeDir un
+    Function ${un}GetHomeDir
+      Push $0
+      Push $1
+      ReadEnvStr $0 "HOME"
+      ${If} $0 == ""
+	ReadEnvStr $0 "HOMEDRIVE"
+	ReadEnvStr $1 "HOMEPATH"
+	StrCpy $0 "$0$1"
+	${If} $0 == ""
+	  ReadEnvStr $0 "USERPROFILE"
+	${EndIf}
+      ${EndIf}
+      Pop $1
+      Exch $0  ; put $0 on top of stack, restore $0 to original value
+    FunctionEnd
+  !macroend
+
+  !insertmacro GetHomeDir ""
+  !insertmacro GetHomeDir "un."
+
+# Saving the status of sections of the current installation in the registry
+  !macro SaveSectionSelection section_id reg_value
+    ${If} ${SectionIsSelected} ${section_id}
+      WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" ${reg_value} 1
+    ${Else}
+      WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" ${reg_value} 0
+    ${EndIf}
+  !macroend
+
+# Reading the status of sections from the registry of the previous installation 
+  !macro LoadSectionSelection section_id reg_value
+    ClearErrors
+    ReadRegDWORD $3 HKLM "${UNINST_REG_KEY_VIM}" ${reg_value}
+    ${IfNot} ${Errors}
+      ${If} $3 = 1
+	!insertmacro SelectSection ${section_id}
+      ${Else}
+	!insertmacro UnselectSection ${section_id}
+      ${EndIf}
+    ${EndIf}
+  !macroend
+
+# Reading the settings for _vimrc from the registry of a previous installation
+  !macro LoadDefaultVimrc out_var reg_value default_value
+    ClearErrors
+    ReadRegStr ${out_var} HKLM "${UNINST_REG_KEY_VIM}" ${reg_value}
+    ${If} ${Errors}
+    ${OrIf} ${out_var} == ""
+      StrCpy ${out_var} ${default_value}
+    ${EndIf}
+  !macroend
+
+# Get user locale
+  !if ${HAVE_NLS}
+    Var lng_usr  ; variable containing the locale of the current user
+
+    !include "StrFunc.nsh"
+    ${StrRep}
+
+    Function GetUserLocale
+      ClearErrors
+      System::Call \
+	  'kernel32::GetUserDefaultLocaleName(t.r19, *i${NSIS_MAX_STRLEN})'
+      StrCmp $R9 "zh-cn" coincide 0
+      StrCmp $R9 "zh-tw" coincide 0
+      StrCmp $R9 "pt-br" 0 part
+      coincide:
+      System::Call 'User32::CharLower(t r19 r19)*i${NSIS_MAX_STRLEN}'
+      ${StrRep} $lng_usr "$R9" "-" "_"
+      Goto done
+      part:
+      StrCpy $lng_usr $R9 2
+      done:
+    FunctionEnd
+  !endif
+
+
+
+!endif # __AUXILIARY__NSH__
+# vi:set ts=8 sw=2 sts=2 tw=79 wm=0 ft=nsis:

nsis/gvim_version.nsh

@@ -1,6 +0,0 @@
-# Generated from Makefile: define the version numbers
-!ifndef __GVIM_VER__NSH__
-!define __GVIM_VER__NSH__
-!define VER_MAJOR 9
-!define VER_MINOR 1
-!endif

nsis/lang/README.txt

@@ -18,17 +18,46 @@ allowable length of strings.  For example:
  drop-down lists on the .vimrc page - 55 characters.
 Characters in this case mean characters of the English alphabet.
 
-If you do not yet have a translated "uganda.txt" file and a main "README.txt"
+Once the message translation file is ready, it must be included in the
+"gvim.nsi" file.
+Find the line "# Include support for other languages:" in the file "gvim.nsi"
+and specify the name of the file with your translation below the line
+!if ${HAVE_MULTI_LANG}, similar to the entries already there. File names are
+specified in alphabetical order.
+
+If you do not yet have a translated "LICENSE" file and/or a main "README.txt"
 file, set the following values:
 
 for the license file
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
 
 for the readme.txt file
 LangString vim_readme_file 0 "README.txt"
 
 Once you have the translations of these files, then set the values for these
 variables similarly to what is done in the other translation files.
-Also add the appropriate entries to the "gvim.nsi" file as done for other
-languages.
+Translation files should be located in the "lang" subdirectory of the root
+directory. The name of the files is as follows: "README.xx.txt", where xx is the
+language code according to ISO639.
 
+
+There are two ways to test the installer in different languages:
+
+1. Find and uncomment the "!define MUI_LANGDLL_ALWAYSSHOW" line in the
+   "gvim.nsi" file and rebuild the installer.
+   Now every time you run it, you will see a dialog box with the possibility to
+   select the language of the installer.
+
+2. If the Vim editor is already installed in your system, delete the
+   "Installer Language" parameter in the Windows registry under
+   "HKEY_CURRENT_USER\Software\Vim".
+   Or you can create a file "NoLangInstallerVim.reg" with the following content:
+
+	Windows Registry Editor Version 5.00
+
+	[HKEY_CURRENT_USER\Software\Vim]
+	"Installer Language"=-
+
+   and apply it by double-clicking on it.
+   After these steps, when you start the installer, a window with the installer
+   language selection will also be displayed. 

nsis/lang/danish.nsi

@@ -19,15 +19,15 @@ LangString ^UninstallCaption ${LANG_DANISH}         "$(^Name) Uninstall"
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_DANISH} "${VIMRT}\doc\uganda.nsis.dax"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_DANISH} "..\lang\LICENSE.da.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_DANISH} "README.dax.txt"
+#LangString vim_readme_file ${LANG_DANISH} "README.da.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/dutch.nsi

@@ -21,15 +21,15 @@ LangString ^UninstallCaption ${LANG_DUTCH} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_DUTCH} "${VIMRT}\doc\uganda.nsis.nlx"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_DUTCH} "..\lang\LICENSE.nl.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_DUTCH} "README.nlx.txt"
+#LangString vim_readme_file ${LANG_DUTCH} "README.nl.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/english.nsi

@@ -21,7 +21,7 @@ LangString ^UninstallCaption ${LANG_ENGLISH} \
 # License file for the license page                                       {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file ${LANG_ENGLISH} "${VIMRT}\doc\uganda.nsis.txt"
+LicenseLangString page_lic_file ${LANG_ENGLISH} "..\lang\LICENSE.nsis.txt"
 
 ##############################################################################
 # README.txt file, which is opened after installation                     {{{1

nsis/lang/german.nsi

@@ -21,15 +21,15 @@ LangString ^UninstallCaption ${LANG_GERMAN} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_GERMAN} "${VIMRT}\doc\uganda.nsis.dex"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_GERMAN} "..\lang\LICENSE.de.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_GERMAN} "README.dex.txt"
+#LangString vim_readme_file ${LANG_GERMAN} "README.de.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/greek.nsi

@@ -21,15 +21,15 @@ LangString ^UninstallCaption ${LANG_GREEK} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_GREEK} "${VIMRT}\doc\uganda.nsis.elx"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_GREEK} "..\lang\LICENSE.el.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_GREEK} "README.elx.txt"
+#LangString vim_readme_file ${LANG_GREEK} "README.el.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/italian.nsi

@@ -21,15 +21,13 @@ LangString ^UninstallCaption ${LANG_ITALIAN} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_ITALIAN} "${VIMRT}\doc\uganda.nsis.itx"
+LicenseLangString page_lic_file ${LANG_ITALIAN} "..\lang\LICENSE.it.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_ITALIAN} "README.itx.txt"
+LangString vim_readme_file ${LANG_ITALIAN} "README.it.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/japanese.nsi

@@ -31,15 +31,15 @@ LangString ^InstallBtn       ${LANG_JAPANESE} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_JAPANESE} "${VIMRT}\doc\uganda.nsis.jax"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_JAPANESE} "..\lang\LICENSE.ja.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_JAPANESE} "README.jax.txt"
+#LangString vim_readme_file ${LANG_JAPANESE} "README.ja.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/portuguesebr.nsi

@@ -0,0 +1,291 @@
+# vi:set ts=8 sts=4 sw=4 et fdm=marker:
+#
+# portuguesebr.nsi: Brazilian Portuguese strings for gvim NSIS installer.
+#
+# Locale ID    : 1046 
+# Locale Name  : pt-BR
+# fileencoding : UTF-8
+# Author       : Rafael Fontenelle
+
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+
+
+# Overwrite the default translation.
+# These strings should be always English.  Otherwise dosinst.c fails.
+LangString ^SetupCaption     ${LANG_PORTUGUESEBR} \
+        "Configuração do $(^Name)"
+LangString ^UninstallCaption ${LANG_PORTUGUESEBR} \
+        "Desinstalação do $(^Name)"
+
+##############################################################################
+# License file for the license page                                       {{{1
+##############################################################################
+
+LicenseLangString page_lic_file ${LANG_PORTUGUESEBR} "..\lang\LICENSE.pt_br.nsis.txt"
+
+##############################################################################
+# README.txt file, which is opened after installation                     {{{1
+##############################################################################
+
+LangString vim_readme_file ${LANG_PORTUGUESEBR} "README.pt_br.txt"
+
+##############################################################################
+# MUI Configuration Strings                                               {{{1
+##############################################################################
+
+#LangString str_dest_folder          ${LANG_PORTUGUESEBR} \
+#    "Pasta de destino (Deve terminar com $\"vim$\")"
+
+LangString str_show_readme          ${LANG_PORTUGUESEBR} \
+    "Mostrar o README ao concluir a instalação"
+
+# Install types:
+LangString str_type_typical         ${LANG_PORTUGUESEBR} \
+    "Típica"
+
+LangString str_type_minimal         ${LANG_PORTUGUESEBR} \
+    "Mínima"
+
+LangString str_type_full            ${LANG_PORTUGUESEBR} \
+    "Completa"
+
+
+##############################################################################
+# Section Titles & Description                                            {{{1
+##############################################################################
+
+LangString str_section_old_ver      ${LANG_PORTUGUESEBR} \
+    "Desinstalar versões existentes"
+LangString str_desc_old_ver         ${LANG_PORTUGUESEBR} \
+    "Desinstala versões do Vim existentes no seu sistema."
+
+LangString str_section_exe          ${LANG_PORTUGUESEBR} \
+    "Vim GUI e arquivos de runtime"
+LangString str_desc_exe             ${LANG_PORTUGUESEBR} \
+    "Executáveis ​​e arquivos de runtime do Vim GUI. Este componente \
+     é obrigatório."
+
+LangString str_section_console      ${LANG_PORTUGUESEBR} \
+    "Programa de console do Vim"
+LangString str_desc_console         ${LANG_PORTUGUESEBR} \
+    "Versão de console do Vim (vim.exe)."
+
+LangString str_section_batch        ${LANG_PORTUGUESEBR} \
+    "Criar arquivos .bat"
+LangString str_desc_batch           ${LANG_PORTUGUESEBR} \
+    "Cria arquivos .bat para variantes do Vim no diretório Windows para \
+     usar na linha de comando."
+
+LangString str_group_icons          ${LANG_PORTUGUESEBR} \
+    "Criar ícones para o Vim"
+LangString str_desc_icons           ${LANG_PORTUGUESEBR} \
+    "Cria ícones para Vim em vários locais para facilitar o acesso rápido."
+
+LangString str_section_desktop      ${LANG_PORTUGUESEBR} \
+    "Na área de trabalho"
+LangString str_desc_desktop         ${LANG_PORTUGUESEBR} \
+    "Cria ícones para executáveis do gVim na área de trabalho."
+
+LangString str_section_start_menu   ${LANG_PORTUGUESEBR} \
+    "Na pasta Programas do Menu Iniciar"
+LangString str_desc_start_menu      ${LANG_PORTUGUESEBR} \
+    "Adiciona Vim na pasta de programas do menu iniciar."
+
+#LangString str_section_quick_launch ${LANG_PORTUGUESEBR} \
+#    "Na barra de Inicialização Rápida"
+#LangString str_desc_quick_launch    ${LANG_PORTUGUESEBR} \
+#    "Adiciona um atalho para o Vim na barra de inicialização rápida."
+
+LangString str_section_edit_with    ${LANG_PORTUGUESEBR} \
+    "Adicionar menu de contexto do Vim"
+LangString str_desc_edit_with       ${LANG_PORTUGUESEBR} \
+    "Adiciona o Vim à lista $\"Abrir com...$\" do menu de contexto."
+
+#LangString str_section_edit_with32  ${LANG_PORTUGUESEBR} \
+#    "Versão 32 bits"
+#LangString str_desc_edit_with32     ${LANG_PORTUGUESEBR} \
+#    "Adiciona o Vim à lista $\"Abrir com...$\" do menu de contexto \
+#     para aplicativos 32 bits."
+
+#LangString str_section_edit_with64  ${LANG_PORTUGUESEBR} \
+#    "Versão 64 bits"
+#LangString str_desc_edit_with64     ${LANG_PORTUGUESEBR} \
+#    "Adiciona o Vim à lista $\"Abrir com...$\" do menu de contexto \
+#     para aplicativos 64 bits."
+
+LangString str_section_vim_rc       ${LANG_PORTUGUESEBR} \
+    "Criar configuração padrão"
+LangString str_desc_vim_rc          ${LANG_PORTUGUESEBR} \
+    "Cria um arquivo de configuração padrão (_vimrc) se não já existir."
+
+LangString str_group_plugin         ${LANG_PORTUGUESEBR} \
+    "Criar diretórios de plugins"
+LangString str_desc_plugin          ${LANG_PORTUGUESEBR} \
+    "Cria diretórios de plugins. Diretórios de plugins permitem estender \
+     o Vim adicionando um arquivo a um direótrio."
+
+LangString str_section_plugin_home  ${LANG_PORTUGUESEBR} \
+    "Privados"
+LangString str_desc_plugin_home     ${LANG_PORTUGUESEBR} \
+    "Cria diretórios de plugins no diretório HOME."
+
+LangString str_section_plugin_vim   ${LANG_PORTUGUESEBR} \
+    "Compartilhados"
+LangString str_desc_plugin_vim      ${LANG_PORTUGUESEBR} \
+    "Cria diretórios de plugins no diretório de instalação do Vim, \
+     o qual é usado por todos os usuários do sistema."
+
+LangString str_section_nls          ${LANG_PORTUGUESEBR} \
+    "Suporte ao idioma nativo"
+LangString str_desc_nls             ${LANG_PORTUGUESEBR} \
+    "Instala arquivos para suporte ao idioma nativo."
+
+LangString str_unsection_register   ${LANG_PORTUGUESEBR} \
+    "Desregistrar Vim"
+LangString str_desc_unregister      ${LANG_PORTUGUESEBR} \
+    "Remove os registras do Vim do sistema."
+
+LangString str_unsection_exe        ${LANG_PORTUGUESEBR} \
+    "Remover arquivos executáveis/runtime do Vim"
+LangString str_desc_rm_exe          ${LANG_PORTUGUESEBR} \
+    "Remove todos os arquivos executáveis e de runtime do Vim."
+
+LangString str_ungroup_plugin       ${LANG_PORTUGUESEBR} \
+    "Remover diretórios de plugins"
+LangString str_desc_rm_plugin       ${LANG_PORTUGUESEBR} \
+    "Remove os diretórios de plugins se eles estiverem vazios."
+
+LangString str_unsection_plugin_home ${LANG_PORTUGUESEBR} \
+    "Privados"
+LangString str_desc_rm_plugin_home  ${LANG_PORTUGUESEBR} \
+    "Remove os diretórios de plugins do diretório HOME."
+
+LangString str_unsection_plugin_vim ${LANG_PORTUGUESEBR} \
+    "Compartilhados"
+LangString str_desc_rm_plugin_vim   ${LANG_PORTUGUESEBR} \
+    "Remove os diretórios de plugins do diretório de instalação do Vim."
+
+LangString str_unsection_rootdir    ${LANG_PORTUGUESEBR} \
+    "Remover diretório raiz do Vim"
+LangString str_desc_rm_rootdir      ${LANG_PORTUGUESEBR} \
+    "Remove o diretório raiz do Vim. Ele contém seus \
+     arquivos de configuração do Vim!"
+
+
+##############################################################################
+# Messages                                                                {{{1
+##############################################################################
+
+#LangString str_msg_too_many_ver  ${LANG_PORTUGUESEBR} \
+#    "Encontradas $vim_old_ver_count versões do Vim em seu sistema.$\r$\n\
+#     Este instalador só consegue lidar com ${VIM_MAX_OLD_VER} versões\
+#     no máximo.$\r$\n\
+#     Por favor, remova algumas versões e comece novamente."
+
+#LangString str_msg_invalid_root  ${LANG_PORTUGUESEBR} \
+#    "Caminho de instalação inválido: $vim_install_root!$\r$\n\
+#     Ele deve terminar com $\"vim$\"."
+
+#LangString str_msg_bin_mismatch  ${LANG_PORTUGUESEBR} \
+#    "Incompatibilidade de caminho de binários!$\r$\n$\r$\n\
+#     Esperava que o caminho de binários fosse $\"$vim_bin_path$\",$\r$\n\
+#     mas o sistema indica que o caminho de binários é $\"$INSTDIR$\"."
+
+#LangString str_msg_vim_running   ${LANG_PORTUGUESEBR} \
+#    "Vim ainda está em execução em seu sistema.$\r$\n\
+#     Por favor, feche todas as instâncias do Vim para poder continuar."
+
+#LangString str_msg_register_ole  ${LANG_PORTUGUESEBR} \
+#    "Tentativa de registrar o Vim com OLE. \
+#     Não há mensagem que indique se isso funciona ou não."
+
+#LangString str_msg_unreg_ole     ${LANG_PORTUGUESEBR} \
+#    "Tentando desregistrar o Vim com OLE. \
+#     Não há mensagem que indique se isso funciona ou não."
+
+#LangString str_msg_rm_start      ${LANG_PORTUGUESEBR} \
+#    "Desinstalando a seguinte versão:"
+
+#LangString str_msg_rm_fail       ${LANG_PORTUGUESEBR} \
+#    "Falha ao desinstalar a seguinte versão:"
+
+#LangString str_msg_no_rm_key     ${LANG_PORTUGUESEBR} \
+#    "Não foi possível encontrar a chave de registro do desinstalador."
+
+#LangString str_msg_no_rm_reg     ${LANG_PORTUGUESEBR} \
+#    "Não foi possível encontrar o desinstalador a partir do registro."
+
+#LangString str_msg_no_rm_exe     ${LANG_PORTUGUESEBR} \
+#    "Não foi possível acessar o desinstalador."
+
+#LangString str_msg_rm_copy_fail  ${LANG_PORTUGUESEBR} \
+#    "Falha ao copiar o desinstalador para um diretório temporário."
+
+#LangString str_msg_rm_run_fail   ${LANG_PORTUGUESEBR} \
+#    "Falha ao executar o desinstalador."
+
+#LangString str_msg_abort_install ${LANG_PORTUGUESEBR} \
+#    "Instalador será interrompido."
+
+LangString str_msg_install_fail  ${LANG_PORTUGUESEBR} \
+    "A instalação falhou. Mais sorte na próxima vez."
+
+LangString str_msg_rm_exe_fail   ${LANG_PORTUGUESEBR} \
+    "Alguns arquivos em $0 não foram excluídos!$\r$\n\
+     Você deve fazê-lo manualmente."
+
+#LangString str_msg_rm_root_fail  ${LANG_PORTUGUESEBR} \
+#    "AVISO: Não foi possível remover $\"$vim_install_root$\", \
+#    pois não está vazio!"
+
+LangString str_msg_uninstalling  ${LANG_PORTUGUESEBR} \
+    "Desinstalando a versão antiga..."
+
+LangString str_msg_registering   ${LANG_PORTUGUESEBR} \
+    "Registrando..."
+
+LangString str_msg_unregistering ${LANG_PORTUGUESEBR} \
+    "Desregistrando..."
+
+
+##############################################################################
+# Dialog Box                                                              {{{1
+##############################################################################
+
+LangString str_vimrc_page_title    ${LANG_PORTUGUESEBR} \
+    "Escolher configurações do _vimrc"
+LangString str_vimrc_page_subtitle ${LANG_PORTUGUESEBR} \
+    "Escolha as configurações para melhorias, teclado e mouse."
+
+LangString str_msg_compat_title    ${LANG_PORTUGUESEBR} \
+    " Comportamento Vi / Vim "
+LangString str_msg_compat_desc     ${LANG_PORTUGUESEBR} \
+    "&Compatibilidade e melhorias"
+LangString str_msg_compat_vi       ${LANG_PORTUGUESEBR} \
+    "Compatível com Vi"
+LangString str_msg_compat_vim      ${LANG_PORTUGUESEBR} \
+    "Vim original"
+LangString str_msg_compat_defaults ${LANG_PORTUGUESEBR} \
+    "Vim com algumas melhorias (carrega defaults.vim)"
+LangString str_msg_compat_all      ${LANG_PORTUGUESEBR} \
+    "Vim com todas as melhorias (carrega vimrc_example.vim) (Padrão)"
+
+LangString str_msg_keymap_title   ${LANG_PORTUGUESEBR} \
+    " Mapeamentos "
+LangString str_msg_keymap_desc    ${LANG_PORTUGUESEBR} \
+    "&Remapear algumas teclas para o Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
+LangString str_msg_keymap_default ${LANG_PORTUGUESEBR} \
+    "Não remapear teclas (Padrão)"
+LangString str_msg_keymap_windows ${LANG_PORTUGUESEBR} \
+    "Remapear algumas teclas"
+
+LangString str_msg_mouse_title   ${LANG_PORTUGUESEBR} \
+    " Mouse "
+LangString str_msg_mouse_desc    ${LANG_PORTUGUESEBR} \
+    "&Comportamento de botões direito e esquerdo"
+LangString str_msg_mouse_default ${LANG_PORTUGUESEBR} \
+    "Direito: menu popup, Esquerdo: modo visual (Padrão)"
+LangString str_msg_mouse_windows ${LANG_PORTUGUESEBR} \
+    "Direito: menu popup, Esquerdo: modo de seleção (Windows)"
+LangString str_msg_mouse_unix    ${LANG_PORTUGUESEBR} \
+    "Direito: estende seleção, Esquerdo: modo visual (Unix)"

nsis/lang/russian.nsi

@@ -21,13 +21,13 @@ LangString ^UninstallCaption ${LANG_RUSSIAN} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file ${LANG_RUSSIAN} "${VIMRT}\doc\uganda.nsis.rux"
+LicenseLangString page_lic_file ${LANG_RUSSIAN} "..\lang\LICENSE.ru.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
-LangString vim_readme_file ${LANG_RUSSIAN} "README.rux.txt"
+LangString vim_readme_file ${LANG_RUSSIAN} "README.ru.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/serbian.nsi

@@ -21,15 +21,15 @@ LangString ^UninstallCaption ${LANG_SERBIAN} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_SERBIAN} "${VIMRT}\doc\uganda.nsis.srx"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_SERBIAN} "..\lang\LICENSE.sr.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_SERBIAN} "README.srx.txt"
+#LangString vim_readme_file ${LANG_SERBIAN} "README.sr.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/simpchinese.nsi

@@ -22,16 +22,14 @@ LangString ^UninstallCaption ${LANG_SIMPCHINESE} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_SIMPCHINESE} \
-#        "${VIMRT}\doc\uganda.nsis.cnx"
+LicenseLangString page_lic_file ${LANG_SIMPCHINESE} \
+        "..\lang\LICENSE.zh_cn.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_SIMPCHINESE} "README.cnx.txt"
+LangString vim_readme_file ${LANG_SIMPCHINESE} "README.zh_cn.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/tradchinese.nsi

@@ -22,16 +22,16 @@ LangString ^UninstallCaption ${LANG_TRADCHINESE} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
 #LicenseLangString page_lic_file ${LANG_TRADCHINESE} \
-#        "${VIMRT}\doc\uganda.nsis.twx"
+#        "..\lang\LICENSE.zh_tw.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_TRADCHINESE} "README.twx.txt"
+#LangString vim_readme_file ${LANG_TRADCHINESE} "README.zh_tw.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/turkish.nsi

@@ -20,15 +20,15 @@ LangString ^UninstallCaption ${LANG_TURKISH} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_TURKISH} "${VIMRT}\doc\uganda.nsis.trx"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_TURKISH} "..\lang\LICENSE.tr.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_TURKISH} "README.trx.txt"
+#LangString vim_readme_file ${LANG_TURKISH} "README.tr.txt"
 
 ##############################################################################
 

runtime/autoload/ccomplete.vim

@@ -3,7 +3,7 @@ vim9script noclear
 # Vim completion script
 # Language:	C
 # Maintainer:	The Vim Project <https://github.com/vim/vim>
-# Last Change:	2024 Jun 06
+# Last Change:	2025 Jul 24
 #		Rewritten in Vim9 script by github user lacygoill
 # Former Maintainer:   Bram Moolenaar <Bram@vim.org>
 
@@ -121,6 +121,10 @@ export def Complete(findstart: bool, abase: string): any # {{{1
     endif
   endwhile
 
+  if complete_check()
+      return v:none
+  endif
+
   # Find the variable items[0].
   # 1. in current function (like with "gd")
   # 2. in tags file(s) (like with ":tag")
@@ -135,6 +139,9 @@ export def Complete(findstart: bool, abase: string): any # {{{1
       # Handle multiple declarations on the same line.
       var col2: number = col - 1
       while line[col2] != ';'
+        if complete_check()
+            return res
+        endif
         --col2
       endwhile
       line = line[col2 + 1 :]
@@ -145,6 +152,9 @@ export def Complete(findstart: bool, abase: string): any # {{{1
       # declaration.
       var col2: number = col - 1
       while line[col2] != ','
+        if complete_check()
+            return res
+        endif
         --col2
       endwhile
       if line[col2 + 1 : col - 1] =~ ' *[^ ][^ ]*  *[^ ]'
@@ -215,6 +225,9 @@ export def Complete(findstart: bool, abase: string): any # {{{1
 
     res = []
     for i: number in len(diclist)->range()
+      if complete_check()
+          return res
+      endif
       # New ctags has the "typeref" field.  Patched version has "typename".
       if diclist[i]->has_key('typename')
         res = res->extend(diclist[i]['typename']->StructMembers(items[1 :], true))
@@ -246,6 +259,9 @@ export def Complete(findstart: bool, abase: string): any # {{{1
   var last: number = len(items) - 1
   var brackets: string = ''
   while last >= 0
+    if complete_check()
+        return res
+    endif
     if items[last][0] != '['
       break
     endif
@@ -311,6 +327,9 @@ def Dict2info(dict: dict<any>): string # {{{1
 # Use all the items in dictionary for the "info" entry.
   var info: string = ''
   for k: string in dict->keys()->sort()
+    if complete_check()
+        return info
+    endif
     info  ..= k .. repeat(' ', 10 - strlen(k))
     if k == 'cmd'
       info ..= dict['cmd']
@@ -346,6 +365,9 @@ def ParseTagline(line: string): dict<any> # {{{1
       endwhile
     endif
     for i: number in range(n + 1, len(l) - 1)
+      if complete_check()
+        return d
+      endif
       if l[i] == 'file:'
         d['static'] = 1
       elseif l[i] !~ ':'
@@ -441,6 +463,9 @@ def Nextitem( # {{{1
   # Try to recognize the type of the variable.  This is rough guessing...
   var res: list<dict<string>>
   for tidx: number in len(tokens)->range()
+    if complete_check()
+        return res
+    endif
 
     # Skip tokens starting with a non-ID character.
     if tokens[tidx] !~ '^\h'
@@ -467,6 +492,11 @@ def Nextitem( # {{{1
     # Use the tags file to find out if this is a typedef.
     var diclist: list<dict<any>> = taglist('^' .. tokens[tidx] .. '$')
     for tagidx: number in len(diclist)->range()
+
+      if complete_check()
+        return res
+      endif
+
       var item: dict<any> = diclist[tagidx]
 
       # New ctags has the "typeref" field.  Patched version has "typename".
@@ -559,6 +589,9 @@ def StructMembers( # {{{1
   endif
   if !cached
     while 1
+      if complete_check()
+        return []
+      endif
       execute 'silent! keepjumps noautocmd '
         .. n .. 'vimgrep ' .. '/\t' .. typename .. '\(\t\|$\)/j '
         .. fnames
@@ -581,6 +614,9 @@ def StructMembers( # {{{1
   var idx: number = 0
   var target: string
   while 1
+    if complete_check()
+        return []
+    endif
     if idx >= len(items)
       target = ''  # No further items, matching all members
       break
@@ -619,6 +655,9 @@ def StructMembers( # {{{1
     # Skip over next [...] items
     ++idx
     while 1
+      if complete_check()
+        return matches
+      endif
       if idx >= len(items)
         return matches  # No further items, return the result.
       endif
@@ -646,6 +685,9 @@ def SearchMembers( # {{{1
 # When "all" is true find all, otherwise just return 1 if there is any member.
   var res: list<dict<string>>
   for i: number in len(matches)->range()
+    if complete_check()
+        return res
+    endif
     var typename: string = ''
     var line: string
     if matches[i]->has_key('dict')

runtime/autoload/dist/man.vim

@@ -5,6 +5,8 @@
 " Autoload Split: Bram Moolenaar
 " Last Change: 	2024 Jan 17 (make it work on AIX, see #13847)
 " 		2024 Jul 06 (honor command modifiers, #15117)
+" 		2025 Mar 05 (add :keepjumps, #16791)
+" 		2025 Mar 09 (improve :Man completion for man-db, #16843)
 
 let s:cpo_save = &cpo
 set cpo-=C
@@ -34,6 +36,88 @@ endtry
 
 unlet! uname_s
 
+let s:man_db_pages_by_section = v:null
+func! s:ManDbPagesBySection() abort
+  if s:man_db_pages_by_section isnot v:null
+    return s:man_db_pages_by_section
+  endif
+  let s:man_db_pages_by_section = {}
+  let list_command = 'apropos --long .'
+  let unparsed_lines = []
+  for line in systemlist(list_command)
+    " Typical lines:
+    " vim (1)              - Vi IMproved, a programmer's text editor
+    "
+    " Unusual lines:
+    " pgm_read_ T _ (3avr) - (unknown subject)
+    "
+    " Code that shows the line's format:
+    " https://gitlab.com/man-db/man-db/-/blob/2607d203472efb036d888e9e7997724a41a53876/src/whatis.c#L409
+    let match = matchlist(line, '^\(.\{-1,}\) (\(\S\+\)) ')
+    if empty(match)
+      call add(unparsed_lines, line)
+      continue
+    endif
+    let [page, section] = match[1:2]
+    if !has_key(s:man_db_pages_by_section, section)
+      let s:man_db_pages_by_section[section] = []
+    endif
+    call add(s:man_db_pages_by_section[section], page)
+  endfor
+  if !empty(unparsed_lines)
+    echomsg 'Unable to parse ' .. string(len(unparsed_lines)) .. ' lines ' ..
+          \ 'from the output of `' .. list_command .. '`. Example lines:'
+    for line in unparsed_lines[:9]
+      echomsg line
+    endfor
+  endif
+  return s:man_db_pages_by_section
+endfunc
+
+func! dist#man#Reload() abort
+  if g:ft_man_implementation ==# 'man-db'
+    let s:man_db_pages_by_section = v:null
+    call s:ManDbPagesBySection()
+  endif
+endfunc
+
+func! s:StartsWithCaseInsensitive(haystack, needle) abort
+  if empty(a:needle)
+    return v:true
+  endif
+  return a:haystack[:len(a:needle)-1] ==? a:needle
+endfunc
+
+func! dist#man#ManDbComplete(arg_lead, cmd_line, cursor_pos) abort
+  let args = split(trim(a:cmd_line[: a:cursor_pos - 1], '', 1), '', v:true)
+  let pages_by_section = s:ManDbPagesBySection()
+  if len(args) > 2
+    " Page in the section args[1]. At least on Debian testing as of
+    " 2025-03-06, man seems to match sections case-insensitively and match any
+    " prefix of the section. E.g., `man 3 sigprocmask` and `man 3PoSi
+    " sigprocmask` with both load sigprocmask(3posix) even though the 3 in the
+    " first command is also the name of a different section.
+    let results = []
+    for [section, pages] in items(pages_by_section)
+      if s:StartsWithCaseInsensitive(section, args[1])
+        call extend(results, pages)
+      endif
+    endfor
+  else
+    " Could be a section, or a page in any section. Add space after sections
+    " since there has to be a second argument in that case.
+    let results = flattennew(values(pages_by_section), 1)
+    for section in keys(pages_by_section)
+      call add(results, section .. ' ')
+    endfor
+  endif
+  call sort(results)
+  call uniq(results)
+  call filter(results,
+        \ {_, val -> s:StartsWithCaseInsensitive(val, a:arg_lead)})
+  return results
+endfunc
+
 func s:ParseIntoPageAndSection()
   " Accommodate a reference that terminates in a hyphen.
   "
@@ -188,7 +272,7 @@ func dist#man#GetPage(cmdmods, ...)
   setl buftype=nofile noswapfile
 
   setl fdc=0 ma nofen nonu nornu
-  %delete _
+  keepjumps %delete _
   let unsetwidth = 0
   if empty($MANWIDTH)
     let $MANWIDTH = winwidth(0)
@@ -218,10 +302,10 @@ func dist#man#GetPage(cmdmods, ...)
   endif
   " Remove blank lines from top and bottom.
   while line('$') > 1 && getline(1) =~ '^\s*$'
-    1delete _
+    keepjumps 1delete _
   endwhile
   while line('$') > 1 && getline('$') =~ '^\s*$'
-    $delete _
+    keepjumps $delete _
   endwhile
   1
   setl ft=man nomod

runtime/autoload/dist/script.vim

@@ -4,7 +4,7 @@ vim9script
 # Invoked from "scripts.vim" in 'runtimepath'
 #
 # Maintainer:	The Vim Project <https://github.com/vim/vim>
-# Last Change:	2023 Aug 10
+# Last Change:	2025 Dec 22
 # Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 export def DetectFiletype()
@@ -26,8 +26,9 @@ def DetectFromHashBang(firstline: string)
   # "#!/usr/bin/bash" to make matching easier.
   # Recognize only a few {options} that are commonly used.
   if line1 =~ '^#!\s*\S*\<env\s'
-    line1 = substitute(line1, '\S\+=\S\+', '', 'g')
-    line1 = substitute(line1, '\(-[iS]\|--ignore-environment\|--split-string\)', '', '')
+    line1 = substitute(line1, '\s\zs--split-string[ \t=]', '', '')
+    line1 = substitute(line1, '\s\zs[A-Za-z0-9_]\+=\S*\ze\s', '', 'g')
+    line1 = substitute(line1, '\s\zs\%(-[iS]\+\|--ignore-environment\)\ze\s', '', 'g')
     line1 = substitute(line1, '\<env\s\+', '', '')
   endif
 
@@ -133,6 +134,9 @@ export def Exe2filetype(name: string, line1: string): string
   elseif name =~ 'node\(js\)\=\>\|js\>' || name =~ 'rhino\>'
     return 'javascript'
 
+  elseif name =~# 'just'
+    return 'just'
+
     # BC calculator
   elseif name =~ '^bc\>'
     return 'bc'
@@ -229,6 +233,10 @@ export def Exe2filetype(name: string, line1: string): string
   elseif name =~ '^execlineb\>'
     return 'execline'
 
+    # Bpftrace
+  elseif name =~ '^bpftrace\>'
+    return 'bpftrace'
+
     # Vim
   elseif name =~ '^vim\>'
     return 'vim'
@@ -260,6 +268,7 @@ def DetectFromText(line1: string)
 
   # ELM Mail files
   elseif line1 =~ '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .* \(19\|20\)\d\d$'
+      || line1 =~ '^\creturn-path:\s<.*@.*>$'
     setl ft=mail
 
   # Mason
@@ -282,6 +291,7 @@ def DetectFromText(line1: string)
     # Diff file:
     # - "diff" in first line (context diff)
     # - "Only in " in first line
+    # - "34,35c34,35" normal diff format output
     # - "--- " in first line and "+++ " in second line (unified diff).
     # - "*** " in first line and "--- " in second line (context diff).
     # - "# It was generated by makepatch " in the second line (makepatch diff).
@@ -290,7 +300,7 @@ def DetectFromText(line1: string)
     # - "=== ", "--- ", "+++ " (bzr diff, common case)
     # - "=== (removed|added|renamed|modified)" (bzr diff, alternative)
     # - "# HG changeset patch" in first line (Mercurial export format)
-  elseif line1 =~ '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\>\|# It was generated by makepatch \|Index:\s\+\f\+\r\=$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\|# HG changeset patch\)'
+  elseif line1 =~ '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\(,\d\+\)\=\>$\|# It was generated by makepatch \|Index:\s\+\f\+\r\=$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\|# HG changeset patch\)'
 	 || (line1 =~ '^--- ' && line2 =~ '^+++ ')
 	 || (line1 =~ '^\* looking for ' && line2 =~ '^\* comparing to ')
 	 || (line1 =~ '^\*\*\* ' && line2 =~ '^--- ')
@@ -449,6 +459,12 @@ def DetectFromText(line1: string)
   elseif line1 =~ '^#n\%($\|\s\)'
     setl ft=sed
 
+  elseif line1 =~ '^#\s\+Reconstructed via infocmp from file:'
+    setl ft=terminfo
+
+  elseif line1 =~ '^File: .*\.info,  Node: .*,  \%(Next\|Prev\): .*,  Up: \|This is the top of the INFO tree.'
+    setl ft=info
+
   else
     var lnum = 1
     while getline(lnum) =~ "^? " && lnum < line("$")

runtime/autoload/dist/vim.vim

@@ -1,9 +1,9 @@
 " Vim runtime support library,
-" runs the vim9 script version or legacy script version
+" runs the Vim9 script version or legacy script version
 " on demand (mostly for Neovim compatability)
 "
 " Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Nov 04
+" Last Change:	2025 Apr 27
 
 
 " enable the zip and gzip plugin by default, if not set

runtime/autoload/dist/vim9.vim

@@ -2,19 +2,146 @@ vim9script
 
 # Vim runtime support library
 #
-# Maintainer:	The Vim Project <https://github.com/vim/vim>
-# Last Change:	2023 Oct 25
+# Maintainer:   The Vim Project <https://github.com/vim/vim>
+# Last Change:  2025 Dec 21
 
 export def IsSafeExecutable(filetype: string, executable: string): bool
-    if empty(exepath(executable))
-      return v:false
+  if empty(exepath(executable))
+    return v:false
+  endif
+  var cwd = getcwd()
+  return get(g:, filetype .. '_exec', get(g:, 'plugin_exec', 0))
+    && (fnamemodify(exepath(executable), ':p:h') !=# cwd
+      || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1
+        && cwd != '.'))
+enddef
+
+def Redir(): string
+  if get(g:, 'netrw_suppress_gx_mesg', true)
+    if &srr =~# "%s"
+      return printf(&srr, has("win32") ? "nul" : "/dev/null")
+    elseif &srr =~# '>&\?$'
+      return &srr .. (has("win32") ? "nul" : "/dev/null")
+    else
+      return &srr .. (has("win32") ? "> nul" : "> /dev/null")
     endif
-    var cwd = getcwd()
-    return get(g:, filetype .. '_exec', get(g:, 'plugin_exec', 0))
-      && (fnamemodify(exepath(executable), ':p:h') !=# cwd
-          || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1
-              && cwd != '.'))
+  endif
+  return ''
+enddef
+
+if has('unix')
+  if has('win32unix')
+    # Cygwin provides cygstart
+    if executable('cygstart')
+      export def Launch(args: string)
+        execute $'silent ! cygstart --hide {args} {Redir()}' | redraw!
+      enddef
+    elseif !empty($MSYSTEM) && executable('start')
+      # MSYS2/Git Bash comes by default without cygstart; see
+      # https://www.msys2.org/wiki/How-does-MSYS2-differ-from-Cygwin
+      # Instead it provides /usr/bin/start script running `cmd.exe //c start`
+      # Adding "" //b` sets void title, hides cmd window and blocks path conversion
+      # of /b to \b\ " by MSYS2; see https://www.msys2.org/docs/filesystem-paths/
+      export def Launch(args: string)
+        execute $'silent !start "" //b {args} {Redir()}' | redraw!
+      enddef
+    else
+      # imitate /usr/bin/start script for other environments and hope for the best
+      export def Launch(args: string)
+        execute $'silent !cmd /c start "" /b {args} {Redir()}' | redraw!
+      enddef
+    endif
+  elseif exists('$WSL_DISTRO_NAME') # use cmd.exe to start GUI apps in WSL
+    export def Launch(args: string)
+      const command = (args =~? '\v<\f+\.(exe|com|bat|cmd)>')
+        ? $'cmd.exe /c start /b {args} {Redir()}'
+        : $'nohup {args} {Redir()} &'
+      execute $'silent ! {command}' | redraw!
+    enddef
+  else
+    export def Launch(args: string)
+      const fork = has('gui_running') ? '&' : ''
+      execute $':silent ! nohup {args} {Redir()} {fork}' | redraw!
+    enddef
+  endif
+elseif has('win32')
+  export def Launch(args: string)
+    try
+      execute ':silent !start' args | redraw!
+    catch /^Vim(!):E371:/
+      echohl ErrorMsg
+      echom "dist#vim9#Launch(): can not start" args
+      echohl None
+    endtry
+  enddef
+else
+  export def Launch(dummy: string)
+    echom 'No common launcher found'
+  enddef
+endif
+
+var os_viewer = null_string
+# Git Bash
+if has('win32unix')
+  # (cyg)start suffices
+  os_viewer = ''
+# Windows
+elseif has('win32')
+  os_viewer = '' # Use :!start
+# WSL
+elseif executable('explorer.exe')
+  os_viewer = 'explorer.exe'
+# Linux / BSD
+elseif executable('xdg-open')
+  os_viewer = 'xdg-open'
+# MacOS
+elseif executable('open')
+  os_viewer = 'open'
+endif
+
+def Viewer(): string
+  # g:Openprg could be a string of program + its arguments, test if first
+  # argument is executable
+  var user_viewer = get(g:, "Openprg", get(g:, "netrw_browsex_viewer", ""))
+
+  # Take care of an off-by-one check for "for" too
+  if executable(trim(user_viewer))
+    return user_viewer
+  endif
+
+  var args = split(user_viewer, '\s\+\zs')
+  var viewer = get(args, 0, '')
+
+  for arg in args[1 :]
+    if executable(trim(viewer))
+      return user_viewer
+    endif
+
+    viewer ..= arg
+  endfor
+
+  if os_viewer == null
+    echoerr "No program to open this path found. See :help Open for more information."
+  endif
+
+  return os_viewer
+enddef
+
+export def Open(file: string)
+  # disable shellslash for shellescape, required on Windows #17995
+  if exists('+shellslash') && &shellslash
+    &shellslash = false
+    defer setbufvar('%', '&shellslash', true)
+  endif
+  if &shell == 'pwsh' || &shell == 'powershell'
+    const shell = &shell
+    setlocal shell&
+    defer setbufvar('%', '&shell', shell)
+  endif
+  Launch($"{Viewer()} {shellescape(file, 1)}")
 enddef
 
 # Uncomment this line to check for compilation errors early
 # defcompile
+
+# vim: ts=8 sts=2 sw=2 et

runtime/autoload/dist/vimindent.vim

@@ -2,12 +2,9 @@ vim9script
 
 # Language:     Vim script
 # Maintainer:   github user lacygoill
-# Last Change:  2024 Dec 26
+# Last Change:  2025 Oct 09
 #
 # Includes changes from The Vim Project:
-#  - 2024 Feb 09: Fix indent after literal Dict (A. Radev via #13966)
-#  - 2024 Nov 08: Fix indent after :silent! function (D. Kearns via #16009)
-#  - 2024 Dec 26: Fix indent for enums (Jim Zhou via #16293)
 
 # NOTE: Whenever you change the code, make sure the tests are still passing:
 #
@@ -23,9 +20,8 @@ def IndentMoreInBracketBlock(): number # {{{2
     if get(g:, 'vim_indent', {})
             ->get('more_in_bracket_block', false)
         return shiftwidth()
-    else
-        return 0
     endif
+    return 0
 enddef
 
 def IndentMoreLineContinuation(): number # {{{2
@@ -35,9 +31,8 @@ def IndentMoreLineContinuation(): number # {{{2
 
     if n->typename() == 'string'
         return n->eval()
-    else
-        return n
     endif
+    return n
 enddef
 # }}}2
 
@@ -145,7 +140,7 @@ const HEREDOC_OPERATOR: string = '\s=<<\s\@=\%(\s\+\%(trim\|eval\)\)\{,2}'
 
 # A better regex would be:
 #
-#     [^-+*/%.:# \t[:alnum:]\"|]\@=.\|->\@!\%(=\s\)\@!\|[+*/%]\%(=\s\)\@!
+#     [^-+*/%.:#[:blank:][:alnum:]\"|]\|->\@!\%(=\s\)\@!\|[+*/%]\%(=\s\)\@!
 #
 # But sometimes, it can be too costly and cause `E363` to be given.
 const PATTERN_DELIMITER: string = '[-+*/%]\%(=\s\)\@!'
@@ -193,10 +188,9 @@ const MODIFIERS: dict<string> = {
 patterns =<< trim eval END
     argdo\>!\=
     bufdo\>!\=
-    cdo\>!\=
+    [cl]f\=do\>!\=
     folddoc\%[losed]\>
     foldd\%[oopen]\>
-    ldo\=\>!\=
     tabdo\=\>
     windo\>
     au\%[tocmd]\>!\=.*
@@ -290,9 +284,9 @@ patterns = []
     for kwds: list<string> in BLOCKS
         for kwd: string in kwds[0 : -2]
             if MODIFIERS->has_key(kwd->Unshorten())
-                patterns += [$'\%({MODIFIERS[kwd]}\)\={kwd}']
+                patterns->add($'\%({MODIFIERS[kwd]}\)\={kwd}')
             else
-                patterns += [kwd]
+                patterns->add(kwd)
             endif
         endfor
     endfor
@@ -347,8 +341,10 @@ const PLUS_MINUS_COMMAND: string = '^\s*[+-]\s*$'
 patterns =<< trim eval END
     {'\'}<argd\%[elete]\s\+\*\s*$
     \<[lt]\=cd!\=\s\+-\s*$
-    \<norm\%[al]!\=\s*\S\+$
-    \%(\<sil\%[ent]!\=\s\+\)\=\<[nvxsoilct]\=\%(nore\|un\)map!\=\s
+    \<norm\%[al]!\=\s\+.*$
+    \<reg\%[isters]\%(\s\+\S\+\)\+$
+    \%(\<sil\%[ent]!\=\s\+\)\=\<[nvxsoilct]\=\%(nore\|un\)\=map!\=\s
+    \<set\%(\%[global]\|\%[local]\)\>.*,$
     {PLUS_MINUS_COMMAND}
 END
 
@@ -405,6 +401,7 @@ const LINE_CONTINUATION_AT_SOL: string = '^\s*\%('
     .. '\|' .. '[#"]\\ '
     .. '\|' .. OPERATOR
     .. '\|' .. '->\s*\h'
+    .. '\|' .. '->\s*(' # lambda call: ->((v) => v ? "ON" : "OFF")()
     .. '\|' .. '\.\h'  # dict member
     .. '\|' .. '|'
     # TODO: `}` at the start of a line is not necessarily a line continuation.
@@ -430,6 +427,9 @@ export def Expr(lnum = v:lnum): number # {{{2
     elseif line_A.lnum->IsRightBelow('HereDoc')
         var ind: number = b:vimindent.startindent
         unlet! b:vimindent
+        if line_A.text =~ ENDS_BLOCK_OR_CLAUSE
+            return ind - shiftwidth()
+        endif
         return ind
     endif
 
@@ -444,9 +444,8 @@ export def Expr(lnum = v:lnum): number # {{{2
     if line_A.text =~ BACKSLASH_AT_SOL
         if line_B.text =~ BACKSLASH_AT_SOL
             return Indent(line_B.lnum)
-        else
-            return Indent(line_B.lnum) + IndentMoreLineContinuation()
         endif
+        return Indent(line_B.lnum) + IndentMoreLineContinuation()
     endif
 
     if line_A->AtStartOf('FuncHeader')
@@ -459,9 +458,8 @@ export def Expr(lnum = v:lnum): number # {{{2
         unlet! b:vimindent
         if line_A.text =~ ENDS_FUNCTION
             return startindent
-        else
-            return startindent + shiftwidth()
         endif
+        return startindent + shiftwidth()
     endif
 
     var past_bracket_block: dict<any>
@@ -542,8 +540,9 @@ export def Expr(lnum = v:lnum): number # {{{2
 
     if line_B.text =~ STARTS_CURLY_BLOCK
         return Indent(line_B.lnum) + shiftwidth() + IndentMoreInBracketBlock()
+    endif
 
-    elseif line_A.text =~ CLOSING_BRACKET_AT_SOL
+    if line_A.text =~ CLOSING_BRACKET_AT_SOL
         var start: number = MatchingOpenBracket(line_A)
         if start <= 0
             return -1
@@ -565,9 +564,8 @@ export def Expr(lnum = v:lnum): number # {{{2
         var block_start: number = SearchPairStart(start, middle, end)
         if block_start > 0
             return Indent(block_start)
-        else
-            return -1
         endif
+        return -1
     endif
 
     var base_ind: number
@@ -591,8 +589,7 @@ export def Expr(lnum = v:lnum): number # {{{2
         endif
     endif
 
-    var ind: number = base_ind + Offset(line_A, line_B)
-    return [ind, 0]->max()
+    return base_ind + Offset(line_A, line_B)
 enddef
 
 def g:GetVimIndent(): number # {{{2
@@ -611,29 +608,31 @@ def Offset( # {{{2
     if line_B->AtStartOf('FuncHeader')
             && IsInInterface()
         return 0
+    endif
 
     # increase indentation inside a block
-    elseif line_B.text =~ STARTS_NAMED_BLOCK
+    if line_B.text =~ STARTS_NAMED_BLOCK
             || line_B->EndsWithCurlyBlock()
         # But don't indent if the line starting the block also closes it.
         if line_B->AlsoClosesBlock()
             return 0
+        endif
         # Indent twice for  a line continuation in the block  header itself, so that
         # we can easily  distinguish the end of  the block header from  the start of
         # the block body.
-        elseif (line_B->EndsWithLineContinuation()
+        if (line_B->EndsWithLineContinuation()
                 && !line_A.isfirst)
                 || (line_A.text =~ LINE_CONTINUATION_AT_SOL
                 && line_A.text !~ PLUS_MINUS_COMMAND)
                 || line_A.text->Is_IN_KeywordForLoop(line_B.text)
             return 2 * shiftwidth()
-        else
-            return shiftwidth()
         endif
+        return shiftwidth()
+    endif
 
     # increase indentation of  a line if it's the continuation  of a command which
     # started on a previous line
-    elseif !line_A.isfirst
+    if !line_A.isfirst
             && (line_B->EndsWithLineContinuation()
             || line_A.text =~ LINE_CONTINUATION_AT_SOL)
             && !(line_B->EndsWithComma() && line_A.lnum->IsInside('EnumBlock'))
@@ -653,12 +652,11 @@ def HereDocIndent(line_A: string): number # {{{2
             # will need to be indented relative to the start of the heredoc.  It
             # must know where it starts; it needs the cache.
             return 0
-        else
-            var ind: number = b:vimindent.startindent
-            # invalidate the cache so that it's not used for the next heredoc
-            unlet! b:vimindent
-            return ind
         endif
+        var ind: number = b:vimindent.startindent
+        # invalidate the cache so that it's not used for the next heredoc
+        unlet! b:vimindent
+        return ind
     endif
 
     # In a non-trimmed heredoc, all of leading whitespace is semantic.
@@ -700,7 +698,7 @@ def HereDocIndent(line_A: string): number # {{{2
         b:vimindent.startindent = new_startindent
     endif
 
-    return [0, Indent(v:lnum) + b:vimindent.offset]->max()
+    return Indent(v:lnum) + b:vimindent.offset
 enddef
 
 def CommentIndent(): number # {{{2
@@ -727,9 +725,8 @@ def CommentIndent(): number # {{{2
     endif
     if getline(next) =~ ENDS_BLOCK
         return ind + shiftwidth()
-    else
-        return ind
     endif
+    return ind
 enddef
 
 def BracketBlockIndent(line_A: dict<any>, block: dict<any>): number # {{{2
@@ -981,8 +978,10 @@ def SearchPair( # {{{3
     if end == '[' || end == ']'
         e = e->escape('[]')
     endif
+    # VIM_INDENT_TEST_TRACE_START
     return searchpair('\C' .. s, (middle == '' ? '' : '\C' .. middle), '\C' .. e,
         flags, (): bool => InCommentOrString(), stopline, TIMEOUT)
+    # VIM_INDENT_TEST_TRACE_END dist#vimindent#SearchPair
 enddef
 
 def SearchPairStart( # {{{3
@@ -1268,7 +1267,9 @@ def NonCommentedMatch(line: dict<any>, pat: string): bool # {{{3
 
     var pos: list<number> = getcurpos()
     cursor(line.lnum, 1)
+    # VIM_INDENT_TEST_TRACE_START
     var match_lnum: number = search(pat, 'cnW', line.lnum, TIMEOUT, (): bool => InCommentOrString())
+    # VIM_INDENT_TEST_TRACE_END dist#vimindent#NonCommentedMatch
     setpos('.', pos)
     return match_lnum > 0
 enddef

runtime/autoload/getscript.vim

@@ -12,6 +12,9 @@
 "                               autoloading search path fix
 "                               substitution of hardcoded commands with global variables
 "   2024 Nov 12 by Vim Project: fix problems on Windows (#16036)
+"   2025 Feb 28 by Vim Project: add support for bzip3 (#16755)
+"   2025 May 11 by Vim Project: check network connectivity (#17249)
+"   2025 Dec 21 by Vim Project: make the wget check more robust (#18987)
 "  }}}
 "
 " GetLatestVimScripts: 642 1 :AutoInstall: getscript.vim
@@ -56,7 +59,10 @@ endif
 
 " wget vs curl {{{2
 if !exists("g:GetLatestVimScripts_wget")
- if executable("wget")
+ if executable("wget.exe")
+  " enforce extension: windows powershell desktop version has a wget alias that hides wget.exe
+  let g:GetLatestVimScripts_wget= "wget.exe"
+ elseif executable("wget")
   let g:GetLatestVimScripts_wget= "wget"
  elseif executable("curl.exe")
   " enforce extension: windows powershell desktop version has a curl alias that hides curl.exe
@@ -71,7 +77,7 @@ endif
 
 " options that wget and curl require:
 if !exists("g:GetLatestVimScripts_options")
- if g:GetLatestVimScripts_wget == "wget"
+ if g:GetLatestVimScripts_wget =~ "wget"
   let g:GetLatestVimScripts_options= "-q -O"
  elseif g:GetLatestVimScripts_wget =~ "curl"
   let g:GetLatestVimScripts_options= "-s -o"
@@ -100,6 +106,10 @@ if !exists("g:GetLatestVimScripts_bunzip2")
  let g:GetLatestVimScripts_bunzip2= "bunzip2"
 endif
 
+if !exists("g:GetLatestVimScripts_bunzip3")
+ let g:GetLatestVimScripts_bunzip3= "bunzip3"
+endif
+
 if !exists("g:GetLatestVimScripts_gunzip")
  let g:GetLatestVimScripts_gunzip= "gunzip"
 endif
@@ -142,9 +152,6 @@ if g:GetLatestVimScripts_allowautoinstall
  elseif exists('$HOME') && isdirectory(expand("$HOME")."/".s:dotvim)
   let s:autoinstall= $HOME."/".s:dotvim
  endif
-" call Decho("s:autoinstall<".s:autoinstall.">")
-"else "Decho
-" call Decho("g:GetLatestVimScripts_allowautoinstall=".g:GetLatestVimScripts_allowautoinstall.": :AutoInstall: disabled")
 endif
 
 " ---------------------------------------------------------------------
@@ -158,24 +165,19 @@ silent! com -nargs=0 GLVS                call getscript#GetLatestVimScripts()
 "                      scripts based on the list in
 "   (first dir in runtimepath)/GetLatest/GetLatestVimScripts.dat
 fun! getscript#GetLatestVimScripts()
-"  call Dfunc("GetLatestVimScripts() autoinstall<".s:autoinstall.">")
 
-" insure that wget is executable
   if executable(g:GetLatestVimScripts_wget) != 1
    echoerr "GetLatestVimScripts needs ".g:GetLatestVimScripts_wget." which apparently is not available on your system"
-"   call Dret("GetLatestVimScripts : wget not executable/available")
    return
   endif
 
   " Find the .../GetLatest subdirectory under the runtimepath
   for datadir in split(&rtp,',') + ['']
    if isdirectory(datadir."/GetLatest")
-"    call Decho("found directory<".datadir.">")
     let datadir= datadir . "/GetLatest"
     break
    endif
    if filereadable(datadir."GetLatestVimScripts.dat")
-"    call Decho("found ".datadir."/GetLatestVimScripts.dat")
     break
    endif
   endfor
@@ -183,32 +185,25 @@ fun! getscript#GetLatestVimScripts()
   " Sanity checks: readability and writability
   if datadir == ""
    echoerr 'Missing "GetLatest/" on your runtimepath - see :help glvs-dist-install'
-"   call Dret("GetLatestVimScripts : unable to find a GetLatest subdirectory")
    return
   endif
   if filewritable(datadir) != 2
    echoerr "(getLatestVimScripts) Your ".datadir." isn't writable"
-"   call Dret("GetLatestVimScripts : non-writable directory<".datadir.">")
    return
   endif
   let datafile= datadir."/GetLatestVimScripts.dat"
   if !filereadable(datafile)
    echoerr "Your data file<".datafile."> isn't readable"
-"   call Dret("GetLatestVimScripts : non-readable datafile<".datafile.">")
    return
   endif
   if !filewritable(datafile)
    echoerr "Your data file<".datafile."> isn't writable"
-"   call Dret("GetLatestVimScripts : non-writable datafile<".datafile.">")
    return
   endif
   " --------------------
   " Passed sanity checks
   " --------------------
 
-"  call Decho("datadir  <".datadir.">")
-"  call Decho("datafile <".datafile.">")
-
   " don't let any event handlers interfere (like winmanager's, taglist's, etc)
   let eikeep  = &ei
   let hlskeep = &hls
@@ -221,25 +216,20 @@ fun! getscript#GetLatestVimScripts()
   " 3. split window
   " 4. edit datafile
   let origdir= getcwd()
-"  call Decho("exe cd ".fnameescape(substitute(datadir,'\','/','ge')))
   exe "cd ".fnameescape(substitute(datadir,'\','/','ge'))
   split
-"  call Decho("exe  e ".fnameescape(substitute(datafile,'\','/','ge')))
   exe "e ".fnameescape(substitute(datafile,'\','/','ge'))
   res 1000
   let s:downloads = 0
   let s:downerrors= 0
+  let s:message = []
 
   " Check on dependencies mentioned in plugins
-"  call Decho(" ")
-"  call Decho("searching plugins for GetLatestVimScripts dependencies")
   let lastline    = line("$")
-"  call Decho("lastline#".lastline)
   let firstdir    = substitute(&rtp,',.*$','','')
   let plugins     = split(globpath(firstdir,"plugin/**/*.vim"),'\n')
   let plugins     += split(globpath(firstdir,"ftplugin/**/*.vim"),'\n')
   let plugins     += split(globpath(firstdir,"AsNeeded/**/*.vim"),'\n')
-" extend the search to the packages too (this script predates the feature)
   let plugins     += split(globpath(firstdir,"pack/*/start/*/plugin/**/*.vim"),'\n')
   let plugins     += split(globpath(firstdir,"pack/*/opt/*/plugin/**/*.vim"),'\n')
   let plugins     += split(globpath(firstdir,"pack/*/start/*/ftplugin/**/*.vim"),'\n')
@@ -252,14 +242,10 @@ fun! getscript#GetLatestVimScripts()
   " It reads the plugin script at the end of the GetLatestVimScripts.dat
   " file, examines it, and then removes it.
   for plugin in plugins
-"   call Decho(" ")
-"   call Decho("plugin<".plugin.">")
 
    " read plugin in
    " evidently a :r creates a new buffer (the "#" buffer) that is subsequently unused -- bwiping it
    $
-"   call Decho(".dependency checking<".plugin."> line$=".line("$"))
-"   call Decho("..exe silent r ".fnameescape(plugin))
    exe "silent r ".fnameescape(plugin)
    exe "silent bwipe ".bufnr("#")
 
@@ -267,7 +253,6 @@ fun! getscript#GetLatestVimScripts()
     let depscript   = substitute(getline("."),'^"\s\+GetLatestVimScripts:\s\+\d\+\s\+\d\+\s\+\(.*\)$','\1','e')
     let depscriptid = substitute(getline("."),'^"\s\+GetLatestVimScripts:\s\+\(\d\+\)\s\+.*$','\1','')
     let llp1        = lastline+1
-"    call Decho("..depscript<".depscript.">")
 
     " found a "GetLatestVimScripts: # #" line in the script;
     " check if it's already in the datafile by searching backwards from llp1,
@@ -281,21 +266,17 @@ fun! getscript#GetLatestVimScripts()
      " this second search is taken when, for example, a   0 0 scriptname  is to be skipped over
      let srchline= search('\<'.noai_script.'\>','bW')
     endif
-"    call Decho("..noai_script<".noai_script."> depscriptid#".depscriptid." srchline#".srchline." curline#".line(".")." lastline#".lastline)
 
     if srchline == 0
      " found a new script to permanently include in the datafile
      let keep_rega   = @a
      let @a          = substitute(getline(curline),'^"\s\+GetLatestVimScripts:\s\+','','')
      echomsg "Appending <".@a."> to ".datafile." for ".depscript
-"     call Decho("..Appending <".@a."> to ".datafile." for ".depscript)
      exe lastline."put a"
      let @a          = keep_rega
      let lastline    = llp1
      let curline     = curline     + 1
      let foundscript = foundscript + 1
-"    else	" Decho
-"     call Decho("..found <".noai_script."> (already in datafile at line#".srchline.")")
     endif
 
     let curline = curline + 1
@@ -304,12 +285,8 @@ fun! getscript#GetLatestVimScripts()
 
    " llp1: last line plus one
    let llp1= lastline + 1
-"   call Decho(".deleting lines: ".llp1.",$d")
    exe "silent! ".llp1.",$d"
   endfor
-"  call Decho("--- end dependency checking loop ---  foundscript=".foundscript)
-"  call Decho(" ")
-"  call Dredir("BUFFER TEST (GetLatestVimScripts 1)","ls!")
 
   if foundscript == 0
    setlocal nomod
@@ -318,32 +295,32 @@ fun! getscript#GetLatestVimScripts()
   " --------------------------------------------------------------------
   " Check on out-of-date scripts using GetLatest/GetLatestVimScripts.dat
   " --------------------------------------------------------------------
-"  call Decho("begin: checking out-of-date scripts using datafile<".datafile.">")
   setlocal lz
   1
-"  /^-----/,$g/^\s*\d/call Decho(getline("."))
-  1
   /^-----/,$g/^\s*\d/call s:GetOneScript()
-"  call Decho("--- end out-of-date checking --- ")
 
   " Final report (an echomsg)
   try
    silent! ?^-------?
   catch /^Vim\%((\a\+)\)\=:E114/
-"   call Dret("GetLatestVimScripts : nothing done!")
    return
   endtry
   exe "norm! kz\<CR>"
   redraw!
+  if !empty(s:message)
+   echohl WarningMsg
+   for mess in s:message
+    echom mess
+   endfor
+   let s:downerrors += len(s:message)
+  endif
   let s:msg = ""
   if s:downloads == 1
   let s:msg = "Downloaded one updated script to <".datadir.">"
-  elseif s:downloads == 2
-   let s:msg= "Downloaded two updated scripts to <".datadir.">"
   elseif s:downloads > 1
    let s:msg= "Downloaded ".s:downloads." updated scripts to <".datadir.">"
   else
-   let s:msg= "Everything was already current"
+   let s:msg= empty(s:message) ? "Everything was already current" : "There were some errors"
   endif
   if s:downerrors > 0
    let s:msg= s:msg." (".s:downerrors." downloading errors)"
@@ -361,8 +338,6 @@ fun! getscript#GetLatestVimScripts()
   let &hls = hlskeep
   let &acd = acdkeep
   setlocal nolz
-"  call Dredir("BUFFER TEST (GetLatestVimScripts 2)","ls!")
-"  call Dret("GetLatestVimScripts : did ".s:downloads." downloads")
 endfun
 
 " ---------------------------------------------------------------------
@@ -371,8 +346,6 @@ endfun
 "    ScriptID, SourceID, and Filename.
 "    It downloads any scripts that have newer versions from vim.sourceforge.net.
 fun! s:GetOneScript(...)
-"   call Dfunc("GetOneScript()")
-
  " set options to allow progress to be shown on screen
   let rega= @a
   let t_ti= &t_ti
@@ -398,13 +371,9 @@ fun! s:GetOneScript(...)
    let srcid    = a:2
    let fname    = a:3
    let cmmnt    = ""
-"   call Decho("scriptid<".scriptid.">")
-"   call Decho("srcid   <".srcid.">")
-"   call Decho("fname   <".fname.">")
   else
    let curline  = getline(".")
    if curline =~ '^\s*#'
-"    call Dret("GetOneScript : skipping a pure comment line")
     return
    endif
    let parsepat = '^\s*\(\d\+\)\s\+\(\d\+\)\s\+\(.\{-}\)\(\s*#.*\)\=$'
@@ -428,36 +397,26 @@ fun! s:GetOneScript(...)
    catch /^Vim\%((\a\+)\)\=:E486/
     let cmmnt= ""
    endtry
-"   call Decho("curline <".curline.">")
-"   call Decho("parsepat<".parsepat.">")
-"   call Decho("scriptid<".scriptid.">")
-"   call Decho("srcid   <".srcid.">")
-"   call Decho("fname   <".fname.">")
   endif
 
   " plugin author protection from downloading his/her own scripts atop their latest work
+  " When looking for :AutoInstall: lines, skip scripts that have   0 0 scriptname
   if scriptid == 0 || srcid == 0
-   " When looking for :AutoInstall: lines, skip scripts that have   0 0 scriptname
-"   call Dret("GetOneScript : skipping a scriptid==srcid==0 line")
    return
   endif
 
   let doautoinstall= 0
   if fname =~ ":AutoInstall:"
-"   call Decho("case AutoInstall: fname<".fname.">")
    let aicmmnt= substitute(fname,'\s\+:AutoInstall:\s\+',' ','')
-"   call Decho("aicmmnt<".aicmmnt."> s:autoinstall=".s:autoinstall)
    if s:autoinstall != ""
     let doautoinstall = g:GetLatestVimScripts_allowautoinstall
    endif
   else
    let aicmmnt= fname
   endif
-"  call Decho("aicmmnt<".aicmmnt.">: doautoinstall=".doautoinstall)
 
   exe "norm z\<CR>"
   redraw!
-"  call Decho('considering <'.aicmmnt.'> scriptid='.scriptid.' srcid='.srcid)
   echo 'considering <'.aicmmnt.'> scriptid='.scriptid.' srcid='.srcid
 
   " grab a copy of the plugin's vim.sourceforge.net webpage
@@ -465,15 +424,17 @@ fun! s:GetOneScript(...)
   let tmpfile    = tempname()
   let v:errmsg   = ""
 
+  " Check if URLs are reachable
+  if !CheckVimScriptURL(scriptid, srcid)
+   return
+  endif
+
   " make up to three tries at downloading the description
   let itry= 1
   while itry <= 3
-"   call Decho(".try#".itry." to download description of <".aicmmnt."> with addr=".scriptaddr)
    if has("win32") || has("win16") || has("win95")
-"    call Decho(".new|exe silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(tmpfile).' '.shellescape(scriptaddr)."|bw!")
     new|exe "silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(tmpfile).' '.shellescape(scriptaddr)|bw!
    else
-"    call Decho(".exe silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(tmpfile)." ".shellescape(scriptaddr))
     exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(tmpfile)." ".shellescape(scriptaddr)
    endif
    if itry == 1
@@ -491,7 +452,6 @@ fun! s:GetOneScript(...)
    endif
    let itry= itry + 1
   endwhile
-"  call Decho(" --- end downloading tries while loop --- itry=".itry)
 
   " testing: did finding "Click on the package..." fail?
   if findpkg == 0 || itry >= 4
@@ -502,12 +462,9 @@ fun! s:GetOneScript(...)
    let &t_te        = t_te
    let &rs          = rs
    let s:downerrors = s:downerrors + 1
-"   call Decho("***warning*** couldn'".'t find "Click on the package..." in description page for <'.aicmmnt.">")
    echomsg "***warning*** couldn'".'t find "Click on the package..." in description page for <'.aicmmnt.">"
-"   call Dret("GetOneScript : srch for /Click on the package/ failed")
    return
   endif
-"  call Decho('found "Click on the package to download"')
 
   let findsrcid= search('src_id=','W')
   if findsrcid == 0
@@ -518,28 +475,22 @@ fun! s:GetOneScript(...)
    let &t_te        = t_te
    let &rs          = rs
    let s:downerrors = s:downerrors + 1
-"   call Decho("***warning*** couldn'".'t find "src_id=" in description page for <'.aicmmnt.">")
    echomsg "***warning*** couldn'".'t find "src_id=" in description page for <'.aicmmnt.">"
-"  call Dret("GetOneScript : srch for /src_id/ failed")
    return
   endif
-"  call Decho('found "src_id=" in description page')
 
   let srcidpat   = '^\s*<td class.*src_id=\(\d\+\)">\([^<]\+\)<.*$'
   let latestsrcid= substitute(getline("."),srcidpat,'\1','')
   let sname      = substitute(getline("."),srcidpat,'\2','') " script name actually downloaded
-"  call Decho("srcidpat<".srcidpat."> latestsrcid<".latestsrcid."> sname<".sname.">")
   silent q!
   call delete(tmpfile)
 
   " convert the strings-of-numbers into numbers
   let srcid       = srcid       + 0
   let latestsrcid = latestsrcid + 0
-"  call Decho("srcid=".srcid." latestsrcid=".latestsrcid." sname<".sname.">")
 
   " has the plugin's most-recent srcid increased, which indicates that it has been updated
   if latestsrcid > srcid
-"   call Decho("[latestsrcid=".latestsrcid."] <= [srcid=".srcid."]: need to update <".sname.">")
 
    let s:downloads= s:downloads + 1
    if sname == bufname("%")
@@ -550,88 +501,65 @@ fun! s:GetOneScript(...)
    " -----------------------------------------------------------------------------
    " the plugin has been updated since we last obtained it, so download a new copy
    " -----------------------------------------------------------------------------
-"   call Decho(".downloading new <".sname.">")
    echomsg ".downloading new <".sname.">"
    if has("win32") || has("win16") || has("win95")
-"    call Decho(".new|exe silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr.latestsrcid)."|bw!")
     new|exe "silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr.latestsrcid)|bw!
    else
-"    call Decho(".exe silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr.latestsrcid)
     exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr.latestsrcid)
    endif
 
    " --------------------------------------------------------------------------
    " AutoInstall: only if doautoinstall has been requested by the plugin itself
    " --------------------------------------------------------------------------
-"   call Decho("checking if plugin requested autoinstall: doautoinstall=".doautoinstall)
    if doautoinstall
-"    call Decho(" ")
-"    call Decho("Autoinstall: getcwd<".getcwd()."> filereadable(".sname.")=".filereadable(sname))
     if filereadable(sname)
-"     call Decho("<".sname."> is readable")
-"     call Decho("exe silent !".g:GetLatestVimScripts_mv." ".shellescape(sname)." ".shellescape(s:autoinstall))
      exe "silent !".g:GetLatestVimScripts_mv." ".shellescape(sname)." ".shellescape(s:autoinstall)
      let curdir    = fnameescape(substitute(getcwd(),'\','/','ge'))
      let installdir= curdir."/Installed"
      if !isdirectory(installdir)
       call mkdir(installdir)
      endif
-"     call Decho("curdir<".curdir."> installdir<".installdir.">")
-"     call Decho("exe cd ".fnameescape(s:autoinstall))
      exe "cd ".fnameescape(s:autoinstall)
 
      " determine target directory for moves
      let firstdir= substitute(&rtp,',.*$','','')
      let pname   = substitute(sname,'\..*','.vim','')
-"     call Decho("determine tgtdir: is <".firstdir.'/AsNeeded/'.pname." readable?")
      if filereadable(firstdir.'/AsNeeded/'.pname)
       let tgtdir= "AsNeeded"
      else
       let tgtdir= "plugin"
      endif
-"     call Decho("tgtdir<".tgtdir.">  pname<".pname.">")
-     
+
      " decompress
      if sname =~ '\.bz2$'
-"      call Decho("decompress: attempt to bunzip2 ".sname)
       exe "sil !".g:GetLatestVimScripts_bunzip2." ".shellescape(sname)
       let sname= substitute(sname,'\.bz2$','','')
-"      call Decho("decompress: new sname<".sname."> after bunzip2")
+     elseif sname =~ '\.bz3$'
+      exe "sil !".g:GetLatestVimScripts_bunzip3." ".shellescape(sname)
+      let sname= substitute(sname,'\.bz3$','','')
      elseif sname =~ '\.gz$'
-"      call Decho("decompress: attempt to gunzip ".sname)
       exe "sil !".g:GetLatestVimScripts_gunzip." ".shellescape(sname)
       let sname= substitute(sname,'\.gz$','','')
-"      call Decho("decompress: new sname<".sname."> after gunzip")
      elseif sname =~ '\.xz$'
-"      call Decho("decompress: attempt to unxz ".sname)
       exe "sil !".g:GetLatestVimScripts_unxz." ".shellescape(sname)
       let sname= substitute(sname,'\.xz$','','')
-"      call Decho("decompress: new sname<".sname."> after unxz")
      else
-"      call Decho("no decompression needed")
      endif
-     
+
      " distribute archive(.zip, .tar, .vba, .vmb, ...) contents
      if sname =~ '\.zip$'
-"      call Decho("dearchive: attempt to unzip ".sname)
       exe "silent !".g:GetLatestVimScripts_unzip." -o ".shellescape(sname)
      elseif sname =~ '\.tar$'
-"      call Decho("dearchive: attempt to untar ".sname)
       exe "silent !tar -xvf ".shellescape(sname)
      elseif sname =~ '\.tgz$'
-"      call Decho("dearchive: attempt to untar+gunzip ".sname)
       exe "silent !tar -zxvf ".shellescape(sname)
      elseif sname =~ '\.taz$'
-"      call Decho("dearchive: attempt to untar+uncompress ".sname)
       exe "silent !tar -Zxvf ".shellescape(sname)
      elseif sname =~ '\.tbz$'
-"      call Decho("dearchive: attempt to untar+bunzip2 ".sname)
       exe "silent !tar -jxvf ".shellescape(sname)
      elseif sname =~ '\.txz$'
-"      call Decho("dearchive: attempt to untar+xz ".sname)
       exe "silent !tar -Jxvf ".shellescape(sname)
      elseif sname =~ '\.vba$\|\.vmb$'
-"      call Decho("dearchive: attempt to handle a vimball: ".sname)
       silent 1split
       if exists("g:vimball_home")
        let oldvimballhome= g:vimball_home
@@ -645,28 +573,22 @@ fun! s:GetOneScript(...)
       else
        unlet g:vimball_home
       endif
-     else
-"      call Decho("no dearchiving needed")
      endif
-     
+
      " ---------------------------------------------
      " move plugin to plugin/ or AsNeeded/ directory
      " ---------------------------------------------
      if sname =~ '.vim$'
-"      call Decho("dearchive: attempt to simply move ".sname." to ".tgtdir)
       exe "silent !".g:GetLatestVimScripts_mv." ".shellescape(sname)." ".tgtdir
      else
-"      call Decho("dearchive: move <".sname."> to installdir<".installdir.">")
       exe "silent !".g:GetLatestVimScripts_mv." ".shellescape(sname)." ".installdir
      endif
      if tgtdir != "plugin"
-"      call Decho("exe silent !".g:GetLatestVimScripts_mv." ".shellescape("plugin/".pname)." ".tgtdir)
       exe "silent !".g:GetLatestVimScripts_mv." ".shellescape("plugin/".pname)." ".tgtdir
      endif
-     
+
      " helptags step
      let docdir= substitute(&rtp,',.*','','e')."/doc"
-"     call Decho("helptags: docdir<".docdir.">")
      exe "helptags ".fnameescape(docdir)
      exe "cd ".fnameescape(curdir)
     endif
@@ -681,13 +603,42 @@ fun! s:GetOneScript(...)
 
    " update the data in the <GetLatestVimScripts.dat> file
    call setline(line("."),modline)
-"   call Decho("update data in ".expand("%")."#".line(".").": modline<".modline.">")
-"  else " Decho
-"   call Decho("[latestsrcid=".latestsrcid."] <= [srcid=".srcid."], no need to update")
+  endif
+endfun
+
+" CheckVimScriptURL: Check Network Connection {{{1
+" Check status code of scriptaddr and downloadaddr
+" return v:true if the script is downloadable or v:false in case of errors
+fun CheckVimScriptURL(script_id, src_id)
+  " doesn't work with powershell
+  if !executable('curl') || &shell =~? 'pwsh\|powershell'
+    return v:true
+  endif
+  let output = has("win32") ? ' -o NUL ' : ' -o /dev/null '
+
+  let temp = tempname()
+  defer delete(temp)
+  let script_url = g:GetLatestVimScripts_scriptaddr . a:script_id
+  let download_url = g:GetLatestVimScripts_downloadaddr . a:src_id
+
+  let script_cmd = 'curl -s -I -w "%{http_code}"' . output . shellescape(script_url) . ' >' . shellescape(temp)
+  call system(script_cmd)
+  let script_status = readfile(temp, 'b')[0]
+
+  let download_cmd = 'curl -s -I -w "%{http_code}"' . output . shellescape(download_url) . ' >' . shellescape(temp)
+  call system(download_cmd)
+  let download_status = readfile(temp, 'b')[0]
+
+  if script_status !=# '200'
+    let s:message += [ printf('Error: Failed to reach script: %s', a:script_id) ]
+    return v:false
   endif
 
-"  call Dredir("BUFFER TEST (GetOneScript)","ls!")
-"  call Dret("GetOneScript")
+  if download_status !=# '200'
+    let s:message += [ printf('Error: Failed to download script %s', a:script_id) ]
+    return v:false
+  endif
+  return v:true
 endfun
 
 " ---------------------------------------------------------------------

runtime/autoload/gnat.vim

@@ -3,7 +3,7 @@
 "     Language: Ada (GNAT)
 "          $Id: gnat.vim 887 2008-07-08 14:29:01Z krischik $
 "    Copyright: Copyright (C) 2006 Martin Krischik
-"   Maintainer:	Martin Krischi <krischik@users.sourceforge.net>k
+"   Maintainer:	Martin Krischi <krischik@users.sourceforge.net>
 "		Ned Okie <nokie@radford.edu>
 "      $Author: krischik $
 "        $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $

runtime/autoload/hare.vim

@@ -1,26 +1,82 @@
-" Vim autoload file.
-" Language:     Hare
-" Maintainer:   Amelia Clarke <selene@perilune.dev>
-" Last Updated: 2024-05-10
-" Upstream:     https://git.sr.ht/~sircmpwn/hare.vim
+vim9script
 
-" Attempt to find the directory for a given Hare module.
-function hare#FindModule(str)
-  let path = substitute(trim(a:str, ':', 2), '::', '/', 'g')
-  let dir = finddir(path)
-  while !empty(path) && empty(dir)
-    let path = substitute(path, '/\?\h\w*$', '', '')
-    let dir = finddir(path)
-  endwhile
-  return dir
-endfunction
+# Helper functions for Hare.
+# Language:     Hare
+# Maintainer:   Amelia Clarke <selene@perilune.dev>
+# Last Updated: 2025 Sep 06
+# Upstream:     https://git.sr.ht/~sircmpwn/hare.vim
 
-" Return the value of HAREPATH if it exists. Otherwise use a reasonable default.
-function hare#GetPath()
-  if empty($HAREPATH)
-    return '/usr/src/hare/stdlib,/usr/src/hare/third-party'
+# Returns the value of HAREPATH, if it exists. Otherwise, returns a safe
+# default.
+export def GetPath(): string
+  var path: list<string>
+  if !empty($HAREPATH)
+    path = split($HAREPATH, ':')
+  else
+    path = ParsePath()
+    if empty(path)
+      return '/usr/src/hare/stdlib,/usr/src/hare/third-party'
+    endif
   endif
-  return substitute($HAREPATH, ':', ',', 'g')
-endfunction
+  return mapnew(path, (_, n) => escape(n, ' ,;'))->join(',')
+enddef
 
-" vim: et sts=2 sw=2 ts=8
+# Converts a module identifier into a path.
+export def IncludeExpr(): string
+  var path = trim(v:fname, ':', 2)->substitute('::', '/', 'g')
+
+  # If the module cannot be found, it might be a member instead. Try removing
+  # the final component until a directory is found.
+  while !finddir(path)
+    const head = fnamemodify(path, ':h')
+    if head == '.'
+      break
+    endif
+    path = head
+  endwhile
+
+  return path
+enddef
+
+# Modifies quickfix or location list entries to refer to the correct paths after
+# running :make or :lmake, respectively.
+export def QuickFixPaths()
+  var GetList: func
+  var SetList: func
+
+  if expand('<amatch>') =~ '^l'
+    GetList = function('getloclist', [0])
+    SetList = function('setloclist', [0])
+  else
+    GetList = function('getqflist')
+    SetList = function('setqflist')
+  endif
+
+  final list = GetList({ items: 0 })
+  for n in list.items
+    if !empty(n.module)
+      n.filename = findfile(n.module)
+    endif
+  endfor
+  SetList([], 'r', list)
+enddef
+
+# Attempts to parse the directories in $HAREPATH from the output of `hare
+# version -v`. Otherwise, returns an empty list.
+def ParsePath(): list<string>
+  if !executable('hare')
+    return []
+  endif
+
+  silent const lines = systemlist('hare version -v')
+  const min = match(lines, '^HAREPATH') + 1
+  if min == 0
+    return []
+  endif
+
+  const max = match(lines, '^\S', min)
+  return (max < 0 ? slice(lines, min) : slice(lines, min, max))
+    ->mapnew((_, n) => matchstr(n, '^\s*\zs.*'))
+enddef
+
+# vim: et sts=2 sw=2 ts=8 tw=80

runtime/autoload/hcl.vim

@@ -2,6 +2,21 @@
 " Maintainer:  Gregory Anders
 " Last Change: 2024-09-03
 " Based on:    https://github.com/hashivim/vim-terraform
+" License:     ISC
+"
+" Copyright (c) 2014-2016 Mark Cornick <mark@markcornick.com>
+"
+" Permission to use, copy, modify, and/or distribute this software for any purpose
+" with or without fee is hereby granted, provided that the above copyright notice
+" and this permission notice appear in all copies.
+"
+" THE SOFTWARE IS PROVIDED 'AS IS' AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+" FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+" OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+" THIS SOFTWARE.
 
 function! hcl#indentexpr(lnum)
   " Beginning of the file should have no indent

runtime/autoload/htmlfold.vim

@@ -0,0 +1,192 @@
+" HTML folding script, :h ft-html-plugin
+" Latest Change: 2025 May 10
+" Original Author: Aliaksei Budavei <0x000c70@gmail.com>
+
+function! htmlfold#MapBalancedTags() abort
+  " Describe only _a capturable-name prefix_ for start and end patterns of
+  " a tag so that start tags with attributes spanning across lines can also be
+  " matched with a single call of "getline()".
+  let tag = '\m\c</\=\([0-9A-Za-z-]\+\)'
+  let names = []
+  let pairs = []
+  let ends = []
+  let pos = getpos('.')
+
+  try
+    call cursor(1, 1)
+    let [lnum, cnum] = searchpos(tag, 'cnW')
+
+    " Pair up nearest non-inlined tags in scope.
+    while lnum > 0
+      let name_attr = synIDattr(synID(lnum, cnum, 0), 'name')
+
+      if name_attr ==# 'htmlTag' || name_attr ==# 'htmlScriptTag'
+	let name = get(matchlist(getline(lnum), tag, (cnum - 1)), 1, '')
+
+	if !empty(name)
+	  call insert(names, tolower(name), 0)
+	  call insert(pairs, [lnum, -1], 0)
+	endif
+      elseif name_attr ==# 'htmlEndTag'
+	let name = get(matchlist(getline(lnum), tag, (cnum - 1)), 1, '')
+
+	if !empty(name)
+	  let idx = index(names, tolower(name))
+
+	  if idx >= 0
+	    " Dismiss inlined balanced tags and opened-only tags.
+	    if pairs[idx][0] != lnum
+	      let pairs[idx][1] = lnum
+	      call add(ends, lnum)
+	    endif
+
+	    " Claim a pair.
+	    let names[: idx] = repeat([''], (idx + 1))
+	  endif
+	endif
+      endif
+
+      " Advance the cursor, at "<", past "</a", "<a>", etc.
+      call cursor(lnum, (cnum + 3))
+      let [lnum, cnum] = searchpos(tag, 'cnW')
+    endwhile
+  finally
+    call setpos('.', pos)
+  endtry
+
+  if empty(ends)
+    return {}
+  endif
+
+  let folds = {}
+  let pending_end = ends[0]
+  let level = 0
+
+  while !empty(pairs)
+    let [start, end] = remove(pairs, -1)
+
+    if end < 0
+      continue
+    endif
+
+    if start >= pending_end
+      " Mark a sibling tag.
+      call remove(ends, 0)
+
+      while start >= ends[0]
+	" Mark a parent tag.
+	call remove(ends, 0)
+	let level -= 1
+      endwhile
+
+      let pending_end = ends[0]
+    else
+      " Mark a child tag.
+      let level += 1
+    endif
+
+    " Flatten the innermost inlined folds.
+    let folds[start] = get(folds, start, ('>' . level))
+    let folds[end] = get(folds, end, ('<' . level))
+  endwhile
+
+  return folds
+endfunction
+
+" See ":help vim9-mix".
+if !has("vim9script")
+  finish
+endif
+
+def! g:htmlfold#MapBalancedTags(): dict<string>
+  # Describe only _a capturable-name prefix_ for start and end patterns of
+  # a tag so that start tags with attributes spanning across lines can also be
+  # matched with a single call of "getline()".
+  const tag: string = '\m\c</\=\([0-9A-Za-z-]\+\)'
+  var names: list<string> = []
+  var pairs: list<list<number>> = []
+  var ends: list<number> = []
+  const pos: list<number> = getpos('.')
+
+  try
+    cursor(1, 1)
+    var [lnum: number, cnum: number] = searchpos(tag, 'cnW')
+
+    # Pair up nearest non-inlined tags in scope.
+    while lnum > 0
+      const name_attr: string = synIDattr(synID(lnum, cnum, 0), 'name')
+
+      if name_attr ==# 'htmlTag' || name_attr ==# 'htmlScriptTag'
+	const name: string = get(matchlist(getline(lnum), tag, (cnum - 1)), 1, '')
+
+	if !empty(name)
+	  insert(names, tolower(name), 0)
+	  insert(pairs, [lnum, -1], 0)
+	endif
+      elseif name_attr ==# 'htmlEndTag'
+	const name: string = get(matchlist(getline(lnum), tag, (cnum - 1)), 1, '')
+
+	if !empty(name)
+	  const idx: number = index(names, tolower(name))
+
+	  if idx >= 0
+	    # Dismiss inlined balanced tags and opened-only tags.
+	    if pairs[idx][0] != lnum
+	      pairs[idx][1] = lnum
+	      add(ends, lnum)
+	    endif
+
+	    # Claim a pair.
+	    names[: idx] = repeat([''], (idx + 1))
+	  endif
+	endif
+      endif
+
+      # Advance the cursor, at "<", past "</a", "<a>", etc.
+      cursor(lnum, (cnum + 3))
+      [lnum, cnum] = searchpos(tag, 'cnW')
+    endwhile
+  finally
+    setpos('.', pos)
+  endtry
+
+  if empty(ends)
+    return {}
+  endif
+
+  var folds: dict<string> = {}
+  var pending_end: number = ends[0]
+  var level: number = 0
+
+  while !empty(pairs)
+    const [start: number, end: number] = remove(pairs, -1)
+
+    if end < 0
+      continue
+    endif
+
+    if start >= pending_end
+      # Mark a sibling tag.
+      remove(ends, 0)
+
+      while start >= ends[0]
+	# Mark a parent tag.
+	remove(ends, 0)
+	level -= 1
+      endwhile
+
+      pending_end = ends[0]
+    else
+      # Mark a child tag.
+      level += 1
+    endif
+
+    # Flatten the innermost inlined folds.
+    folds[start] = get(folds, start, ('>' .. level))
+    folds[end] = get(folds, end, ('<' .. level))
+  endwhile
+
+  return folds
+enddef
+
+" vim: fdm=syntax sw=2 ts=8 noet

runtime/autoload/netrwSettings.vim

@@ -1,249 +0,0 @@
-" netrwSettings.vim: makes netrw settings simpler
-" Date:		Nov 15, 2021
-" Maintainer:   This runtime file is looking for a new maintainer.
-" Former Maintainer: Charles E Campbell
-" Version:	18
-" Last Change:
-"   2024 May 08 by Vim Project: cleanup legacy Win9X checks
-" 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
-"               notice is copied with it. Like anything else that's free,
-"               netrwSettings.vim is provided *as is* and comes with no
-"               warranty of any kind, either expressed or implied. By using
-"               this plugin, you agree that in no event will the copyright
-"               holder be liable for any damages resulting from the use
-"               of this software.
-"
-" Mat 4:23 (WEB) Jesus went about in all Galilee, teaching in their {{{1
-"                synagogues, preaching the gospel of the kingdom, and healing
-"                every disease and every sickness among the people.
-" Load Once: {{{1
-if exists("g:loaded_netrwSettings") || &cp
-  finish
-endif
-let g:loaded_netrwSettings = "v18"
-if v:version < 700
- echohl WarningMsg
- echo "***warning*** this version of netrwSettings needs vim 7.0"
- echohl Normal
- finish
-endif
-
-" ---------------------------------------------------------------------
-" NetrwSettings: {{{1
-fun! netrwSettings#NetrwSettings()
-  " this call is here largely just to insure that netrw has been loaded
-  call netrw#WinPath("")
-  if !exists("g:loaded_netrw")
-   echohl WarningMsg | echomsg "***sorry*** netrw needs to be loaded prior to using NetrwSettings" | echohl None
-   return
-  endif
-
-  above wincmd s
-  enew
-  setlocal noswapfile bh=wipe
-  set ft=vim
-  file Netrw\ Settings
-
-  " these variables have the following default effects when they don't
-  " exist (ie. have not been set by the user in his/her .vimrc)
-  if !exists("g:netrw_liststyle")
-   let g:netrw_liststyle= 0
-   let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa"
-  endif
-  if !exists("g:netrw_silent")
-   let g:netrw_silent= 0
-  endif
-  if !exists("g:netrw_use_nt_rcp")
-   let g:netrw_use_nt_rcp= 0
-  endif
-  if !exists("g:netrw_ftp")
-   let g:netrw_ftp= 0
-  endif
-  if !exists("g:netrw_ignorenetrc")
-   let g:netrw_ignorenetrc= 0
-  endif
-
-  put ='+ ---------------------------------------------'
-  put ='+  NetrwSettings:  by Charles E. Campbell'
-  put ='+ Press <F1> with cursor atop any line for help'
-  put ='+ ---------------------------------------------'
-  let s:netrw_settings_stop= line(".")
-
-  put =''
-  put ='+ Netrw Protocol Commands'
-  put = 'let g:netrw_dav_cmd           = '.g:netrw_dav_cmd
-  put = 'let g:netrw_fetch_cmd         = '.g:netrw_fetch_cmd
-  put = 'let g:netrw_ftp_cmd           = '.g:netrw_ftp_cmd
-  put = 'let g:netrw_http_cmd          = '.g:netrw_http_cmd
-  put = 'let g:netrw_rcp_cmd           = '.g:netrw_rcp_cmd
-  put = 'let g:netrw_rsync_cmd         = '.g:netrw_rsync_cmd
-  put = 'let g:netrw_scp_cmd           = '.g:netrw_scp_cmd
-  put = 'let g:netrw_sftp_cmd          = '.g:netrw_sftp_cmd
-  put = 'let g:netrw_ssh_cmd           = '.g:netrw_ssh_cmd
-  let s:netrw_protocol_stop= line(".")
-  put = ''
-
-  put ='+Netrw Transfer Control'
-  put = 'let g:netrw_cygwin            = '.g:netrw_cygwin
-  put = 'let g:netrw_ftp               = '.g:netrw_ftp
-  put = 'let g:netrw_ftpmode           = '.g:netrw_ftpmode
-  put = 'let g:netrw_ignorenetrc       = '.g:netrw_ignorenetrc
-  put = 'let g:netrw_sshport           = '.g:netrw_sshport
-  put = 'let g:netrw_silent            = '.g:netrw_silent
-  put = 'let g:netrw_use_nt_rcp        = '.g:netrw_use_nt_rcp
-  let s:netrw_xfer_stop= line(".")
-  put =''
-  put ='+ Netrw Messages'
-  put ='let g:netrw_use_errorwindow    = '.g:netrw_use_errorwindow
-
-  put = ''
-  put ='+ Netrw Browser Control'
-  if exists("g:netrw_altfile")
-   put = 'let g:netrw_altfile   = '.g:netrw_altfile
-  else
-   put = 'let g:netrw_altfile   = 0'
-  endif
-  put = 'let g:netrw_alto              = '.g:netrw_alto
-  put = 'let g:netrw_altv              = '.g:netrw_altv
-  put = 'let g:netrw_banner            = '.g:netrw_banner
-  if exists("g:netrw_bannerbackslash")
-   put = 'let g:netrw_bannerbackslash   = '.g:netrw_bannerbackslash
-  else
-   put = '\" let g:netrw_bannerbackslash   = (not defined)'
-  endif
-  put = 'let g:netrw_browse_split      = '.g:netrw_browse_split
-  if exists("g:netrw_browsex_viewer")
-   put = 'let g:netrw_browsex_viewer   = '.g:netrw_browsex_viewer
-  else
-   put = '\" let g:netrw_browsex_viewer   = (not defined)'
-  endif
-  put = 'let g:netrw_compress          = '.g:netrw_compress
-  if exists("g:Netrw_corehandler")
-   put = 'let g:Netrw_corehandler      = '.g:Netrw_corehandler
-  else
-   put = '\" let g:Netrw_corehandler      = (not defined)'
-  endif
-  put = 'let g:netrw_ctags             = '.g:netrw_ctags
-  put = 'let g:netrw_cursor            = '.g:netrw_cursor
-  let decompressline= line("$")
-  put = 'let g:netrw_decompress        = '.string(g:netrw_decompress)
-  if exists("g:netrw_dynamic_maxfilenamelen")
-   put = 'let g:netrw_dynamic_maxfilenamelen='.g:netrw_dynamic_maxfilenamelen
-  else
-   put = '\" let g:netrw_dynamic_maxfilenamelen= (not defined)'
-  endif
-  put = 'let g:netrw_dirhistmax        = '.g:netrw_dirhistmax
-  put = 'let g:netrw_errorlvl          = '.g:netrw_errorlvl
-  put = 'let g:netrw_fastbrowse        = '.g:netrw_fastbrowse
-  let fnameescline= line("$")
-  put = 'let g:netrw_fname_escape      = '.string(g:netrw_fname_escape)
-  put = 'let g:netrw_ftp_browse_reject = '.g:netrw_ftp_browse_reject
-  put = 'let g:netrw_ftp_list_cmd      = '.g:netrw_ftp_list_cmd
-  put = 'let g:netrw_ftp_sizelist_cmd  = '.g:netrw_ftp_sizelist_cmd
-  put = 'let g:netrw_ftp_timelist_cmd  = '.g:netrw_ftp_timelist_cmd
-  let globescline= line("$")
-  put = 'let g:netrw_glob_escape       = '.string(g:netrw_glob_escape)
-  put = 'let g:netrw_hide              = '.g:netrw_hide
-  if exists("g:netrw_home")
-   put = 'let g:netrw_home              = '.g:netrw_home
-  else
-   put = '\" let g:netrw_home              = (not defined)'
-  endif
-  put = 'let g:netrw_keepdir           = '.g:netrw_keepdir
-  put = 'let g:netrw_list_cmd          = '.g:netrw_list_cmd
-  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_maxfilenamelen    = '.g:netrw_maxfilenamelen
-  put = 'let g:netrw_menu              = '.g:netrw_menu
-  put = 'let g:netrw_mousemaps         = '.g:netrw_mousemaps
-  put = 'let g:netrw_mkdir_cmd         = '.g:netrw_mkdir_cmd
-  if exists("g:netrw_nobeval")
-   put = 'let g:netrw_nobeval           = '.g:netrw_nobeval
-  else
-   put = '\" let g:netrw_nobeval           = (not defined)'
-  endif
-  put = 'let g:netrw_remote_mkdir      = '.g:netrw_remote_mkdir
-  put = 'let g:netrw_preview           = '.g:netrw_preview
-  put = 'let g:netrw_rename_cmd        = '.g:netrw_rename_cmd
-  put = 'let g:netrw_retmap            = '.g:netrw_retmap
-  put = 'let g:netrw_rm_cmd            = '.g:netrw_rm_cmd
-  put = 'let g:netrw_rmdir_cmd         = '.g:netrw_rmdir_cmd
-  put = 'let g:netrw_rmf_cmd           = '.g:netrw_rmf_cmd
-  put = 'let g:netrw_sort_by           = '.g:netrw_sort_by
-  put = 'let g:netrw_sort_direction    = '.g:netrw_sort_direction
-  put = 'let g:netrw_sort_options      = '.g:netrw_sort_options
-  put = 'let g:netrw_sort_sequence     = '.g:netrw_sort_sequence
-  put = 'let g:netrw_servername        = '.g:netrw_servername
-  put = 'let g:netrw_special_syntax    = '.g:netrw_special_syntax
-  put = 'let g:netrw_ssh_browse_reject = '.g:netrw_ssh_browse_reject
-  put = 'let g:netrw_ssh_cmd           = '.g:netrw_ssh_cmd
-  put = 'let g:netrw_scpport           = '.g:netrw_scpport
-  put = 'let g:netrw_sepchr            = '.g:netrw_sepchr
-  put = 'let g:netrw_sshport           = '.g:netrw_sshport
-  put = 'let g:netrw_timefmt           = '.g:netrw_timefmt
-  let tmpfileescline= line("$")
-  put ='let g:netrw_tmpfile_escape...'
-  put = 'let g:netrw_use_noswf         = '.g:netrw_use_noswf
-  put = 'let g:netrw_xstrlen           = '.g:netrw_xstrlen
-  put = 'let g:netrw_winsize           = '.g:netrw_winsize
-
-  put =''
-  put ='+ For help, place cursor on line and press <F1>'
-
-  1d
-  silent %s/^+/"/e
-  res 99
-  silent %s/= \([^0-9].*\)$/= '\1'/e
-  silent %s/= $/= ''/e
-  1
-
-  call setline(decompressline,"let g:netrw_decompress        = ".substitute(string(g:netrw_decompress),"^'\\(.*\\)'$",'\1',''))
-  call setline(fnameescline,  "let g:netrw_fname_escape      = '".escape(g:netrw_fname_escape,"'")."'")
-  call setline(globescline,   "let g:netrw_glob_escape       = '".escape(g:netrw_glob_escape,"'")."'")
-  call setline(tmpfileescline,"let g:netrw_tmpfile_escape    = '".escape(g:netrw_tmpfile_escape,"'")."'")
-
-  set nomod
-
-  nmap <buffer> <silent> <F1>                       :call NetrwSettingHelp()<cr>
-  nnoremap <buffer> <silent> <leftmouse> <leftmouse>:call NetrwSettingHelp()<cr>
-  let tmpfile= tempname()
-  exe 'au BufWriteCmd	Netrw\ Settings	silent w! '.tmpfile.'|so '.tmpfile.'|call delete("'.tmpfile.'")|set nomod'
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwSettingHelp: {{{2
-fun! NetrwSettingHelp()
-"  call Dfunc("NetrwSettingHelp()")
-  let curline = getline(".")
-  if curline =~ '='
-   let varhelp = substitute(curline,'^\s*let ','','e')
-   let varhelp = substitute(varhelp,'\s*=.*$','','e')
-"   call Decho("trying help ".varhelp)
-   try
-    exe "he ".varhelp
-   catch /^Vim\%((\a\+)\)\=:E149/
-   	echo "***sorry*** no help available for <".varhelp.">"
-   endtry
-  elseif line(".") < s:netrw_settings_stop
-   he netrw-settings
-  elseif line(".") < s:netrw_protocol_stop
-   he netrw-externapp
-  elseif line(".") < s:netrw_xfer_stop
-   he netrw-variables
-  else
-   he netrw-browse-var
-  endif
-"  call Dret("NetrwSettingHelp")
-endfun
-
-" ---------------------------------------------------------------------
-" Modelines: {{{1
-" vim:ts=8 fdm=marker

runtime/autoload/python.vim

@@ -20,10 +20,12 @@ let g:python_indent = extend(get(g:, 'python_indent', {}), #{
 let s:maxoff = 50       " maximum number of lines to look backwards for ()
 
 function s:SearchBracket(fromlnum, flags)
+  " VIM_INDENT_TEST_TRACE_START
   return searchpairpos('[[({]', '', '[])}]', a:flags,
           \ {-> synstack('.', col('.'))
           \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\|String\)$'}) >= 0},
           \ [0, a:fromlnum - s:maxoff]->max(), g:python_indent.searchpair_timeout)
+  " VIM_INDENT_TEST_TRACE_END python#s:SearchBracket
 endfunction
 
 " See if the specified line is already user-dedented from the expected value.

runtime/autoload/rustfmt.vim

@@ -1,5 +1,8 @@
 " Author: Stephen Sugden <stephen@stephensugden.com>
 " Last Modified: 2023-09-11
+" Last Change:
+" 2025 Oct 27 by Vim project don't use rustfmt as 'formatprg' by default
+"
 "
 " Adapted from https://github.com/fatih/vim-go
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
@@ -21,6 +24,12 @@ if !exists("g:rustfmt_fail_silently")
 endif
 
 function! rustfmt#DetectVersion()
+    let s:rustfmt_version = "0"
+    let s:rustfmt_help = ""
+    let s:rustfmt_unstable_features = ""
+    if !get(g:, 'rustfmt_detect_version', 0)
+        return s:rustfmt_version
+    endif
     " Save rustfmt '--help' for feature inspection
     silent let s:rustfmt_help = system(g:rustfmt_command . " --help")
     let s:rustfmt_unstable_features = s:rustfmt_help =~# "--unstable-features"
@@ -29,9 +38,7 @@ function! rustfmt#DetectVersion()
     silent let l:rustfmt_version_full = system(g:rustfmt_command . " --version")
     let l:rustfmt_version_list = matchlist(l:rustfmt_version_full,
         \    '\vrustfmt ([0-9]+[.][0-9]+[.][0-9]+)')
-    if len(l:rustfmt_version_list) < 3
-        let s:rustfmt_version = "0"
-    else
+    if len(l:rustfmt_version_list) >= 3
         let s:rustfmt_version = l:rustfmt_version_list[1]
     endif
     return s:rustfmt_version
@@ -73,7 +80,7 @@ function! s:RustfmtConfigOptions()
     endif
 
     " Default to edition 2018 in case no rustfmt.toml was found.
-    return '--edition 2018'
+    return default
 endfunction
 
 function! s:RustfmtCommandRange(filename, line1, line2)

runtime/autoload/sqlcomplete.vim

@@ -3,6 +3,7 @@
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
 " Version:     16.0
 " Last Change: 2017 Oct 15
+" 2025 Nov 11 by Vim project: only set 'omnifunc' if dbext script was loaded #18716
 " Homepage:    http://www.vim.org/scripts/script.php?script_id=1572
 " Usage:       For detailed help
 "              ":help sql.txt"
@@ -98,12 +99,11 @@
 " Set completion with CTRL-X CTRL-O to autoloaded function.
 " This check is in place in case this script is
 " sourced directly instead of using the autoload feature.
-if exists('&omnifunc')
-    " Do not set the option if already set since this
-    " results in an E117 warning.
-    if &omnifunc == ""
-        setlocal omnifunc=sqlcomplete#Complete
-    endif
+"
+" Do not set the option if already set since this
+" results in an E117 warning.
+if exists('&omnifunc') && &omnifunc == "" && exists('g:loaded_dbext')
+    setlocal omnifunc=sqlcomplete#Complete
 endif
 
 if exists('g:loaded_sql_completion')

runtime/autoload/tar.vim

@@ -1,10 +1,23 @@
-" tar.vim: Handles browsing tarfiles
-"            AUTOLOAD PORTION
-" Date:		Nov 11, 2024
+" tar.vim: Handles browsing tarfiles -  AUTOLOAD PORTION
+" Date:		Mar 01, 2025
 " Version:	32b  (with modifications from the Vim Project)
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer: Charles E Campbell
 " License:	Vim License  (see vim's :help license)
+" Last Change:
+"   2024 Jan 08 by Vim Project: fix a few problems (#138331, #12637, #8109)
+"   2024 Feb 19 by Vim Project: announce adoption
+"   2024 Nov 11 by Vim Project: support permissions (#7379)
+"   2025 Feb 06 by Vim Project: add support for lz4 (#16591)
+"   2025 Feb 28 by Vim Project: add support for bzip3 (#16755)
+"   2025 Mar 01 by Vim Project: fix syntax error in tar#Read()
+"   2025 Mar 02 by Vim Project: escape the filename before using :read
+"   2025 Mar 02 by Vim Project: determine the compression using readblob()
+"                               instead of shelling out to file(1)
+"   2025 Apr 16 by Vim Project: decouple from netrw by adding s:WinPath()
+"   2025 May 19 by Vim Project: restore working directory after read/write
+"   2025 Jul 13 by Vim Project: warn with path traversal attacks
+"   2025 Jul 16 by Vim Project: update minimum vim version
 "
 "	Contains many ideas from Michael Toren's <tar.vim>
 "
@@ -17,31 +30,28 @@
 "               By using this plugin, you agree that in no event will the
 "               copyright holder be liable for any damages resulting from
 "               the use of this software.
-"     call inputsave()|call input("Press <cr> to continue")|call inputrestore()
 " ---------------------------------------------------------------------
 " Load Once: {{{1
 if &cp || exists("g:loaded_tar")
  finish
 endif
 let g:loaded_tar= "v32b"
-if v:version < 702
+if v:versionlong < 9011024
  echohl WarningMsg
- echo "***warning*** this version of tar needs vim 7.2"
+ echo "***warning*** this version of tar needs vim 9.1.1024"
  echohl Normal
  finish
 endif
 let s:keepcpo= &cpo
 set cpo&vim
-"DechoTabOn
-"call Decho("loading autoload/tar.vim")
 
 " ---------------------------------------------------------------------
 "  Default Settings: {{{1
 if !exists("g:tar_browseoptions")
- let g:tar_browseoptions= "Ptf"
+ let g:tar_browseoptions= "tf"
 endif
 if !exists("g:tar_readoptions")
- let g:tar_readoptions= "pPxf"
+ let g:tar_readoptions= "pxf"
 endif
 if !exists("g:tar_cmd")
  let g:tar_cmd= "tar"
@@ -50,6 +60,7 @@ if !exists("g:tar_writeoptions")
  let g:tar_writeoptions= "uf"
 endif
 if !exists("g:tar_delfile")
+ " Note: not supported on BSD
  let g:tar_delfile="--delete -f"
 endif
 if !exists("g:netrw_cygwin")
@@ -96,39 +107,46 @@ if !exists("g:tar_shq")
  else
   let g:tar_shq= "'"
  endif
-" call Decho("g:tar_shq<".g:tar_shq.">")
 endif
 
+let g:tar_secure=' -- '
+let g:tar_leading_pat='^\%([.]\{,2\}/\)\+'
+
 " ----------------
 "  Functions: {{{1
 " ----------------
 
+" ---------------------------------------------------------------------
+" s:Msg: {{{2
+fun! s:Msg(func, severity, msg)
+  redraw!
+  if a:severity =~? 'error'
+    echohl Error 
+  else
+    echohl WarningMsg
+  endif
+  echo $"***{a:severity}*** ({a:func}) {a:msg}"
+  echohl None
+endfunc
+
 " ---------------------------------------------------------------------
 " tar#Browse: {{{2
 fun! tar#Browse(tarfile)
-"  call Dfunc("tar#Browse(tarfile<".a:tarfile.">)")
   let repkeep= &report
   set report=10
 
   " sanity checks
   if !executable(g:tar_cmd)
-   redraw!
-"   call Decho('***error*** (tar#Browse) "'.g:tar_cmd.'" not available on your system')
-   echohl Error | echo '***error*** (tar#Browse) "'.g:tar_cmd.'" not available on your system'
+   call s:Msg('tar#Browse', 'error', $"{g:tar_cmd} not available on your system")
    let &report= repkeep
-"   call Dret("tar#Browse")
    return
   endif
   if !filereadable(a:tarfile)
-"   call Decho('a:tarfile<'.a:tarfile.'> not filereadable')
    if a:tarfile !~# '^\a\+://'
     " if it's an url, don't complain, let url-handlers such as vim do its thing
-    redraw!
-"    call Decho("***error*** (tar#Browse) File not readable<".a:tarfile.">")
-    echohl Error | echo "***error*** (tar#Browse) File not readable<".a:tarfile.">" | echohl None
+    call s:Msg('tar#Browse', 'error', $"File not readable<{a:tarfile}>")
    endif
    let &report= repkeep
-"   call Dret("tar#Browse : file<".a:tarfile."> not readable")
    return
   endif
   if &ma != 1
@@ -144,11 +162,10 @@ fun! tar#Browse(tarfile)
   set ft=tar
 
   " give header
-"  call Decho("printing header")
   let lastline= line("$")
   call setline(lastline+1,'" tar.vim version '.g:loaded_tar)
   call setline(lastline+2,'" Browsing tarfile '.a:tarfile)
-  call setline(lastline+3,'" Select a file with cursor and press ENTER')
+  call setline(lastline+3,'" Select a file with cursor and press ENTER, "x" to extract a file')
   keepj $put =''
   keepj sil! 0d
   keepj $
@@ -161,72 +178,60 @@ fun! tar#Browse(tarfile)
   let curlast= line("$")
 
   if tarfile =~# '\.\(gz\)$'
-"   call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
    exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
 
-  elseif tarfile =~# '\.\(tgz\)$' || tarfile =~# '\.\(tbz\)$' || tarfile =~# '\.\(txz\)$' || tarfile =~# '\.\(tzst\)$'
-   if has("unix") && executable("file")
-    let filekind= system("file ".shellescape(tarfile,1))
-   else
-    let filekind= ""
-   endif
+  elseif tarfile =~# '\.\(tgz\)$' || tarfile =~# '\.\(tbz\)$' || tarfile =~# '\.\(txz\)$' ||
+                          \ tarfile =~# '\.\(tzst\)$' || tarfile =~# '\.\(tlz4\)$'
+   let header= s:Header(tarfile)
 
-   if filekind =~ "bzip2"
+   if header =~? 'bzip2'
     exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
-   elseif filekind =~ "XZ"
+   elseif header =~? 'bzip3'
+    exe "sil! r! bzip3 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
+   elseif header =~? 'xz'
     exe "sil! r! xz -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
-   elseif filekind =~ "Zstandard"
+   elseif header =~? 'zstd'
     exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
-   else
+   elseif header =~? 'lz4'
+    exe "sil! r! lz4 --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
+   elseif header =~? 'gzip'
     exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
    endif
 
   elseif tarfile =~# '\.lrp'
-"   call Decho("2: exe silent r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - ")
    exe "sil! r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - "
   elseif tarfile =~# '\.\(bz2\|tbz\|tb2\)$'
-"   call Decho("3: exe silent r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
    exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
+  elseif tarfile =~# '\.\(bz3\|tb3\)$'
+   exe "sil! r! bzip3 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
   elseif tarfile =~# '\.\(lzma\|tlz\)$'
-"   call Decho("3: exe silent r! lzma -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
    exe "sil! r! lzma -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
   elseif tarfile =~# '\.\(xz\|txz\)$'
-"   call Decho("3: exe silent r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
    exe "sil! r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
   elseif tarfile =~# '\.\(zst\|tzst\)$'
    exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
+  elseif tarfile =~# '\.\(lz4\|tlz4\)$'
+   exe "sil! r! lz4 --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
   else
    if tarfile =~ '^\s*-'
     " A file name starting with a dash is taken as an option.  Prepend ./ to avoid that.
     let tarfile = substitute(tarfile, '-', './-', '')
    endif
-"   call Decho("4: exe silent r! ".g:tar_cmd." -".g:tar_browseoptions." ".shellescape(tarfile,0))
    exe "sil! r! ".g:tar_cmd." -".g:tar_browseoptions." ".shellescape(tarfile,1)
   endif
   if v:shell_error != 0
-   redraw!
-   echohl WarningMsg | echo "***warning*** (tar#Browse) please check your g:tar_browseoptions<".g:tar_browseoptions.">"
-"   call Dret("tar#Browse : a:tarfile<".a:tarfile.">")
+   call s:Msg('tar#Browse', 'warning', $"please check your g:tar_browseoptions '<{g:tar_browseoptions}>'")
    return
   endif
-  "
-  " The following should not be neccessary, since in case of errors the
-  " previous if statement should have caught the problem (because tar exited
-  " with a non-zero exit code).
-  " if line("$") == curlast || ( line("$") == (curlast + 1) &&
-  "       \ getline("$") =~# '\c\<\%(warning\|error\|inappropriate\|unrecognized\)\>' &&
-  "       \ getline("$") =~  '\s' )
-  "  redraw!
-  "  echohl WarningMsg | echo "***warning*** (tar#Browse) ".a:tarfile." doesn't appear to be a tar file" | echohl None
-  "  keepj sil! %d
-  "  let eikeep= &ei
-  "  set ei=BufReadCmd,FileReadCmd
-  "  exe "r ".fnameescape(a:tarfile)
-  "  let &ei= eikeep
-  "  keepj sil! 1d
-  "   call Dret("tar#Browse : a:tarfile<".a:tarfile.">")
-  "  return
-  " endif
+
+  " remove tar: Removing leading '/' from member names
+  " Note: the message could be localized
+  if search('^tar: ') > 0 || search(g:tar_leading_pat) > 0
+    call append(3,'" Note: Path Traversal Attack detected!')
+    let b:leading_slash = 1
+    " remove the message output
+    sil g/^tar: /d
+  endif
 
   " set up maps supported for tar
   setlocal noma nomod ro
@@ -237,29 +242,19 @@ fun! tar#Browse(tarfile)
   endif
 
   let &report= repkeep
-"  call Dret("tar#Browse : b:tarfile<".b:tarfile.">")
 endfun
 
 " ---------------------------------------------------------------------
 " TarBrowseSelect: {{{2
 fun! s:TarBrowseSelect()
-"  call Dfunc("TarBrowseSelect() b:tarfile<".b:tarfile."> curfile<".expand("%").">")
   let repkeep= &report
   set report=10
   let fname= getline(".")
-"  call Decho("fname<".fname.">")
-
-  if !exists("g:tar_secure") && fname =~ '^\s*-\|\s\+-'
-   redraw!
-   echohl WarningMsg | echo '***warning*** (tar#BrowseSelect) rejecting tarfile member<'.fname.'> because of embedded "-"'
-"   call Dret('tar#BrowseSelect : rejecting tarfile member<'.fname.'> because of embedded "-"')
-   return
-  endif
+  let ls= get(b:, 'leading_slash', 0)
 
   " sanity check
   if fname =~ '^"'
    let &report= repkeep
-"   call Dret("TarBrowseSelect")
    return
   endif
 
@@ -277,36 +272,29 @@ fun! s:TarBrowseSelect()
    wincmd _
   endif
   let s:tblfile_{winnr()}= curfile
-  call tar#Read("tarfile:".tarfile.'::'.fname,1)
+  let b:leading_slash= ls
+  call tar#Read("tarfile:".tarfile.'::'.fname)
   filetype detect
   set nomod
   exe 'com! -buffer -nargs=? -complete=file TarDiff	:call tar#Diff(<q-args>,"'.fnameescape(fname).'")'
 
   let &report= repkeep
-"  call Dret("TarBrowseSelect : s:tblfile_".winnr()."<".s:tblfile_{winnr()}.">")
 endfun
 
 " ---------------------------------------------------------------------
 " tar#Read: {{{2
-fun! tar#Read(fname,mode)
-"  call Dfunc("tar#Read(fname<".a:fname.">,mode=".a:mode.")")
+fun! tar#Read(fname)
   let repkeep= &report
   set report=10
   let tarfile = substitute(a:fname,'tarfile:\(.\{-}\)::.*$','\1','')
   let fname   = substitute(a:fname,'tarfile:.\{-}::\(.*\)$','\1','')
-
-" changing the directory to the temporary earlier to allow tar to extract the file with permissions intact
-  if !exists("*mkdir")
-   redraw!
-   echohl Error | echo "***error*** (tar#Write) sorry, mkdir() doesn't work on your system" | echohl None
-   let &report= repkeep
-   return
-  endif
+  " be careful not to execute special crafted files
+  let escape_file = fname->substitute(g:tar_leading_pat, '', '')->fnameescape()
 
   let curdir= getcwd()
+  let b:curdir= curdir
   let tmpdir= tempname()
-  let b:curdir= tmpdir
-  let b:tmpdir= curdir
+  let b:tmpdir= tmpdir
   if tmpdir =~ '\.'
    let tmpdir= substitute(tmpdir,'\.[^.]*$','','e')
   endif
@@ -314,10 +302,9 @@ fun! tar#Read(fname,mode)
 
   " attempt to change to the indicated directory
   try
-   exe "cd ".fnameescape(tmpdir)
+   exe "lcd ".fnameescape(tmpdir)
   catch /^Vim\%((\a\+)\)\=:E344/
-   redraw!
-   echohl Error | echo "***error*** (tar#Write) cannot cd to temporary directory" | Echohl None
+   call s:Msg('tar#Read', 'error', "cannot lcd to temporary directory")
    let &report= repkeep
    return
   endtry
@@ -327,19 +314,20 @@ fun! tar#Read(fname,mode)
    call s:Rmdir("_ZIPVIM_")
   endif
   call mkdir("_ZIPVIM_")
-  cd _ZIPVIM_
+  lcd _ZIPVIM_
 
   if has("win32unix") && executable("cygpath")
    " assuming cygwin
    let tarfile=substitute(system("cygpath -u ".shellescape(tarfile,0)),'\n$','','e')
   endif
-"  call Decho("tarfile<".tarfile.">")
-"  call Decho("fname<".fname.">")
 
   if  fname =~ '\.bz2$' && executable("bzcat")
    let decmp= "|bzcat"
    let doro = 1
-  elseif      fname =~ '\.t\=gz$'  && executable("zcat")
+  elseif  fname =~ '\.bz3$' && executable("bz3cat")
+   let decmp= "|bz3cat"
+   let doro = 1
+  elseif  fname =~ '\.t\=gz$'  && executable("zcat")
    let decmp= "|zcat"
    let doro = 1
   elseif  fname =~ '\.lzma$' && executable("lzcat")
@@ -351,72 +339,77 @@ fun! tar#Read(fname,mode)
   elseif  fname =~ '\.zst$' && executable("zstdcat")
    let decmp= "|zstdcat"
    let doro = 1
+  elseif  fname =~ '\.lz4$' && executable("lz4cat")
+   let decmp= "|lz4cat"
+   let doro = 1
   else
    let decmp=""
    let doro = 0
-   if fname =~ '\.bz2$\|\.gz$\|\.lzma$\|\.xz$\|\.zip$\|\.Z$'
+   if fname =~ '\.bz2$\|\.bz3$\|\.gz$\|\.lzma$\|\.xz$\|\.zip$\|\.Z$'
     setlocal bin
    endif
   endif
 
-  if exists("g:tar_secure")
-   let tar_secure= " -- "
-  else
-   let tar_secure= " "
-  endif
 
   if tarfile =~# '\.bz2$'
-   exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-   exe "read ".fname
+   exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+   exe "read ".escape_file
+  elseif tarfile =~# '\.bz3$'
+   exe "sil! r! bzip3 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+   exe "read ".escape_file
   elseif tarfile =~# '\.\(gz\)$'
-   exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-   exe "read ".fname
+   exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+   exe "read ".escape_file
   elseif tarfile =~# '\(\.tgz\|\.tbz\|\.txz\)'
-   if has("unix") && executable("file")
-    let filekind= system("file ".shellescape(tarfile,1))
-   else
-    let filekind= ""
-   endif
-   if filekind =~ "bzip2"
-    exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-    exe "read ".fname
-   elseif filekind =~ "XZ"
-    exe "sil! r! xz -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-    exe "read ".fname
-   elseif filekind =~ "Zstandard"
-    exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-    exe "read ".fname
-   else
-    exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-    exe "read ".fname
+   let filekind= s:Header(tarfile)
+   if filekind =~? "bzip2"
+    exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+    exe "read ".escape_file
+   elseif filekind =~ "bzip3"
+    exe "sil! r! bzip3 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+    exe "read ".escape_file
+   elseif filekind =~? "xz"
+    exe "sil! r! xz -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+    exe "read ".escape_file
+   elseif filekind =~? "zstd"
+    exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+    exe "read ".escape_file
+   elseif filekind =~? "gzip"
+    exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+    exe "read ".escape_file
    endif
 
   elseif tarfile =~# '\.lrp$'
-   exe "sil! r! cat -- ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-   exe "read ".fname
+   exe "sil! r! cat -- ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+   exe "read ".escape_file
   elseif tarfile =~# '\.lzma$'
-   exe "sil! r! lzma -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-   exe "read ".fname
+   exe "sil! r! lzma -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+   exe "read ".escape_file
   elseif tarfile =~# '\.\(xz\|txz\)$'
-   exe "sil! r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-   exe "read ".fname
+   exe "sil! r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+   exe "read ".escape_file
+  elseif tarfile =~# '\.\(lz4\|tlz4\)$'
+   exe "sil! r! lz4 --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_readoptions." - ".g:tar_secure.shellescape(fname,1).decmp
+   exe "read ".escape_file
   else
    if tarfile =~ '^\s*-'
     " A file name starting with a dash is taken as an option.  Prepend ./ to avoid that.
     let tarfile = substitute(tarfile, '-', './-', '')
    endif
-"   call Decho("8: exe silent r! ".g:tar_cmd." -".g:tar_readoptions.tar_secure.shellescape(tarfile,1)." ".shellescape(fname,1).decmp)
-   exe "silent r! ".g:tar_cmd." -".g:tar_readoptions.shellescape(tarfile,1)." ".tar_secure.shellescape(fname,1).decmp
-   exe "read ".fname
+   exe "silent r! ".g:tar_cmd." -".g:tar_readoptions.shellescape(tarfile,1)." ".g:tar_secure.shellescape(fname,1).decmp
+   exe "read ".escape_file
+  endif
+  if get(b:, 'leading_slash', 0)
+    sil g/^tar: /d
   endif
 
    redraw!
 
-if v:shell_error != 0
-   cd ..
+  if v:shell_error != 0
+   lcd ..
    call s:Rmdir("_ZIPVIM_")
-   exe "cd ".fnameescape(curdir)
-   echohl Error | echo "***error*** (tar#Read) sorry, unable to open or extract ".tarfile." with ".fname | echohl None
+   exe "lcd ".fnameescape(curdir)
+   call s:Msg('tar#Read', 'error', $"sorry, unable to open or extract {tarfile} with {fname}")
   endif
 
   if doro
@@ -425,88 +418,95 @@ if v:shell_error != 0
   endif
 
   let b:tarfile= a:fname
-  exe "file tarfile::".fnameescape(fname)
 
   " cleanup
   keepj sil! 0d
   set nomod
 
   let &report= repkeep
-"  call Dret("tar#Read : b:tarfile<".b:tarfile.">")
+  exe "lcd ".fnameescape(curdir)
+  silent exe "file tarfile::". fname->fnameescape()
 endfun
 
 " ---------------------------------------------------------------------
 " tar#Write: {{{2
 fun! tar#Write(fname)
-"  call Dfunc("tar#Write(fname<".a:fname.">) b:tarfile<".b:tarfile."> tblfile_".winnr()."<".s:tblfile_{winnr()}.">")
+  let pwdkeep= getcwd()
   let repkeep= &report
   set report=10
-  
-  " temporary buffer variable workaround because too fucking tired. but it works now
   let curdir= b:curdir
   let tmpdir= b:tmpdir
 
-  if !exists("g:tar_secure") && a:fname =~ '^\s*-\|\s\+-'
-   redraw!
-   echohl WarningMsg | echo '***warning*** (tar#Write) rejecting tarfile member<'.a:fname.'> because of embedded "-"'
-"   call Dret('tar#Write : rejecting tarfile member<'.fname.'> because of embedded "-"')
-   return
-  endif
-
   " sanity checks
   if !executable(g:tar_cmd)
    redraw!
-"   call Decho('***error*** (tar#Browse) "'.g:tar_cmd.'" not available on your system')
    let &report= repkeep
-"   call Dret("tar#Write")
+   return
+  endif
+  let tarfile = substitute(b:tarfile,'tarfile:\(.\{-}\)::.*$','\1','')
+  let fname   = substitute(b:tarfile,'tarfile:.\{-}::\(.*\)$','\1','')
+
+  if get(b:, 'leading_slash', 0)
+   call s:Msg('tar#Write', 'error', $"sorry, not attempting to update {tarfile} with {fname}")
+   let &report= repkeep
    return
   endif
 
-  let tarfile = substitute(b:tarfile,'tarfile:\(.\{-}\)::.*$','\1','')
-  let fname   = substitute(b:tarfile,'tarfile:.\{-}::\(.*\)$','\1','')
+  if !isdirectory(fnameescape(tmpdir))
+    call mkdir(fnameescape(tmpdir), 'p')
+  endif
+  exe $"lcd {fnameescape(tmpdir)}"
+  if isdirectory("_ZIPVIM_")
+    call s:Rmdir("_ZIPVIM_")
+  endif
+  call mkdir("_ZIPVIM_")
+  lcd _ZIPVIM_
+  let dir = fnamemodify(fname, ':p:h')
+  if dir !~# '_ZIPVIM_$'
+    call mkdir(dir)
+  endif
 
   " handle compressed archives
   if tarfile =~# '\.bz2'
    call system("bzip2 -d -- ".shellescape(tarfile,0))
    let tarfile = substitute(tarfile,'\.bz2','','e')
    let compress= "bzip2 -- ".shellescape(tarfile,0)
-"   call Decho("compress<".compress.">")
+  elseif tarfile =~# '\.bz3'
+   call system("bzip3 -d -- ".shellescape(tarfile,0))
+   let tarfile = substitute(tarfile,'\.bz3','','e')
+   let compress= "bzip3 -- ".shellescape(tarfile,0)
   elseif tarfile =~# '\.gz'
    call system("gzip -d -- ".shellescape(tarfile,0))
    let tarfile = substitute(tarfile,'\.gz','','e')
    let compress= "gzip -- ".shellescape(tarfile,0)
-"   call Decho("compress<".compress.">")
   elseif tarfile =~# '\.tgz'
    call system("gzip -d -- ".shellescape(tarfile,0))
    let tarfile = substitute(tarfile,'\.tgz','.tar','e')
    let compress= "gzip -- ".shellescape(tarfile,0)
    let tgz     = 1
-"   call Decho("compress<".compress.">")
   elseif tarfile =~# '\.xz'
    call system("xz -d -- ".shellescape(tarfile,0))
    let tarfile = substitute(tarfile,'\.xz','','e')
    let compress= "xz -- ".shellescape(tarfile,0)
-"   call Decho("compress<".compress.">")
   elseif tarfile =~# '\.zst'
    call system("zstd --decompress --rm -- ".shellescape(tarfile,0))
    let tarfile = substitute(tarfile,'\.zst','','e')
    let compress= "zstd --rm -- ".shellescape(tarfile,0)
+  elseif tarfile =~# '\.lz4'
+   call system("lz4 --decompress --rm -- ".shellescape(tarfile,0))
+   let tarfile = substitute(tarfile,'\.lz4','','e')
+   let compress= "lz4 --rm -- ".shellescape(tarfile,0)
   elseif tarfile =~# '\.lzma'
    call system("lzma -d -- ".shellescape(tarfile,0))
    let tarfile = substitute(tarfile,'\.lzma','','e')
    let compress= "lzma -- ".shellescape(tarfile,0)
-"   call Decho("compress<".compress.">")
   endif
-"  call Decho("tarfile<".tarfile.">")
+  " Note: no support for name.tar.tbz/.txz/.tgz/.tlz4/.tzst
 
   if v:shell_error != 0
-   redraw!
-"   call Decho("***error*** (tar#Write) sorry, unable to update ".tarfile." with ".fname)
-   echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".tarfile." with ".fname | echohl None
+   call s:Msg('tar#Write', 'error', $"sorry, unable to update {tarfile} with {fname}")
   else
 
-"   call Decho("tarfile<".tarfile."> fname<".fname.">")
-
    if fname =~ '/'
     let dirpath = substitute(fname,'/[^/]\+$','','e')
     if has("win32unix") && executable("cygpath")
@@ -521,39 +521,26 @@ fun! tar#Write(fname)
     " A file name starting with a dash may be taken as an option.  Prepend ./ to avoid that.
     let tarfile = substitute(tarfile, '-', './-', '')
    endif
-"   call Decho("tarfile<".tarfile."> fname<".fname.">")
 
-   if exists("g:tar_secure")
-    let tar_secure= " -- "
-   else
-    let tar_secure= " "
-   endif
-   exe "w! ".fnameescape(fname)
+   " don't overwrite a file forcefully
+   exe "w ".fnameescape(fname)
    if has("win32unix") && executable("cygpath")
     let tarfile = substitute(system("cygpath ".shellescape(tarfile,0)),'\n','','e')
    endif
 
    " delete old file from tarfile
-"   call Decho("system(".g:tar_cmd." ".g:tar_delfile." ".shellescape(tarfile,0)." -- ".shellescape(fname,0).")")
-   call system(g:tar_cmd." ".g:tar_delfile." ".shellescape(tarfile,0).tar_secure.shellescape(fname,0))
+   " Note: BSD tar does not support --delete flag
+   call system(g:tar_cmd." ".g:tar_delfile." ".shellescape(tarfile,0).g:tar_secure.shellescape(fname,0))
    if v:shell_error != 0
-    redraw!
-"    call Decho("***error*** (tar#Write) sorry, unable to update ".fnameescape(tarfile)." with ".fnameescape(fname))
-    echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".fnameescape(tarfile)." with ".fnameescape(fname) | echohl None
+    call s:Msg('tar#Write', 'error', $"sorry, unable to update {fnameescape(tarfile)} with {fnameescape(fname)} --delete not supported?")
    else
-
     " update tarfile with new file
-"    call Decho(g:tar_cmd." -".g:tar_writeoptions." ".shellescape(tarfile,0).tar_secure.shellescape(fname,0))
-    call system(g:tar_cmd." -".g:tar_writeoptions." ".shellescape(tarfile,0).tar_secure.shellescape(fname,0))
+    call system(g:tar_cmd." -".g:tar_writeoptions." ".shellescape(tarfile,0).g:tar_secure.shellescape(fname,0))
     if v:shell_error != 0
-     redraw!
-"     call Decho("***error*** (tar#Write) sorry, unable to update ".fnameescape(tarfile)." with ".fnameescape(fname))
-     echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".fnameescape(tarfile)." with ".fnameescape(fname) | echohl None
+     call s:Msg('tar#Write', 'error', $"sorry, unable to update {fnameescape(tarfile)} with {fnameescape(fname)}")
     elseif exists("compress")
-"     call Decho("call system(".compress.")")
      call system(compress)
      if exists("tgz")
-"      call Decho("rename(".tarfile.".gz,".substitute(tarfile,'\.tar$','.tgz','e').")")
       call rename(tarfile.".gz",substitute(tarfile,'\.tar$','.tgz','e'))
      endif
     endif
@@ -561,7 +548,6 @@ fun! tar#Write(fname)
 
    " support writing tarfiles across a network
    if s:tblfile_{winnr()} =~ '^\a\+://'
-"    call Decho("handle writing <".tarfile."> across network to <".s:tblfile_{winnr()}.">")
     let tblfile= s:tblfile_{winnr()}
     1split|noswapfile enew
     let binkeep= &l:binary
@@ -577,23 +563,22 @@ fun! tar#Write(fname)
   endif
 
   " cleanup and restore current directory
-  cd ..
+  lcd ..
   call s:Rmdir("_ZIPVIM_")
-  exe "cd ".fnameescape(curdir)
+  exe "lcd ".fnameescape(pwdkeep)
   setlocal nomod
 
   let &report= repkeep
-"  call Dret("tar#Write")
 endfun
 
 " ---------------------------------------------------------------------
 " tar#Diff: {{{2
 fun! tar#Diff(userfname,fname)
-"  call Dfunc("tar#Diff(userfname<".a:userfname."> fname<".a:fname.")")
   let fname= a:fname
   if a:userfname != ""
    let fname= a:userfname
   endif
+  exe "lcd ".fnameescape(b:tmpdir). '/_ZIPVIM_'
   if filereadable(fname)
    " sets current file (from tarball) for diff'ing
    " splits window vertically
@@ -607,133 +592,129 @@ fun! tar#Diff(userfname,fname)
    redraw!
    echo "***warning*** unable to read file<".fname.">"
   endif
-"  call Dret("tar#Diff")
 endfun
 
 " ---------------------------------------------------------------------
 " tar#Extract: extract a file from a (possibly compressed) tar archive {{{2
 fun! tar#Extract()
-"  call Dfunc("tar#Extract()")
 
   let repkeep= &report
   set report=10
   let fname= getline(".")
-"  call Decho("fname<".fname.">")
-
-  if !exists("g:tar_secure") && fname =~ '^\s*-\|\s\+-'
-   redraw!
-   echohl WarningMsg | echo '***warning*** (tar#BrowseSelect) rejecting tarfile member<'.fname.'> because of embedded "-"'
-"   call Dret('tar#BrowseSelect : rejecting tarfile member<'.fname.'> because of embedded "-"')
-   return
-  endif
 
   " sanity check
   if fname =~ '^"'
    let &report= repkeep
-"   call Dret("TarBrowseSelect")
    return
   endif
 
   let tarball = expand("%")
-"  call Decho("tarball<".tarball.">")
   let tarbase = substitute(tarball,'\..*$','','')
-"  call Decho("tarbase<".tarbase.">")
 
-  let extractcmd= netrw#WinPath(g:tar_extractcmd)
+  let extractcmd= s:WinPath(g:tar_extractcmd)
   if filereadable(tarbase.".tar")
-"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tar ".shellescape(fname).")")
    call system(extractcmd." ".shellescape(tarbase).".tar ".shellescape(fname))
    if v:shell_error != 0
-    echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tar ".fname.": failed!" | echohl NONE
-"    call Decho("***error*** ".extractcmd." ".tarbase.".tar ".fname.": failed!")
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar {fname}: failed!")
    else
-    echo "***note*** successfully extracted ".fname
+    echo "***note*** successfully extracted ". fname
    endif
 
   elseif filereadable(tarbase.".tgz")
    let extractcmd= substitute(extractcmd,"-","-z","")
-"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tgz ".shellescape(fname).")")
    call system(extractcmd." ".shellescape(tarbase).".tgz ".shellescape(fname))
    if v:shell_error != 0
-    echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tgz ".fname.": failed!" | echohl NONE
-"    call Decho("***error*** ".extractcmd."t ".tarbase.".tgz ".fname.": failed!")
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tgz {fname}: failed!")
    else
     echo "***note*** successfully extracted ".fname
    endif
 
   elseif filereadable(tarbase.".tar.gz")
    let extractcmd= substitute(extractcmd,"-","-z","")
-"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tar.gz ".shellescape(fname).")")
    call system(extractcmd." ".shellescape(tarbase).".tar.gz ".shellescape(fname))
    if v:shell_error != 0
-    echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tar.gz ".fname.": failed!" | echohl NONE
-"    call Decho("***error*** ".extractcmd." ".tarbase.".tar.gz ".fname.": failed!")
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar.gz {fname}: failed!")
    else
     echo "***note*** successfully extracted ".fname
    endif
 
   elseif filereadable(tarbase.".tbz")
    let extractcmd= substitute(extractcmd,"-","-j","")
-"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tbz ".shellescape(fname).")")
    call system(extractcmd." ".shellescape(tarbase).".tbz ".shellescape(fname))
    if v:shell_error != 0
-    echohl Error | echo "***error*** ".extractcmd."j ".tarbase.".tbz ".fname.": failed!" | echohl NONE
-"    call Decho("***error*** ".extractcmd."j ".tarbase.".tbz ".fname.": failed!")
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tbz {fname}: failed!")
    else
     echo "***note*** successfully extracted ".fname
    endif
 
   elseif filereadable(tarbase.".tar.bz2")
    let extractcmd= substitute(extractcmd,"-","-j","")
-"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tar.bz2 ".shellescape(fname).")")
    call system(extractcmd." ".shellescape(tarbase).".tar.bz2 ".shellescape(fname))
    if v:shell_error != 0
-    echohl Error | echo "***error*** ".extractcmd."j ".tarbase.".tar.bz2 ".fname.": failed!" | echohl NONE
-"    call Decho("***error*** ".extractcmd."j ".tarbase.".tar.bz2 ".fname.": failed!")
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar.bz2 {fname}: failed!")
+   else
+    echo "***note*** successfully extracted ".fname
+   endif
+
+  elseif filereadable(tarbase.".tar.bz3")
+   let extractcmd= substitute(extractcmd,"-","-j","")
+   call system(extractcmd." ".shellescape(tarbase).".tar.bz3 ".shellescape(fname))
+   if v:shell_error != 0
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar.bz3 {fname}: failed!")
    else
     echo "***note*** successfully extracted ".fname
    endif
 
   elseif filereadable(tarbase.".txz")
    let extractcmd= substitute(extractcmd,"-","-J","")
-"   call Decho("system(".extractcmd." ".shellescape(tarbase).".txz ".shellescape(fname).")")
    call system(extractcmd." ".shellescape(tarbase).".txz ".shellescape(fname))
    if v:shell_error != 0
-    echohl Error | echo "***error*** ".extractcmd." ".tarbase.".txz ".fname.": failed!" | echohl NONE
-"    call Decho("***error*** ".extractcmd." ".tarbase.".txz ".fname.": failed!")
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.txz {fname}: failed!")
    else
     echo "***note*** successfully extracted ".fname
    endif
 
   elseif filereadable(tarbase.".tar.xz")
    let extractcmd= substitute(extractcmd,"-","-J","")
-"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tar.xz ".shellescape(fname).")")
    call system(extractcmd." ".shellescape(tarbase).".tar.xz ".shellescape(fname))
    if v:shell_error != 0
-    echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tar.xz ".fname.": failed!" | echohl NONE
-"    call Decho("***error*** ".extractcmd." ".tarbase.".tar.xz ".fname.": failed!")
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar.xz {fname}: failed!")
    else
     echo "***note*** successfully extracted ".fname
    endif
 
   elseif filereadable(tarbase.".tzst")
    let extractcmd= substitute(extractcmd,"-","--zstd","")
-"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tzst ".shellescape(fname).")")
    call system(extractcmd." ".shellescape(tarbase).".tzst ".shellescape(fname))
    if v:shell_error != 0
-    echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tzst ".fname.": failed!" | echohl NONE
-"    call Decho("***error*** ".extractcmd." ".tarbase.".tzst ".fname.": failed!")
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tzst {fname}: failed!")
    else
     echo "***note*** successfully extracted ".fname
    endif
 
   elseif filereadable(tarbase.".tar.zst")
    let extractcmd= substitute(extractcmd,"-","--zstd","")
-"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tar.zst ".shellescape(fname).")")
    call system(extractcmd." ".shellescape(tarbase).".tar.zst ".shellescape(fname))
    if v:shell_error != 0
-    echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tar.zst ".fname.": failed!" | echohl NONE
-"    call Decho("***error*** ".extractcmd." ".tarbase.".tar.zst ".fname.": failed!")
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar.zst {fname}: failed!")
+   else
+    echo "***note*** successfully extracted ".fname
+   endif
+
+  elseif filereadable(tarbase.".tlz4")
+   let extractcmd= substitute(extractcmd,"-","-I lz4","")
+   call system(extractcmd." ".shellescape(tarbase).".tlz4 ".shellescape(fname))
+   if v:shell_error != 0
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tlz4 {fname}: failed!")
+   else
+    echo "***note*** successfully extracted ".fname
+   endif
+
+  elseif filereadable(tarbase.".tar.lz4")
+   let extractcmd= substitute(extractcmd,"-","-I lz4","")
+   call system(extractcmd." ".shellescape(tarbase).".tar.lz4".shellescape(fname))
+   if v:shell_error != 0
+    call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar.lz4 {fname}: failed!")
    else
     echo "***note*** successfully extracted ".fname
    endif
@@ -741,61 +722,80 @@ fun! tar#Extract()
 
   " restore option
   let &report= repkeep
-
-"  call Dret("tar#Extract")
 endfun
 
 " ---------------------------------------------------------------------
 " s:Rmdir: {{{2
 fun! s:Rmdir(fname)
-"  call Dfunc("Rmdir(fname<".a:fname.">)")
-  if has("unix")
-   call system("/bin/rm -rf -- ".shellescape(a:fname,0))
-  elseif has("win32") || has("win95") || has("win64") || has("win16")
-   if &shell =~? "sh$"
-    call system("/bin/rm -rf -- ".shellescape(a:fname,0))
-   else
-    call system("del /S ".shellescape(a:fname,0))
-   endif
+  call delete(a:fname, 'rf')
+endfun
+
+" s:FileHeader: {{{2
+fun! s:Header(fname)
+  let header= readblob(a:fname, 0, 6)
+  if header[0:2] == str2blob(['BZh']) " bzip2 header
+    return "bzip2"
+  elseif header[0:2] == str2blob(['BZ3']) " bzip3 header
+    return "bzip3"
+  elseif header == str2blob(["\3757zXZ\n"]) " xz header
+    return "xz"
+  elseif header[0:3] == str2blob(["\x28\xB5\x2F\xFD"]) " zstd header
+    return "zstd"
+  elseif header[0:3] == str2blob(["\004\"M\030"]) " lz4 header
+    return "lz4"
+  elseif (header[0:1] == str2blob(["\037\235"]) ||
+       \  header[0:1] == str2blob(["\037\213"]) ||
+       \  header[0:1] == str2blob(["\037\236"]) ||
+       \  header[0:1] == str2blob(["\037\240"]) ||
+       \  header[0:1] == str2blob(["\037\036"]))
+    return "gzip"
   endif
-"  call Dret("Rmdir")
+  return "unknown"
+endfun
+
+" ---------------------------------------------------------------------
+" s:WinPath: {{{2
+fun! s:WinPath(path)
+  if (!g:netrw_cygwin || &shell !~ '\%(\<bash\>\|\<zsh\>\)\%(\.exe\)\=$') && has("win32")
+    " remove cygdrive prefix, if present
+    let path = substitute(a:path, '/cygdrive/\(.\)', '\1:', '')
+    " remove trailing slash (Win95)
+    let path = substitute(path, '\(\\\|/\)$', '', 'g')
+    " remove escaped spaces
+    let path = substitute(path, '\ ', ' ', 'g')
+    " convert slashes to backslashes
+    let path = substitute(path, '/', '\', 'g')
+  else
+    let path = a:path
+  endif
+
+  return path
 endfun
 
 " ---------------------------------------------------------------------
 " tar#Vimuntar: installs a tarball in the user's .vim / vimfiles directory {{{2
 fun! tar#Vimuntar(...)
-"  call Dfunc("tar#Vimuntar() a:0=".a:0." a:1<".(exists("a:1")? a:1 : "-n/a-").">")
   let tarball = expand("%")
-"  call Decho("tarball<".tarball.">")
   let tarbase = substitute(tarball,'\..*$','','')
-"  call Decho("tarbase<".tarbase.">")
   let tarhome = expand("%:p")
   if has("win32") || has("win95") || has("win64") || has("win16")
    let tarhome= substitute(tarhome,'\\','/','g')
   endif
   let tarhome= substitute(tarhome,'/[^/]*$','','')
-"  call Decho("tarhome<".tarhome.">")
   let tartail = expand("%:t")
-"  call Decho("tartail<".tartail.">")
   let curdir  = getcwd()
-"  call Decho("curdir <".curdir.">")
   " set up vimhome
   if a:0 > 0 && a:1 != ""
    let vimhome= a:1
   else
    let vimhome= vimball#VimballHome()
   endif
-"  call Decho("vimhome<".vimhome.">")
 
-"  call Decho("curdir<".curdir."> vimhome<".vimhome.">")
   if simplify(curdir) != simplify(vimhome)
    " copy (possibly compressed) tarball to .vim/vimfiles
-"   call Decho(netrw#WinPath(g:tar_copycmd)." ".shellescape(tartail)." ".shellescape(vimhome))
-   call system(netrw#WinPath(g:tar_copycmd)." ".shellescape(tartail)." ".shellescape(vimhome))
-"   call Decho("exe cd ".fnameescape(vimhome))
-   exe "cd ".fnameescape(vimhome)
+   call system(s:WinPath(g:tar_copycmd)." ".shellescape(tartail)." ".shellescape(vimhome))
+   exe "lcd ".fnameescape(vimhome)
   endif
-"  call Decho("getcwd<".getcwd().">")
 
   " if necessary, decompress the tarball; then, extract it
   if tartail =~ '\.tgz'
@@ -807,34 +807,27 @@ fun! tar#Vimuntar(...)
     echoerr "unable to decompress<".tartail."> on this system"
     if simplify(curdir) != simplify(tarhome)
      " remove decompressed tarball, restore directory
-"     call Decho("delete(".tartail.".tar)")
      call delete(tartail.".tar")
-"     call Decho("exe cd ".fnameescape(curdir))
-     exe "cd ".fnameescape(curdir)
+     exe "lcd ".fnameescape(curdir)
     endif
-"    call Dret("tar#Vimuntar")
     return
    endif
   else
    call vimball#Decompress(tartail,0)
   endif
-  let extractcmd= netrw#WinPath(g:tar_extractcmd)
-"  call Decho("system(".extractcmd." ".shellescape(tarbase.".tar").")")
+  let extractcmd= s:WinPath(g:tar_extractcmd)
   call system(extractcmd." ".shellescape(tarbase.".tar"))
 
   " set up help
   if filereadable("doc/".tarbase.".txt")
-"   call Decho("exe helptags ".getcwd()."/doc")
    exe "helptags ".getcwd()."/doc"
   endif
 
   if simplify(tarhome) != simplify(vimhome)
    " remove decompressed tarball, restore directory
    call delete(vimhome."/".tarbase.".tar")
-   exe "cd ".fnameescape(curdir)
+   exe "lcd ".fnameescape(curdir)
   endif
-
-"  call Dret("tar#Vimuntar")
 endfun
 
 " =====================================================================

runtime/autoload/tutor.vim

@@ -157,12 +157,14 @@ function! s:Sort(a, b)
     return retval
 endfunction
 
-function! s:GlobTutorials(name)
+" returns a list of all tutor files matching the given name
+function! tutor#GlobTutorials(name, locale)
+    let locale = a:locale
     " search for tutorials:
     " 1. non-localized
     let l:tutors = s:GlobPath(&rtp, 'tutor/'.a:name.'.tutor')
     " 2. localized for current locale
-    let l:locale_tutors = s:GlobPath(&rtp, 'tutor/'.s:Locale()[0].'/'.a:name.'.tutor')
+    let l:locale_tutors = s:GlobPath(&rtp, 'tutor/'.locale.'/'.a:name.'.tutor')
     " 3. fallback to 'en'
     if len(l:locale_tutors) == 0
         let l:locale_tutors = s:GlobPath(&rtp, 'tutor/en/'.a:name.'.tutor')
@@ -187,7 +189,7 @@ function! tutor#TutorCmd(tutor_name)
         let l:tutor_name = fnamemodify(l:tutor_name, ':r')
     endif
 
-    let l:tutors = s:GlobTutorials(l:tutor_name)
+    let l:tutors = tutor#GlobTutorials(l:tutor_name, s:Locale()[0])
 
     if len(l:tutors) == 0
         echom "No tutorial with that name found"
@@ -209,11 +211,33 @@ function! tutor#TutorCmd(tutor_name)
     endif
 
     call tutor#SetupVim()
-    exe "edit ".l:to_open
+    exe "drop ".fnameescape(l:to_open)
+    call tutor#EnableInteractive(v:true)
 endfunction
 
 function! tutor#TutorCmdComplete(lead,line,pos)
-    let l:tutors = s:GlobTutorials('*')
+    let l:tutors = tutor#GlobTutorials('*', s:Locale()[0])
     let l:names = uniq(sort(map(l:tutors, 'fnamemodify(v:val, ":t:r")'), 's:Sort'))
     return join(l:names, "\n")
 endfunction
+
+" Enables/disables interactive mode.
+function! tutor#EnableInteractive(enable)
+    let enable = a:enable
+    if enable
+        setlocal buftype=nowrite
+        setlocal concealcursor+=inv
+        setlocal conceallevel=2
+        call tutor#ApplyMarks()
+        augroup tutor_interactive
+            autocmd! TextChanged,TextChangedI <buffer> call tutor#ApplyMarksOnChanged()
+        augroup END
+    else
+        setlocal buftype<
+        setlocal concealcursor<
+        setlocal conceallevel<
+        if exists('#tutor_interactive')
+            autocmd! tutor_interactive * <buffer>
+        endif
+    endif
+endfunction

runtime/autoload/typst.vim

@@ -1,7 +1,7 @@
 " Language:    Typst
-" Previous Maintainer:  Gregory Anders
-" Maintainer:  Luca Saccarola <github.e41mv@aleeas.com>
-" Last Change: 2024 Dec 09
+" Previous Maintainer:  Luca Saccarola <github.e41mv@aleeas.com>
+" Maintainer: This runtime file is looking for a new maintainer.
+" Last Change: 2025 Aug 05
 " Based on:    https://github.com/kaarmu/typst.vim
 
 function! typst#indentexpr() abort

runtime/autoload/vimball.vim

@@ -2,8 +2,10 @@
 " Maintainer: This runtime file is looking for a new maintainer.
 " Original Author:	Charles E. Campbell
 " Date:			Apr 11, 2016
-" Version:	37
+" Version:	37 (with modifications from the Vim Project)
 " GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
+"  Last Change:
+"   2025 Feb 28 by Vim Project: add support for bzip3 (#16755)
 " Copyright: (c) 2004-2011 by Charles E. Campbell
 "            The VIM LICENSE applies to Vimball.vim, and Vimball.txt
 "            (see |copyright|) except use "Vimball" instead of "Vim".
@@ -530,6 +532,26 @@ fun! vimball#Decompress(fname,...)
    exe "e ".escape(fname,' \')
    if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
 
+  elseif expand("%") =~ '.*\.bz3' && executable("bunzip3")
+   " handle *.bz3 with bunzip3
+   silent exe "!bunzip3 ".shellescape(a:fname)
+   if v:shell_error != 0
+	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) bunzip3 may have failed with <".a:fname.">")
+   endif
+   let fname= substitute(a:fname,'\.bz3$','','')
+   exe "e ".escape(fname,' \')
+   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
+
+  elseif expand("%") =~ '.*\.bz3' && executable("bzip3")
+   " handle *.bz3 with bzip3 -d
+   silent exe "!bzip3 -d ".shellescape(a:fname)
+   if v:shell_error != 0
+	call vimball#ShowMesg(s:WARNING,'(vimball#Decompress) "bzip3 -d" may have failed with <'.a:fname.">")
+   endif
+   let fname= substitute(a:fname,'\.bz3$','','')
+   exe "e ".escape(fname,' \')
+   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
+
   elseif expand("%") =~ '.*\.zip' && executable("unzip")
    " handle *.zip with unzip
    silent exe "!unzip ".shellescape(a:fname)

runtime/autoload/vimcomplete.vim

@@ -0,0 +1,96 @@
+vim9script
+
+# Vim completion script
+# Language:    Vim script
+# Maintainer:  Maxim Kim <habamax@gmail.com>
+# Last Change: 2025-10-15
+#
+# Usage:
+# setlocal omnifunc=vimcomplete#Complete
+#
+# Simple complete function for Vim script
+
+var trigger: string = ""
+var prefix: string = ""
+
+
+def GetTrigger(line: string): list<any>
+    var result = ""
+    var result_len = 0
+
+    if line =~ '->\k*$'
+        result = 'function'
+    elseif line =~ '\v%(^|\s+)\&\k*$'
+        result = 'option'
+    elseif line =~ '\vse%[t]\s+(\k+\s+)*no\k*$'
+        result = 'nooption'
+        result_len = -2
+    elseif line =~ '[\[(]\s*$'
+        result = 'expression'
+    elseif line =~ '[lvgsb]:\k*$'
+        result = 'var'
+        result_len = 2
+    elseif line !~ '^\s*$'
+        result = getcompletiontype(line) ?? 'cmdline'
+    endif
+    return [result, result_len]
+enddef
+
+export def Complete(findstart: number, base: string): any
+    if findstart > 0
+        prefix = ""
+        var line = getline('.')->strpart(0, col('.') - 1)
+        var keyword = line->matchstr('\k\+$')
+        var stx = synstack(line('.'), col('.') - 1)->map('synIDattr(v:val, "name")')->join()
+        if stx =~? 'Comment' || (stx =~ 'String' && stx !~ 'vimStringInterpolationExpr')
+            return -2
+        endif
+        var trigger_len: number = 0
+        [trigger, trigger_len] = GetTrigger(line)
+        if keyword->empty() && trigger->empty()
+            return -2
+        endif
+        prefix = line
+        return line->len() - keyword->len() - trigger_len
+    endif
+
+    var items = []
+    if trigger == 'function'
+        items = getcompletion(base, 'function')
+            ->mapnew((_, v) => ({word: v, kind: 'v', menu: 'Function', dup: 0}))
+    elseif trigger == 'option'
+        items = getcompletion(base, 'option')
+            ->mapnew((_, v) => ({word: v, kind: 'v', menu: 'Option', dup: 0}))
+    elseif trigger == 'nooption'
+        items = getcompletion(base[2 : ], 'option')
+            ->mapnew((_, v) => ({word: v, kind: 'v', menu: 'Option', dup: 0}))
+    elseif trigger == 'var'
+        items = getcompletion(base, 'var')
+            ->mapnew((_, v) => ({word: v, kind: 'v', menu: 'Variable', dup: 0}))
+    elseif trigger == 'expression'
+        items = getcompletion(base, 'expression')
+            ->mapnew((_, v) => ({word: v, kind: 'v', menu: 'Expression', dup: 0}))
+    elseif trigger == 'command'
+        var commands = getcompletion(base, 'command')
+            ->mapnew((_, v) => ({word: v, kind: 'v', menu: 'Command', dup: 0}))
+        var functions = getcompletion(base, 'function')
+            ->mapnew((_, v) => ({word: v, kind: 'v', menu: 'Function', dup: 0}))
+        items = commands + functions
+    else
+        try
+            # :! and :term completion is very slow on Windows and WSL, disable it there.
+            if !((has("win32") || has("win32unix") || exists("$WSLENV")) && getcompletiontype(prefix) == 'shellcmd')
+                items = getcompletion(prefix, 'cmdline')
+                    ->mapnew((_, v) => ({word: v->matchstr('\k\+'), kind: 'v', dup: 0}))
+            endif
+        catch /E220/
+        endtry
+
+        if empty(items) && !empty(base)
+            items = getcompletion(base, 'expression')
+                ->mapnew((_, v) => ({word: v, kind: 'v', menu: 'Expression', dup: 0}))
+        endif
+    endif
+
+    return items->empty() ? v:none : items
+enddef

runtime/autoload/vimgoto.vim

@@ -0,0 +1,236 @@
+vim9script
+
+# Language:     Vim9 script
+# Contributers: @lacygoill
+#               Shane-XB-Qian
+#               Andrew Radev
+# Last Change:  2025 Oct 17
+#
+# Vim script to handle jumping to the targets of several types of Vim commands
+# (:import, :packadd, :runtime, :colorscheme), and to autoloaded functions of
+# the style <path>#<function_name>.
+#
+# see runtime/ftplugin/vim.vim
+
+# Interface {{{1
+export def Find(editcmd: string) #{{{2
+    var curline: string = getline('.')
+
+    if curline =~ '^\s*\%(:\s*\)\=\%(sil\%[ent]!\=\s\+\)\=packadd!\=\s'
+        HandlePackaddLine(editcmd, curline)
+        return
+    endif
+
+    if curline =~ '^\s*\%(:\s*\)\=\%(sil\%[ent]!\=\s\+\)\=ru\%[ntime]!\='
+        HandleRuntimeLine(editcmd, curline, expand('<cfile>'))
+        return
+    endif
+
+    if curline =~ '^\s*\%(:\s*\)\=\%(sil\%[ent]!\=\s\+\)\=colo\%[rscheme]\s'
+        HandleColoLine(editcmd, curline)
+        return
+    endif
+
+    if curline =~ '^\s*\%(:\s*\)\=import\s'
+        HandleImportLine(editcmd, curline)
+        return
+    endif
+
+    var curfunc = FindCurfunc()
+
+    if stridx(curfunc, '#') >= 0
+        var parts = split(curfunc, '#')
+        var path = $"autoload/{join(parts[0 : -2], '/')}.vim"
+        var resolved_path = globpath(&runtimepath, path)
+
+        if resolved_path != ''
+            var function_pattern: string = $'^\s*\%(:\s*\)\=fun\%[ction]!\=\s\+\zs{curfunc}('
+            resolved_path->Open(editcmd, function_pattern)
+        endif
+        return
+    endif
+
+    try
+        execute 'normal! ' .. editcmd
+    catch
+        Error(v:exception)
+    endtry
+enddef
+#}}}1
+# Core {{{1
+def HandlePackaddLine(editcmd: string, curline: string) #{{{2
+    var pat: string = '\s*\%(:\s*\)\=packadd!\=\s\+\zs\S\+\>\ze'
+    var plugin: string = curline
+        ->matchstr(pat)
+        ->substitute('^vim-\|\.vim$', '', 'g')
+
+    if plugin == ''
+        Fallback(editcmd)
+    else
+        var files: list<string> = getcompletion($'plugin/{plugin}', 'runtime')
+            ->map((_, fname: string) => fname->findfile(&rtp)->fnamemodify(':p'))
+            ->filter((_, path: string): bool => filereadable(path))
+        if empty(files)
+            echo 'Could not find any plugin file for ' .. string(plugin)
+            return
+        endif
+        files->Open(editcmd)
+    endif
+enddef
+
+def HandleRuntimeLine(editcmd: string, curline: string, cfile: string) #{{{2
+    var fname: string
+    var where_pat: string = '\%(START\|OPT\|PACK\|ALL\)'
+
+    if cfile == 'runtime' || cfile =~# $'^{where_pat}$'
+        # then the cursor was not on one of the filenames, jump to the first file:
+        var fname_pat: string = $'\s*\%(:\s*\)\=ru\%[ntime]\%(!\s*\|\s\+\)\%({where_pat}\s\+\)\=\zs\S\+\>\ze'
+        fname = curline->matchstr(fname_pat)
+    else
+        fname = cfile
+    endif
+
+    if fname == ''
+        Fallback(editcmd)
+    else
+        var file: string = fname
+            ->findfile(&rtp)
+            ->fnamemodify(':p')
+        if file == '' || !filereadable(file)
+            echo 'Could not be found in the runtimepath: ' .. string(fname)
+            return
+        endif
+        file->Open(editcmd)
+    endif
+enddef
+
+def HandleColoLine(editcmd: string, curline: string) #{{{2
+    var pat: string = '\s*\%(:\s*\)\=colo\%[rscheme]\s\+\zs\S\+\>\ze'
+    var colo: string = curline->matchstr(pat)
+
+    if colo == ''
+        Fallback(editcmd)
+    else
+        var files: list<string> = getcompletion($'colors/{colo}', 'runtime')
+            ->map((_, fname: string) => fname->findfile(&rtp)->fnamemodify(':p'))
+            ->filter((_, path: string): bool => filereadable(path))
+        if empty(files)
+            echo 'Could not find any colorscheme file for ' .. string(colo)
+            return
+        endif
+        files->Open(editcmd)
+    endif
+enddef
+
+def HandleImportLine(editcmd: string, curline: string) #{{{2
+    var fname: string
+    var import_cmd: string = '^\s*\%(:\s*\)\=import\s\+\%(autoload\s\+\)\='
+    var import_alias: string = '\%(\s\+as\s\+\w\+\)\=$'
+    var import_string: string = import_cmd .. '\([''"]\)\zs.*\ze\1' .. import_alias
+    var import_expr: string = import_cmd .. '\zs.*\ze' .. import_alias
+    # the script is referred to by its name in a quoted string
+    if curline =~ import_string
+        fname = curline->matchstr(import_string)
+    # the script is referred to by an expression
+    elseif curline =~ import_expr
+        try
+            sandbox fname = curline
+                ->matchstr(import_expr)
+                ->eval()
+        catch
+            Error(v:exception)
+            return
+        endtry
+    endif
+
+    var filepath: string
+    if fname->isabsolutepath()
+        filepath = fname
+    elseif fname[0] == '.'
+        filepath = (expand('%:h') .. '/' .. fname)->simplify()
+    else
+        var subdir: string = curline =~ '^\s*import\s\+autoload\>' ? 'autoload' : 'import'
+        # Matching patterns in `'wildignore'` can be slow.
+        # Let's set `{nosuf}` to `true` to avoid `globpath()` to be slow.
+        filepath = globpath(&runtimepath, subdir .. '/' .. fname, true, true)
+            ->get(0, '')
+    endif
+
+    if !filepath->filereadable()
+        printf('E447: Can''t find file "%s" in path', fname)
+            ->Error()
+        return
+    endif
+
+    var how_to_split: string = {
+        gF: 'edit',
+        "\<C-W>F": 'split',
+        "\<C-W>gF": 'tab split',
+    }[editcmd]
+    execute how_to_split .. ' ' .. filepath
+enddef
+
+def Open(target: any, editcmd: string, search_pattern: string = '') #{{{2
+    var split: string = editcmd[0] == 'g' ? 'edit' : editcmd[1] == 'g' ? 'tabedit' : 'split'
+    var fname: string
+    var cmd: string
+
+    if target->typename() == 'list<string>'
+        if target->empty()
+            return
+        endif
+        fname = target[0]
+    else
+        if target->typename() != 'string'
+            return
+        endif
+        fname = target
+    endif
+
+    if search_pattern != ''
+        var escaped_pattern = escape(search_pattern, '\#'' ')
+        cmd = $'+silent\ call\ search(''{escaped_pattern}'')'
+    endif
+
+    execute $'{split} {cmd} {fname}'
+
+    # If there are several files to open, put them into an arglist.
+    if target->typename() == 'list<string>'
+            && target->len() > 1
+        var arglist: list<string> = target
+            ->copy()
+            ->map((_, f: string) => f->fnameescape())
+        execute $'arglocal {arglist->join()}'
+    endif
+enddef
+#}}}1
+# Util {{{1
+def Error(msg: string) #{{{2
+    echohl ErrorMsg
+    echomsg msg
+    echohl NONE
+enddef
+
+def Fallback(editcmd: string) #{{{2
+    try
+        execute 'normal! ' .. editcmd .. 'zv'
+    catch
+        Error(v:exception)
+    endtry
+enddef
+
+def FindCurfunc(): string #{{{2
+    var curfunc = ''
+    var saved_iskeyword = &iskeyword
+
+    try
+        set iskeyword+=#
+        curfunc = expand('<cword>')
+    finally
+        &iskeyword = saved_iskeyword
+    endtry
+
+    return curfunc
+enddef
+
+# vim: sw=4 et

runtime/autoload/xmlformat.vim

@@ -1,5 +1,5 @@
 " Vim plugin for formatting XML
-" Last Change: 2020 Jan 06
+" Last Change: 2023 March 15th
 "     Version: 0.3
 "      Author: Christian Brabandt <cb@256bit.org>
 "  Repository: https://github.com/chrisbra/vim-xml-ftplugin
@@ -37,13 +37,17 @@ func! xmlformat#Format() abort
     " Keep empty input lines?
     if empty(line)
       call add(result, '')
+      let current += 1
       continue
     elseif line !~# '<[/]\?[^>]*>'
-      let nextmatch = match(list, '<[/]\?[^>]*>', current)
-      if nextmatch > -1 
-        let line .= ' '. join(list[(current + 1):(nextmatch-1)], " ")
-        call remove(list, current+1, nextmatch-1)
+      let nextmatch = match(list, '^\s*$\|<[/]\?[^>]*>', current)
+      if nextmatch > -1
+        let lineEnd = nextmatch
+      else
+        let lineEnd = len(list)
       endif
+      let line .= ' '. join(list[(current + 1):(lineEnd-1)], " ")
+      call remove(list, current+1, lineEnd-1)
     endif
     " split on `>`, but don't split on very first opening <
     " this means, items can be like ['<tag>', 'tag content</tag>']
@@ -79,9 +83,13 @@ func! xmlformat#Format() abort
           if s:EndTag(t[1])
             call s:DecreaseIndent()
           endif
-          "for y in t[1:]
-            let result+=s:FormatContent(t[1:])
-          "endfor
+          let result+=s:FormatContent(t[1:])
+          if s:IsTag(t[1])
+            let lastitem = t[1]
+            continue
+          endif
+        elseif s:IsComment(item)
+          let result+=s:FormatContent([item])
         else
           call add(result, s:Indent(item))
         endif
@@ -94,7 +102,7 @@ func! xmlformat#Format() abort
   if !empty(result)
     let lastprevline = getline(v:lnum + count_orig)
     let delete_lastline = v:lnum + count_orig - 1 == line('$')
-    exe v:lnum. ",". (v:lnum + count_orig - 1). 'd'
+    exe 'silent ' .. v:lnum. ",". (v:lnum + count_orig - 1). 'd'
     call append(v:lnum - 1, result)
     " Might need to remove the last line, if it became empty because of the
     " append() call

runtime/autoload/zip.vim

@@ -1,4 +1,4 @@
-" zip.vim: Handles browsing zipfiles
+  " zip.vim: Handles browsing zipfiles
 " AUTOLOAD PORTION
 " Date:		2024 Aug 21
 " Version:	34
@@ -14,6 +14,10 @@
 " 2024 Aug 05 by Vim Project: clean-up and make it work with shellslash on Windows
 " 2024 Aug 18 by Vim Project: correctly handle special globbing chars
 " 2024 Aug 21 by Vim Project: simplify condition to detect MS-Windows
+" 2025 Mar 11 by Vim Project: handle filenames with leading '-' correctly
+" 2025 Jul 12 by Vim Project: drop ../ on write to prevent path traversal attacks
+" 2025 Sep 22 by Vim Project: support PowerShell Core
+" 2025 Dec 20 by Vim Project: use :lcd instead of :cd
 " License:	Vim License  (see vim's :help license)
 " Copyright:	Copyright (C) 2005-2019 Charles E. Campbell {{{1
 "		Permission is hereby granted to use and distribute this code,
@@ -76,15 +80,124 @@ if v:version < 901
  finish
 endif
 " sanity checks
-if !executable(g:zip_unzipcmd)
+if !executable(g:zip_unzipcmd) && &shell !~ 'pwsh'
  call s:Mess('Error', "***error*** (zip#Browse) unzip not available on your system")
  finish
 endif
-if !dist#vim#IsSafeExecutable('zip', g:zip_unzipcmd)
+if !dist#vim#IsSafeExecutable('zip', g:zip_unzipcmd) && &shell !~ 'pwsh'
  call s:Mess('Error', "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!")
  finish
 endif
 
+" ----------------
+"  PowerShell: {{{1
+" ----------------
+
+function! s:TryExecGnuFallBackToPs(executable, gnu_func_call, ...)
+  " Check that a gnu executable is available, run the gnu_func_call if so. If
+  " the gnu executable is not available or if gnu_func_call fails, try
+  " ps_func_call if &shell =~ 'pwsh'. If all attempts fail, print errors.
+  " a:executable - one of (g:zip_zipcmd, g:zip_unzipcmd, g:zip_extractcmd)
+  " a:gnu_func_call - (string) a gnu function call to execute
+  " a:1 - (optional string) a PowerShell function call to execute.
+  let failures = []
+  if executable(substitute(a:executable,'\s\+.*$','',''))
+    try
+      exe a:gnu_func_call
+      return
+    catch
+      call add(failures, 'Failed to execute '.a:gnu_func_call)
+    endtry
+  else
+    call add(failures, a:executable.' not available on your system')
+  endif
+  if &shell =~ 'pwsh' && a:0 == 1
+    try
+      exe a:1
+      return
+    catch
+      call add(failures, 'Fallback to PowerShell attempted but failed')
+    endtry
+  endif
+  for msg in failures
+    call s:Mess('Error', msg)
+  endfor
+endfunction
+
+
+function! s:ZipBrowsePS(zipfile)
+  " Browse the contents of a zip file using PowerShell's
+  " Equivalent `unzip -Z1 -- zipfile`
+  let cmds = [
+        \ '$zip = [System.IO.Compression.ZipFile]::OpenRead(' . s:Escape(a:zipfile, 1) . ');',
+        \ '$zip.Entries | ForEach-Object { $_.FullName };',
+        \ '$zip.Dispose()'
+        \ ]
+  return 'pwsh -NoProfile -Command ' . s:Escape(join(cmds, ' '), 1)
+endfunction
+
+function! s:ZipReadPS(zipfile, fname, tempfile)
+  " Read a filename within a zipped file to a temporary file.
+  " Equivalent to `unzip -p -- zipfile fname > tempfile`
+  if a:fname =~ '/'
+    call s:Mess('WarningMsg', "***warning*** PowerShell can display, but cannot update, files in archive subfolders")
+  endif
+  let cmds = [
+        \ '$zip = [System.IO.Compression.ZipFile]::OpenRead(' . s:Escape(a:zipfile, 1) . ');',
+        \ '$fileEntry = $zip.Entries | Where-Object { $_.FullName -eq ' . s:Escape(a:fname, 1) . ' };',
+        \ '$stream = $fileEntry.Open();',
+        \ '$fileStream = [System.IO.File]::Create(' . s:Escape(a:tempfile, 1) . ');',
+        \ '$stream.CopyTo($fileStream);',
+        \ '$fileStream.Close();',
+        \ '$stream.Close();',
+        \ '$zip.Dispose()'
+        \ ]
+  return 'pwsh -NoProfile -Command ' . s:Escape(join(cmds, ' '), 1)
+endfunction
+
+function! s:ZipUpdatePS(zipfile, fname)
+  " Update a filename within a zipped file
+  " Equivalent to `zip -u zipfile fname`
+  if a:fname =~ '/'
+    call s:Mess('Error', "***error*** PowerShell cannot update files in archive subfolders")
+    return ':'
+  endif
+  return 'Compress-Archive -Path ' . a:fname . ' -Update -DestinationPath ' . a:zipfile
+endfunction
+
+function! s:ZipExtractFilePS(zipfile, fname)
+  " Extract a single file from an archive
+  " Equivalent to `unzip -o zipfile fname`
+  if a:fname =~ '/'
+    call s:Mess('Error', "***error*** PowerShell cannot extract files in archive subfolders")
+    return ':'
+  endif
+  let cmds = [
+        \ '$zip = [System.IO.Compression.ZipFile]::OpenRead(' . s:Escape(a:zipfile, 1) . ');',
+        \ '$fileEntry = $zip.Entries | Where-Object { $_.FullName -eq ' . a:fname . ' };',
+        \ '$stream = $fileEntry.Open();',
+        \ '$fileStream = [System.IO.File]::Create(' . a:fname . ');',
+        \ '$stream.CopyTo($fileStream);',
+        \ '$fileStream.Close();',
+        \ '$stream.Close();',
+        \ '$zip.Dispose()'
+        \ ]
+  return 'pwsh -NoProfile -Command ' . s:Escape(join(cmds, ' '), 1)
+endfunction
+
+function! s:ZipDeleteFilePS(zipfile, fname)
+  " Delete a single file from an archive
+  " Equivalent to `zip -d zipfile fname`
+  let cmds = [
+        \ 'Add-Type -AssemblyName System.IO.Compression.FileSystem;',
+        \ '$zip = [System.IO.Compression.ZipFile]::Open(' . s:Escape(a:zipfile, 1) . ', ''Update'');',
+        \ '$entry = $zip.Entries | Where-Object { $_.Name -eq ' . s:Escape(a:fname, 1) . ' };',
+        \ 'if ($entry) { $entry.Delete(); $zip.Dispose() }',
+        \ 'else { $zip.Dispose() }'
+        \ ]
+  return 'pwsh -NoProfile -Command ' . s:Escape(join(cmds, ' '), 1)
+endfunction
+
 " ----------------
 "  Functions: {{{1
 " ----------------
@@ -103,7 +216,7 @@ fun! zip#Browse(zipfile)
   defer s:RestoreOpts(dict)
 
   " sanity checks
-  if !executable(g:zip_unzipcmd)
+  if !executable(g:zip_unzipcmd) && &shell !~ 'pwsh'
    call s:Mess('Error', "***error*** (zip#Browse) unzip not available on your system")
    return
   endif
@@ -138,7 +251,10 @@ fun! zip#Browse(zipfile)
  \                '" Select a file with cursor and press ENTER'])
   keepj $
 
-  exe $"keepj sil r! {g:zip_unzipcmd} -Z1 -- {s:Escape(a:zipfile, 1)}"
+  let gnu_cmd = "keepj sil r! " . g:zip_unzipcmd . " -Z1 -- " . s:Escape(a:zipfile, 1)
+  let ps_cmd = 'keepj sil r! ' . s:ZipBrowsePS(a:zipfile)
+  call s:TryExecGnuFallBackToPs(g:zip_unzipcmd, gnu_cmd, ps_cmd)
+
   if v:shell_error != 0
    call s:Mess('WarningMsg', "***warning*** (zip#Browse) ".fnameescape(a:zipfile)." is not a zip file")
    keepj sil! %d
@@ -208,7 +324,7 @@ fun! zip#Read(fname,mode)
   endif
   let fname    = fname->substitute('[', '[[]', 'g')->escape('?*\\')
   " sanity check
-  if !executable(substitute(g:zip_unzipcmd,'\s\+.*$','',''))
+  if !executable(substitute(g:zip_unzipcmd,'\s\+.*$','',''))  && &shell !~ 'pwsh'
    call s:Mess('Error', "***error*** (zip#Read) sorry, your system doesn't appear to have the ".g:zip_unzipcmd." program")
    return
   endif
@@ -218,7 +334,11 @@ fun! zip#Read(fname,mode)
   " but allows zipfile://... entries in quickfix lists
   let temp = tempname()
   let fn   = expand('%:p')
-  exe "sil !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1).' > '.temp
+
+  let gnu_cmd = 'sil !' . g:zip_unzipcmd . ' -p -- ' . s:Escape(zipfile, 1) . ' ' . s:Escape(fname, 1) . ' > ' . s:Escape(temp, 1)
+  let ps_cmd = 'sil !' . s:ZipReadPS(zipfile, fname, temp)
+  call s:TryExecGnuFallBackToPs(g:zip_unzipcmd, gnu_cmd, ps_cmd)
+
   sil exe 'keepalt file '.temp
   sil keepj e!
   sil exe 'keepalt file '.fnameescape(fn)
@@ -235,91 +355,112 @@ endfun
 " zip#Write: {{{2
 fun! zip#Write(fname)
   let dict = s:SetSaneOpts()
+  let need_rename = 0
   defer s:RestoreOpts(dict)
 
   " sanity checks
-  if !executable(substitute(g:zip_zipcmd,'\s\+.*$','',''))
-   call s:Mess('Error', "***error*** (zip#Write) sorry, your system doesn't appear to have the ".g:zip_zipcmd." program")
-   return
-  endif
-  if !exists("*mkdir")
-   call s:Mess('Error', "***error*** (zip#Write) sorry, mkdir() doesn't work on your system")
-   return
+  if !executable(substitute(g:zip_zipcmd,'\s\+.*$','','')) && &shell !~ 'pwsh'
+    call s:Mess('Error', "***error*** (zip#Write) sorry, your system doesn't appear to have the ".g:zip_zipcmd." program")
+    return
   endif
 
   let curdir= getcwd()
   let tmpdir= tempname()
   if tmpdir =~ '\.'
-   let tmpdir= substitute(tmpdir,'\.[^.]*$','','e')
+    let tmpdir= substitute(tmpdir,'\.[^.]*$','','e')
   endif
   call mkdir(tmpdir,"p")
 
   " attempt to change to the indicated directory
-  if s:ChgDir(tmpdir,s:ERROR,"(zip#Write) cannot cd to temporary directory")
-   return
+  if s:ChgDir(tmpdir,s:ERROR,"(zip#Write) cannot lcd to temporary directory")
+    return
   endif
 
   " place temporary files under .../_ZIPVIM_/
   if isdirectory("_ZIPVIM_")
-   call delete("_ZIPVIM_", "rf")
+    call delete("_ZIPVIM_", "rf")
   endif
   call mkdir("_ZIPVIM_")
-  cd _ZIPVIM_
+  lcd _ZIPVIM_
 
   if has("unix")
-   let zipfile = substitute(a:fname,'zipfile://\(.\{-}\)::[^\\].*$','\1','')
-   let fname   = substitute(a:fname,'zipfile://.\{-}::\([^\\].*\)$','\1','')
+    let zipfile = substitute(a:fname,'zipfile://\(.\{-}\)::[^\\].*$','\1','')
+    let fname   = substitute(a:fname,'zipfile://.\{-}::\([^\\].*\)$','\1','')
   else
-   let zipfile = substitute(a:fname,'^.\{-}zipfile://\(.\{-}\)::[^\\].*$','\1','')
-   let fname   = substitute(a:fname,'^.\{-}zipfile://.\{-}::\([^\\].*\)$','\1','')
+    let zipfile = substitute(a:fname,'^.\{-}zipfile://\(.\{-}\)::[^\\].*$','\1','')
+    let fname   = substitute(a:fname,'^.\{-}zipfile://.\{-}::\([^\\].*\)$','\1','')
+  endif
+  if fname =~ '^[.]\{1,2}/'
+    let gnu_cmd = g:zip_zipcmd . ' -d ' . s:Escape(fnamemodify(zipfile,":p"),0) . ' ' . s:Escape(fname,0) 
+    let gnu_cmd = 'call system(''' . substitute(gnu_cmd, "'", "''", 'g') . ''')'
+    let ps_cmd = $"call system({s:Escape(s:ZipDeleteFilePS(zipfile, fname), 1)})"
+    call s:TryExecGnuFallBackToPs(g:zip_zipcmd, gnu_cmd, ps_cmd)
+    let fname = fname->substitute('^\([.]\{1,2}/\)\+', '', 'g')
+    let need_rename = 1
   endif
 
   if fname =~ '/'
-   let dirpath = substitute(fname,'/[^/]\+$','','e')
-   if has("win32unix") && executable("cygpath")
+    let dirpath = substitute(fname,'/[^/]\+$','','e')
+    if has("win32unix") && executable("cygpath")
     let dirpath = substitute(system("cygpath ".s:Escape(dirpath,0)),'\n','','e')
-   endif
-   call mkdir(dirpath,"p")
+    endif
+    call mkdir(dirpath,"p")
   endif
   if zipfile !~ '/'
-   let zipfile= curdir.'/'.zipfile
+    let zipfile= curdir.'/'.zipfile
   endif
 
-  exe "w! ".fnameescape(fname)
+  " don't overwrite files forcefully
+  exe "w ".fnameescape(fname)
   if has("win32unix") && executable("cygpath")
-   let zipfile = substitute(system("cygpath ".s:Escape(zipfile,0)),'\n','','e')
+    let zipfile = substitute(system("cygpath ".s:Escape(zipfile,0)),'\n','','e')
   endif
 
   if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$'
     let fname = substitute(fname, '[', '[[]', 'g')
   endif
 
-  call system(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0))
+  let gnu_cmd = g:zip_zipcmd . ' -u '. s:Escape(fnamemodify(zipfile,":p"),0) . ' ' . s:Escape(fname,0) 
+  let gnu_cmd = 'call system(''' . substitute(gnu_cmd, "'", "''", 'g') . ''')'
+  let ps_cmd = s:ZipUpdatePS(s:Escape(fnamemodify(zipfile, ':p'), 0), s:Escape(fname, 0))
+  let ps_cmd = 'call system(''' . substitute(ps_cmd, "'", "''", 'g') . ''')'
+  call s:TryExecGnuFallBackToPs(g:zip_zipcmd, gnu_cmd, ps_cmd)
+  if &shell =~ 'pwsh'
+    " Vim flashes 'creation in progress ...' from what I believe is the
+    " ProgressAction stream of PowerShell. Unfortunately, this cannot be
+    " suppressed (as of 250824) due to an open PowerShell issue.
+    " https://github.com/PowerShell/PowerShell/issues/21074
+    " This necessitates a redraw of the buffer.
+    redraw!
+  endif
+
   if v:shell_error != 0
-   call s:Mess('Error', "***error*** (zip#Write) sorry, unable to update ".zipfile." with ".fname)
+    call s:Mess('Error', "***error*** (zip#Write) sorry, unable to update ".zipfile." with ".fname)
 
   elseif s:zipfile_{winnr()} =~ '^\a\+://'
-   " support writing zipfiles across a network
-   let netzipfile= s:zipfile_{winnr()}
-   1split|enew
-   let binkeep= &binary
-   let eikeep = &ei
-   set binary ei=all
-   exe "noswapfile e! ".fnameescape(zipfile)
-   call netrw#NetWrite(netzipfile)
-   let &ei     = eikeep
-   let &binary = binkeep
-   q!
-   unlet s:zipfile_{winnr()}
+    " support writing zipfiles across a network
+    let netzipfile= s:zipfile_{winnr()}
+    1split|enew
+    let binkeep= &binary
+    let eikeep = &ei
+    set binary ei=all
+    exe "noswapfile e! ".fnameescape(zipfile)
+    call netrw#NetWrite(netzipfile)
+    let &ei     = eikeep
+    let &binary = binkeep
+    q!
+    unlet s:zipfile_{winnr()}
+  elseif need_rename
+    exe $"sil keepalt file {fnameescape($"zipfile://{zipfile}::{fname}")}"
+    call s:Mess('Warning', "***error*** (zip#Browse) Path Traversal Attack detected, dropping relative path")
   endif
 
   " cleanup and restore current directory
-  cd ..
+  lcd ..
   call delete("_ZIPVIM_", "rf")
   call s:ChgDir(curdir,s:WARNING,"(zip#Write) unable to return to ".curdir."!")
   call delete(tmpdir, "rf")
   setlocal nomod
-
 endfun
 
 " ---------------------------------------------------------------------
@@ -332,17 +473,25 @@ fun! zip#Extract()
 
   " sanity check
   if fname =~ '^"'
-   return
+    return
   endif
   if fname =~ '/$'
-   call s:Mess('Error', "***error*** (zip#Extract) Please specify a file, not a directory")
-   return
+    call s:Mess('Error', "***error*** (zip#Extract) Please specify a file, not a directory")
+    return
+  elseif fname =~ '^[.]\?[.]/'
+    call s:Mess('Error', "***error*** (zip#Browse) Path Traversal Attack detected, not extracting!")
+    return
   endif
   if filereadable(fname)
-   call s:Mess('Error', "***error*** (zip#Extract) <" .. fname .."> already exists in directory, not overwriting!")
-   return
+    call s:Mess('Error', "***error*** (zip#Extract) <" .. fname .."> already exists in directory, not overwriting!")
+    return
   endif
   let target = fname->substitute('\[', '[[]', 'g')
+  " unzip 6.0 does not support -- to denote end-of-arguments
+  " unzip 6.1 (2010) apparently supports, it, but hasn't been released
+  " so the workaround is to use glob '[-]' so that it won't be considered an argument
+  " else, it would be possible to use 'unzip -o <file.zip> '-d/tmp' to extract the whole archive
+  let target = target->substitute('^-', '[&]', '')
   if &shell =~ 'cmd' && has("win32")
     let target = target
 		\ ->substitute('[?*]', '[&]', 'g')
@@ -355,15 +504,18 @@ fun! zip#Extract()
   endif
 
   " extract the file mentioned under the cursor
-  call system($"{g:zip_extractcmd} -o {shellescape(b:zipfile)} {target}")
-  if v:shell_error != 0
-   call s:Mess('Error', "***error*** ".g:zip_extractcmd." ".b:zipfile." ".fname.": failed!")
-  elseif !filereadable(fname)
-   call s:Mess('Error', "***error*** attempted to extract ".fname." but it doesn't appear to be present!")
-  else
-   echomsg "***note*** successfully extracted ".fname
-  endif
+  let gnu_cmd = g:zip_extractcmd . ' -o '. shellescape(b:zipfile) . ' ' . target
+  let gnu_cmd = 'call system(''' . substitute(gnu_cmd, "'", "''", 'g') . ''')'
+  let ps_cmd = $"call system({s:Escape(s:ZipExtractFilePS(b:zipfile, target), 1)})"
+  call s:TryExecGnuFallBackToPs(g:zip_extractcmd, gnu_cmd, ps_cmd)
 
+  if v:shell_error != 0
+    call s:Mess('Error', "***error*** ".g:zip_extractcmd." ".b:zipfile." ".fname.": failed!")
+  elseif !filereadable(fname) && &shell !~ 'pwsh'
+    call s:Mess('Error', "***error*** attempted to extract ".fname." but it doesn't appear to be present!")
+  else
+    echomsg "***note*** successfully extracted ".fname
+  endif
 endfun
 
 " ---------------------------------------------------------------------
@@ -385,7 +537,7 @@ endfun
 " s:ChgDir: {{{2
 fun! s:ChgDir(newdir,errlvl,errmsg)
   try
-   exe "cd ".fnameescape(a:newdir)
+   exe "lcd ".fnameescape(a:newdir)
   catch /^Vim\%((\a\+)\)\=:E344/
    redraw!
    if a:errlvl == s:NOTE

runtime/colors/blue.vim

@@ -2,106 +2,30 @@
 " Description:  Colorscheme with a blue background
 " Author:       Original author Steven Vertigan <steven@vertigan.wattle.id.au>
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2024 Aug 15
+" Last Change:  2025 Oct 14
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta10
 
 set background=dark
 
 hi clear
 let g:colors_name = 'blue'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi Normal guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#005faf gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
-hi PmenuSel guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ffd700 guibg=#008787 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff7f50 guibg=#ffffff gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#d787d7 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#870087 gui=NONE cterm=NONE
-hi Conceal guifg=#008787 guibg=NONE gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#005faf gui=NONE cterm=NONE
-hi CursorIM guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffd700 guibg=#005faf gui=bold cterm=NONE
-hi EndOfBuffer guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE
-hi Error guifg=#ff7f50 guibg=#000087 gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
-hi FoldColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#000087 guibg=#878700 gui=NONE cterm=NONE
-hi IncSearch guifg=#d787d7 guibg=#000000 gui=standout cterm=reverse
-hi LineNr guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi ModeMsg guifg=#000087 guibg=#00ff00 gui=NONE cterm=NONE
-hi MoreMsg guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi Question guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Search guifg=#ffd700 guibg=#000000 gui=reverse cterm=reverse
-hi SignColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi SpellBad guifg=#d70000 guibg=NONE guisp=#d70000 gui=undercurl cterm=underline
-hi SpellCap guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl cterm=underline
-hi SpellLocal guifg=#ffffff guibg=NONE guisp=#ffffff gui=undercurl cterm=underline
-hi SpellRare guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline
-hi StatusLine guifg=#000087 guibg=#5fffff gui=NONE cterm=NONE
-hi StatusLineNC guifg=#000087 guibg=#008787 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#005faf gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi VertSplit guifg=#008787 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
-hi VisualNOS guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE
-hi WarningMsg guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000087 guibg=#ffd700 gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#00ff00 guibg=#000087 gui=reverse cterm=reverse
-hi debugPC guifg=#5fffff guibg=#000087 gui=reverse cterm=reverse
-hi Directory guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
-hi Comment guifg=#878787 guibg=NONE gui=bold cterm=NONE
-hi Constant guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#878787 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi Type guifg=#ffa500 guibg=NONE gui=bold cterm=NONE
-hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi Label guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE
-hi! link Terminal Normal
-hi! link Debug Special
 hi! link Added String
-hi! link Removed WarningMsg
-hi! link diffOnly WarningMsg
-hi! link diffNoEOL WarningMsg
-hi! link diffIsA WarningMsg
-hi! link diffIdentical WarningMsg
-hi! link diffDiffer WarningMsg
-hi! link diffCommon WarningMsg
-hi! link diffBDiffer WarningMsg
-hi! link lCursor Cursor
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link CurSearch Search
-hi! link CursorLineNr CursorLine
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
-hi! link TabLine StatusLineNC
-hi! link TabLineFill StatusLineNC
-hi! link TabLineSel StatusLine
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
+hi! link Debug Special
 hi! link Define PreProc
 hi! link Delimiter Special
 hi! link Exception Statement
@@ -109,180 +33,170 @@ hi! link Float Constant
 hi! link Function Identifier
 hi! link Include PreProc
 hi! link Keyword Statement
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
 hi! link Operator Type
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
+hi! link Removed WarningMsg
 hi! link Repeat Statement
 hi! link SpecialChar Special
 hi! link SpecialComment Special
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link String Constant
 hi! link Structure Type
+hi! link TabLine StatusLineNC
+hi! link TabLineFill StatusLineNC
+hi! link TabLineSel StatusLine
 hi! link Tag Special
-hi! link Typedef Type
 hi! link Terminal Normal
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link Typedef Type
+hi! link diffBDiffer WarningMsg
+hi! link diffCommon WarningMsg
+hi! link diffDiffer WarningMsg
+hi! link diffIdentical WarningMsg
+hi! link diffIsA WarningMsg
+hi! link diffNoEOL WarningMsg
+hi! link diffOnly WarningMsg
+hi! link lCursor Cursor
 
-if s:t_Co >= 256
-  hi Normal ctermfg=220 ctermbg=18 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=25 cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=30 cterm=NONE
-  hi PmenuSel ctermfg=30 ctermbg=231 cterm=NONE
-  hi PmenuMatch ctermfg=220 ctermbg=30 cterm=NONE
-  hi PmenuMatchSel ctermfg=209 ctermbg=231 cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=176 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=90 cterm=NONE
-  hi Conceal ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=25 cterm=NONE
-  hi CursorIM ctermfg=16 ctermbg=220 cterm=NONE
-  hi CursorLineNr ctermfg=220 ctermbg=25 cterm=NONE
-  hi EndOfBuffer ctermfg=220 ctermbg=18 cterm=NONE
-  hi Error ctermfg=209 ctermbg=18 cterm=reverse
-  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-  hi FoldColumn ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=18 ctermbg=100 cterm=NONE
-  hi IncSearch ctermfg=176 ctermbg=16 cterm=reverse
-  hi LineNr ctermfg=87 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ModeMsg ctermfg=18 ctermbg=46 cterm=NONE
-  hi MoreMsg ctermfg=87 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=176 ctermbg=NONE cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi Question ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Search ctermfg=220 ctermbg=16 cterm=reverse
-  hi SignColumn ctermfg=30 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=87 ctermbg=NONE cterm=NONE
-  hi SpellBad ctermfg=160 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=46 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=231 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=176 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=18 ctermbg=87 cterm=NONE
-  hi StatusLineNC ctermfg=18 ctermbg=30 cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=25 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=231 ctermbg=30 cterm=NONE
-  hi VisualNOS ctermfg=30 ctermbg=231 cterm=NONE
-  hi WarningMsg ctermfg=176 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=18 ctermbg=220 cterm=NONE
-  hi debugBreakpoint ctermfg=46 ctermbg=18 cterm=reverse
-  hi debugPC ctermfg=87 ctermbg=18 cterm=reverse
-  hi Directory ctermfg=87 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=176 ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=102 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=87 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=250 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=102 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=176 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=231 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Label ctermfg=220 ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
+hi Normal guifg=#ffd700 guibg=#000087 guisp=NONE gui=NONE ctermfg=220 ctermbg=18 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#870087 guisp=NONE gui=NONE ctermfg=NONE ctermbg=90 cterm=NONE term=reverse
+hi Comment guifg=#878787 guibg=NONE guisp=NONE gui=bold ctermfg=102 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#008787 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#5fffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#00ff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=46 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#005faf guisp=NONE gui=NONE ctermfg=NONE ctermbg=25 cterm=NONE term=NONE
+hi CursorIM guifg=#000000 guibg=#ffd700 guisp=NONE gui=NONE ctermfg=16 ctermbg=220 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#005faf guisp=NONE gui=NONE ctermfg=NONE ctermbg=25 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffd700 guibg=#005faf guisp=NONE gui=bold ctermfg=220 ctermbg=25 cterm=NONE term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#5fffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#ffd700 guibg=#000087 guisp=NONE gui=NONE ctermfg=220 ctermbg=18 cterm=NONE term=NONE
+hi Error guifg=#ff7f50 guibg=#000087 guisp=NONE gui=reverse ctermfg=209 ctermbg=18 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#d70000 guisp=NONE gui=NONE ctermfg=231 ctermbg=160 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#008787 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#000087 guibg=#878700 guisp=NONE gui=NONE ctermfg=18 ctermbg=100 cterm=NONE term=NONE
+hi Identifier guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#878787 guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#d787d7 guibg=#000000 guisp=NONE gui=standout ctermfg=176 ctermbg=16 cterm=reverse term=bold,reverse,underline
+hi Label guifg=#ffd700 guibg=NONE guisp=NONE gui=NONE ctermfg=220 ctermbg=NONE cterm=NONE term=NONE
+hi LineNr guifg=#5fffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=bold,underline
+hi ModeMsg guifg=#000087 guibg=#00ff00 guisp=NONE gui=NONE ctermfg=18 ctermbg=46 cterm=NONE term=bold
+hi MoreMsg guifg=#5fffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#d787d7 guibg=NONE guisp=NONE gui=NONE ctermfg=176 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#008787 guisp=NONE gui=NONE ctermfg=231 ctermbg=30 cterm=NONE term=reverse
+hi PmenuBorder guifg=#ffffff guibg=#008787 guisp=NONE gui=NONE ctermfg=231 ctermbg=30 cterm=NONE term=NONE
+hi PmenuMatch guifg=#ffd700 guibg=#008787 guisp=NONE gui=NONE ctermfg=220 ctermbg=30 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff7f50 guibg=#ffffff guisp=NONE gui=NONE ctermfg=209 ctermbg=231 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=#008787 guibg=#ffffff guisp=NONE gui=NONE ctermfg=30 ctermbg=231 cterm=NONE term=bold
+hi PmenuShadow guifg=#008787 guibg=#121212 guisp=NONE gui=NONE ctermfg=30 ctermbg=233 cterm=NONE term=NONE
+hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
+hi PreProc guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#000000 guibg=#d787d7 guisp=NONE gui=NONE ctermfg=16 ctermbg=176 cterm=NONE term=NONE
+hi Search guifg=#ffd700 guibg=#000000 guisp=NONE gui=reverse ctermfg=220 ctermbg=16 cterm=reverse term=reverse
+hi SignColumn guifg=#008787 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#d787d7 guibg=NONE guisp=NONE gui=NONE ctermfg=176 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#5fffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#d70000 guibg=NONE guisp=#d70000 gui=undercurl ctermfg=160 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl ctermfg=46 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ffffff guibg=NONE guisp=#ffffff gui=undercurl ctermfg=231 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl ctermfg=176 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffffff guibg=NONE guisp=NONE gui=NONE ctermfg=231 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#000087 guibg=#5fffff guisp=NONE gui=NONE ctermfg=18 ctermbg=87 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#000087 guibg=#008787 guisp=NONE gui=NONE ctermfg=18 ctermbg=30 cterm=NONE term=bold,underline
+hi Title guifg=#d787d7 guibg=NONE guisp=NONE gui=NONE ctermfg=176 ctermbg=NONE cterm=NONE term=NONE
+hi TitleBar guifg=#ffd700 guibg=#1f4f87 guisp=NONE gui=NONE ctermfg=220 ctermbg=237 cterm=NONE term=NONE
+hi TitleBarNC guifg=#878787 guibg=#0f3f77 guisp=NONE gui=NONE ctermfg=102 ctermbg=236 cterm=NONE term=NONE
+hi Todo guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=bold,reverse
+hi ToolbarButton guifg=#ffffff guibg=#005faf guisp=NONE gui=NONE ctermfg=231 ctermbg=25 cterm=NONE term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#ffa500 guibg=NONE guisp=NONE gui=bold ctermfg=214 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#008787 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Visual guifg=#ffffff guibg=#008787 guisp=NONE gui=NONE ctermfg=231 ctermbg=30 cterm=NONE term=reverse
+hi VisualNOS guifg=#008787 guibg=#ffffff guisp=NONE gui=NONE ctermfg=30 ctermbg=231 cterm=NONE term=NONE
+hi WarningMsg guifg=#d787d7 guibg=NONE guisp=NONE gui=NONE ctermfg=176 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#000087 guibg=#ffd700 guisp=NONE gui=NONE ctermfg=18 ctermbg=220 cterm=NONE term=bold
+hi debugBreakpoint guifg=#00ff00 guibg=#000087 guisp=NONE gui=reverse ctermfg=46 ctermbg=18 cterm=reverse term=reverse
+hi debugPC guifg=#5fffff guibg=#000087 guisp=NONE gui=reverse ctermfg=87 ctermbg=18 cterm=reverse term=reverse
+
+if s:tgc || s:t_Co >= 256
   hi! link CursorLineNr CursorLine
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Type
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 16
+  hi! link CursorLineNr CursorLine
   hi Normal ctermfg=yellow ctermbg=darkblue cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=white cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=white cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
   hi ColorColumn ctermfg=NONE ctermbg=darkmagenta cterm=NONE
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
   hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
-  hi CursorLineNr ctermfg=yellow ctermbg=blue cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=yellow ctermbg=darkblue cterm=NONE
   hi Error ctermfg=red ctermbg=darkblue cterm=reverse
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
   hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=magenta ctermbg=black cterm=reverse
+  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
   hi LineNr ctermfg=cyan ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ModeMsg ctermfg=darkblue ctermbg=green cterm=NONE
   hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
   hi NonText ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuBorder ctermfg=NONE ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=white cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=white cterm=NONE
+  hi PmenuShadow ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
   hi Search ctermfg=yellow ctermbg=black cterm=reverse
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=white ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=darkblue ctermbg=cyan cterm=NONE
   hi StatusLineNC ctermfg=darkblue ctermbg=darkcyan cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi TitleBar ctermfg=yellow ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=darkgray ctermbg=black cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ToolbarButton ctermfg=white ctermbg=blue cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Visual ctermfg=white ctermbg=darkcyan cterm=NONE
   hi VisualNOS ctermfg=darkcyan ctermbg=white cterm=NONE
@@ -290,113 +204,69 @@ if s:t_Co >= 16
   hi WildMenu ctermfg=darkblue ctermbg=yellow cterm=NONE
   hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
   hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
-  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=white ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineNr CursorLine
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Type
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
+  hi! link CursorLineNr CursorLine
   hi Normal ctermfg=darkyellow ctermbg=blue cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Pmenu ctermfg=black ctermbg=cyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=cyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
   hi ColorColumn ctermfg=NONE ctermbg=magenta cterm=NONE
+  hi Comment ctermfg=black ctermbg=NONE cterm=bold
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorColumn ctermfg=blue ctermbg=yellow cterm=bold,reverse
   hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=yellow ctermbg=blue cterm=NONE
   hi Error ctermfg=red ctermbg=blue cterm=reverse
   hi ErrorMsg ctermfg=gray ctermbg=red cterm=NONE
   hi FoldColumn ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Folded ctermfg=blue ctermbg=yellow cterm=NONE
+  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=magenta ctermbg=black cterm=reverse
+  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
   hi LineNr ctermfg=cyan ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ModeMsg ctermfg=blue ctermbg=green cterm=NONE
   hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
   hi NonText ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=cyan cterm=NONE
+  hi PmenuBorder ctermfg=white ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=cyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuShadow ctermfg=darkcyan ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
   hi Search ctermfg=yellow ctermbg=black cterm=reverse
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=yellow cterm=reverse
   hi SpellCap ctermfg=green ctermbg=NONE cterm=reverse
   hi SpellLocal ctermfg=gray ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=magenta ctermbg=yellow cterm=reverse
+  hi Statement ctermfg=gray ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=cyan ctermbg=blue cterm=bold,reverse
   hi StatusLineNC ctermfg=blue ctermbg=cyan cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi TitleBar ctermfg=yellow ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=darkgray ctermbg=black cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ToolbarButton ctermfg=blue ctermbg=gray cterm=bold,reverse
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=red ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Visual ctermfg=black ctermbg=cyan cterm=NONE
   hi VisualNOS ctermfg=cyan ctermbg=gray cterm=NONE
@@ -404,191 +274,23 @@ if s:t_Co >= 8
   hi WildMenu ctermfg=blue ctermbg=yellow cterm=NONE
   hi debugBreakpoint ctermfg=green ctermbg=blue cterm=reverse
   hi debugPC ctermfg=cyan ctermbg=blue cterm=reverse
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=black ctermbg=NONE cterm=bold
-  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
-  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=gray ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=red ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineNr CursorLine
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Type
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: x_black       #000000           16                black
-" Color: x_darkred     #cd0000           160               darkred
-" Color: x_darkgreen   #00cd00           40                darkgreen
-" Color: x_darkyellow  #cdcd00           184               darkyellow
-" Color: x_darkblue    #0000ee           21                darkblue
-" Color: x_darkmagenta #cd00cd           164               darkmagenta
-" Color: x_darkcyan    #00cdcd           44                darkcyan
-" Color: x_gray        #e5e5e5           254               gray
-" Color: x_darkgray    #7f7f7f           244               darkgray
-" Color: x_red         #ff0000           196               red
-" Color: x_green       #00ff00           46                green
-" Color: x_yellow      #ffff00           226               yellow
-" Color: x_blue        #5c5cff           63                blue
-" Color: x_magenta     #ff00ff           201               magenta
-" Color: x_cyan        #00ffff           51                cyan
-" Color: x_white       #ffffff           231               white
-" Color: black         #000000           16                black
-" Color: darkred       #870000           88                darkred
-" Color: darkyellow    #878700           100               darkyellow
-" Color: darkblue      #000087           18                darkblue
-" Color: darkmagenta   #870087           90                darkmagenta
-" Color: darkcyan      #008787           30                darkcyan
-" Color: gray          #bcbcbc           250               gray
-" Color: comment       #878787           102               darkgray
-" Color: darkgray      #878787           102               darkgray
-" Color: red           #d70000           160               red
-" Color: green         #00ff00           46                green
-" Color: yellow        #ffd700           220               yellow
-" Color: blue          #005faf           25                blue
-" Color: magenta       #d787d7           176               magenta
-" Color: cyan          #5fffff           87                cyan
-" Color: white         #ffffff           231               white
-" Color: xtermblue     #5fafff           75                blue
-" Color: xtermdarkblue #0087af           31                darkblue
-" Color: orange        #ffa500           214               darkyellow
-" Color: darkgreen     #006400           22                darkgreen
-" Color: coral         #ff7f50           209               red
-" Color: olivedrab     #6b8e23           64                green
-" Color: slateblue     #6a5acd           62                darkmagenta
-" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray
-" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/darkblue.vim

@@ -1,254 +1,163 @@
 " Name:         darkblue
 " Description:  For those who prefer dark background
 " Author:       Original author Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-" Maintainer:   Original author Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2024 Aug 15
+" Last Change:  2025 Oct 14
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta10
 
 set background=dark
 
 hi clear
 let g:colors_name = 'darkblue'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#8b0000', '#90f020', '#ffa500', '#00008b', '#8b008b', '#008b8b', '#c0c0c0', '#808080', '#ffa0a0', '#90f020', '#ffff60', '#0030ff', '#ff00ff', '#90fff0', '#ffffff']
-endif
-hi! link Terminal Normal
-hi! link CursorColumn CursorLine
-hi! link CursorIM Cursor
-hi! link EndOfBuffer NonText
-hi! link ErrorMsg Error
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
-hi! link TabLineFill TabLine
+let g:terminal_ansi_colors = ['#000000', '#8b0000', '#90f020', '#ffa500', '#00008b', '#8b008b', '#008b8b', '#c0c0c0', '#808080', '#ffa0a0', '#90f020', '#ffff60', '#0030ff', '#ff00ff', '#90fff0', '#ffffff']
+
+hi! link Added String
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
+hi! link CurSearch Search
+hi! link CursorIM Cursor
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
+hi! link Debug Special
 hi! link Define PreProc
 hi! link Delimiter Special
+hi! link EndOfBuffer NonText
+hi! link ErrorMsg Error
 hi! link Exception Statement
 hi! link Float Constant
 hi! link Function Identifier
 hi! link Include PreProc
 hi! link Keyword Statement
 hi! link Label Statement
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
 hi! link Operator Statement
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
+hi! link PreInsert NonText
+hi! link Removed WarningMsg
 hi! link Repeat Statement
 hi! link SpecialChar Special
 hi! link SpecialComment Special
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link String Constant
 hi! link Structure Type
+hi! link TabLineFill TabLine
+hi! link TabPanel Normal
+hi! link TabPanelFill Normal
 hi! link Tag Special
+hi! link Terminal Normal
 hi! link Typedef Type
-hi! link Debug Special
-hi! link Added String
-hi! link Removed WarningMsg
-hi! link diffOnly WarningMsg
-hi! link diffNoEOL WarningMsg
-hi! link diffIsA WarningMsg
-hi! link diffIdentical WarningMsg
-hi! link diffDiffer WarningMsg
-hi! link diffCommon WarningMsg
 hi! link diffBDiffer WarningMsg
+hi! link diffCommon WarningMsg
+hi! link diffDiffer WarningMsg
+hi! link diffIdentical WarningMsg
+hi! link diffIsA WarningMsg
+hi! link diffNoEOL WarningMsg
+hi! link diffOnly WarningMsg
 hi! link lCursor Cursor
-hi! link CurSearch Search
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi Normal guifg=#c0c0c0 guibg=#000040 gui=NONE cterm=NONE
-hi Conceal guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi ColorColumn guifg=#c0c0c0 guibg=#8b0000 gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#ffff60 gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#ff80ff gui=NONE cterm=NONE
-hi Error guifg=#ffa0a0 guibg=NONE gui=reverse cterm=reverse
-hi FoldColumn guifg=#808080 guibg=NONE gui=bold cterm=NONE
-hi Folded guifg=#808080 guibg=NONE gui=bold cterm=NONE
-hi IncSearch guifg=#ffffff guibg=#0030ff gui=reverse cterm=reverse
-hi LineNr guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi ModeMsg guifg=#90fff0 guibg=NONE gui=NONE cterm=NONE
-hi MoreMsg guifg=#006400 guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#0030ff guibg=NONE gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#0030ff gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=#0030ff guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff80ff guibg=#0030ff gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff00ff guibg=#ffffff gui=NONE cterm=NONE
-hi Question guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
-hi SignColumn guifg=#808080 guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#90f020 guibg=NONE guisp=#90f020 gui=undercurl cterm=underline
-hi SpellLocal guifg=#90fff0 guibg=NONE guisp=#90fff0 gui=undercurl cterm=underline
-hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi StatusLine guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
-hi StatusLineNC guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
-hi TabLine guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#0030ff gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi VertSplit guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
-hi Visual guifg=#8080ff guibg=#ffffff gui=reverse cterm=reverse
-hi VisualNOS guifg=#8080ff guibg=#c0c0c0 gui=reverse,underline cterm=reverse,underline
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#ffff60 guibg=#000000 gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#90f020 guibg=#00008b gui=reverse cterm=reverse
-hi debugPC guifg=#90fff0 guibg=#00008b gui=reverse cterm=reverse
-hi Directory guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
-hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#90fff0 guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
-hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffff60 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi Type guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
-hi TabLineSel guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff60 guibg=#666666 gui=NONE cterm=NONE
-hi Search guifg=#90fff0 guibg=#0030ff gui=NONE cterm=NONE
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link CursorColumn CursorLine
-  hi! link CursorIM Cursor
-  hi! link EndOfBuffer NonText
-  hi! link ErrorMsg Error
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link TabLineFill TabLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Label Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Statement
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link CurSearch Search
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi Normal ctermfg=252 ctermbg=17 cterm=NONE
-  hi Conceal ctermfg=30 ctermbg=NONE cterm=NONE
-  hi ColorColumn ctermfg=252 ctermbg=88 cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=227 cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=213 cterm=NONE
-  hi Error ctermfg=217 ctermbg=NONE cterm=reverse
-  hi FoldColumn ctermfg=102 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=102 ctermbg=NONE cterm=NONE
-  hi IncSearch ctermfg=231 ctermbg=27 cterm=reverse
-  hi LineNr ctermfg=118 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ModeMsg ctermfg=123 ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=22 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=27 ctermbg=NONE cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=27 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=27 ctermbg=231 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi PmenuMatch ctermfg=213 ctermbg=27 cterm=NONE
-  hi PmenuMatchSel ctermfg=201 ctermbg=231 cterm=NONE
-  hi Question ctermfg=118 ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=102 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=30 ctermbg=NONE cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=118 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=123 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=17 ctermbg=252 cterm=NONE
-  hi StatusLineNC ctermfg=16 ctermbg=102 cterm=NONE
-  hi TabLine ctermfg=16 ctermbg=102 cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=27 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=16 ctermbg=102 cterm=NONE
-  hi Visual ctermfg=105 ctermbg=231 cterm=reverse
-  hi VisualNOS ctermfg=105 ctermbg=252 cterm=reverse,underline
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=227 ctermbg=16 cterm=NONE
-  hi debugBreakpoint ctermfg=118 ctermbg=18 cterm=reverse
-  hi debugPC ctermfg=123 ctermbg=18 cterm=reverse
-  hi Directory ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=123 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=17 ctermbg=252 cterm=NONE
-  hi PreProc ctermfg=213 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=227 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=118 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi TabLineSel ctermfg=17 ctermbg=252 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=59 cterm=NONE
-  hi CursorLineNr ctermfg=227 ctermbg=59 cterm=NONE
-  hi Search ctermfg=123 ctermbg=27 cterm=NONE
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#c0c0c0 guibg=#000040 guisp=NONE gui=NONE ctermfg=252 ctermbg=17 cterm=NONE term=NONE
+hi ColorColumn guifg=#c0c0c0 guibg=#8b0000 guisp=NONE gui=NONE ctermfg=252 ctermbg=88 cterm=NONE term=reverse
+hi Comment guifg=#80a0ff guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ffa0a0 guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#ffff60 guisp=NONE gui=NONE ctermfg=16 ctermbg=227 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=59 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=59 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff60 guibg=#666666 guisp=NONE gui=NONE ctermfg=227 ctermbg=59 cterm=NONE term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#ffa0a0 guibg=NONE guisp=NONE gui=reverse ctermfg=217 ctermbg=NONE cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#808080 guibg=NONE guisp=NONE gui=bold ctermfg=102 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#808080 guibg=NONE guisp=NONE gui=bold ctermfg=102 ctermbg=NONE cterm=NONE term=NONE
+hi Identifier guifg=#90fff0 guibg=NONE guisp=NONE gui=NONE ctermfg=123 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#000040 guibg=#c0c0c0 guisp=NONE gui=NONE ctermfg=17 ctermbg=252 cterm=NONE term=NONE
+hi IncSearch guifg=#ffffff guibg=#0030ff guisp=NONE gui=reverse ctermfg=231 ctermbg=27 cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#90f020 guibg=NONE guisp=NONE gui=NONE ctermfg=118 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=bold,underline
+hi ModeMsg guifg=#90fff0 guibg=NONE guisp=NONE gui=NONE ctermfg=123 ctermbg=NONE cterm=NONE term=bold
+hi MoreMsg guifg=#006400 guibg=NONE guisp=NONE gui=NONE ctermfg=22 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#0030ff guibg=NONE guisp=NONE gui=NONE ctermfg=27 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#0030ff guisp=NONE gui=NONE ctermfg=231 ctermbg=27 cterm=NONE term=reverse
+hi PmenuBorder guifg=NONE guibg=#0030ff guisp=NONE gui=NONE ctermfg=NONE ctermbg=27 cterm=NONE term=NONE
+hi PmenuMatch guifg=#ff80ff guibg=#0030ff guisp=NONE gui=NONE ctermfg=213 ctermbg=27 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#ffffff guisp=NONE gui=NONE ctermfg=201 ctermbg=231 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=#0030ff guibg=#ffffff guisp=NONE gui=NONE ctermfg=27 ctermbg=231 cterm=NONE term=bold
+hi PmenuShadow guifg=#808080 guibg=#000000 guisp=NONE gui=NONE ctermfg=102 ctermbg=233 cterm=NONE term=NONE
+hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
+hi PreProc guifg=#ff80ff guibg=NONE guisp=NONE gui=NONE ctermfg=213 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#90f020 guibg=NONE guisp=NONE gui=NONE ctermfg=118 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#000000 guibg=#ff80ff guisp=NONE gui=NONE ctermfg=16 ctermbg=213 cterm=NONE term=NONE
+hi Search guifg=#90fff0 guibg=#0030ff guisp=NONE gui=NONE ctermfg=123 ctermbg=27 cterm=NONE term=reverse
+hi SignColumn guifg=#808080 guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ffa500 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#90f020 guibg=NONE guisp=#90f020 gui=undercurl ctermfg=118 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#90fff0 guibg=NONE guisp=#90fff0 gui=undercurl ctermfg=123 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffff60 guibg=NONE guisp=NONE gui=NONE ctermfg=227 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#000040 guibg=#c0c0c0 guisp=NONE gui=NONE ctermfg=17 ctermbg=252 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#000000 guibg=#808080 guisp=NONE gui=NONE ctermfg=16 ctermbg=102 cterm=NONE term=bold,underline
+hi TabLine guifg=#000000 guibg=#808080 guisp=NONE gui=NONE ctermfg=16 ctermbg=102 cterm=NONE term=bold,underline
+hi TabLineSel guifg=#000040 guibg=#c0c0c0 guisp=NONE gui=NONE ctermfg=17 ctermbg=252 cterm=NONE term=bold,reverse
+hi Title guifg=#ff00ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi TitleBar guifg=#c0c0c0 guibg=#3c3c66 guisp=NONE gui=NONE ctermfg=252 ctermbg=237 cterm=NONE term=NONE
+hi TitleBarNC guifg=#808080 guibg=#2c2c56 guisp=NONE gui=NONE ctermfg=102 ctermbg=236 cterm=NONE term=NONE
+hi Todo guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=bold,reverse
+hi ToolbarButton guifg=#ffffff guibg=#0030ff guisp=NONE gui=NONE ctermfg=231 ctermbg=27 cterm=NONE term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#90f020 guibg=NONE guisp=NONE gui=NONE ctermfg=118 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=#80a0ff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#000000 guibg=#808080 guisp=NONE gui=NONE ctermfg=16 ctermbg=102 cterm=NONE term=NONE
+hi Visual guifg=#8080ff guibg=#ffffff guisp=NONE gui=reverse ctermfg=105 ctermbg=231 cterm=reverse term=reverse
+hi VisualNOS guifg=#8080ff guibg=#c0c0c0 guisp=NONE gui=reverse,underline ctermfg=105 ctermbg=252 cterm=reverse,underline term=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#ffff60 guibg=#000000 guisp=NONE gui=NONE ctermfg=227 ctermbg=16 cterm=NONE term=bold
+hi debugBreakpoint guifg=#90f020 guibg=#00008b guisp=NONE gui=reverse ctermfg=118 ctermbg=18 cterm=reverse term=reverse
+hi debugPC guifg=#90fff0 guibg=#00008b guisp=NONE gui=reverse ctermfg=123 ctermbg=18 cterm=reverse term=reverse
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi Conceal ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=red ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Error ctermfg=red ctermbg=NONE cterm=reverse
   hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=grey cterm=NONE
   hi IncSearch ctermfg=white ctermbg=blue cterm=reverse
   hi LineNr ctermfg=green ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
@@ -256,23 +165,37 @@ if s:t_Co >= 16
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=white ctermbg=blue cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=blue ctermbg=white cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PmenuBorder ctermfg=NONE ctermbg=blue cterm=NONE
   hi PmenuMatch ctermfg=magenta ctermbg=blue cterm=NONE
   hi PmenuMatchSel ctermfg=darkmagenta ctermbg=white cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=blue ctermbg=white cterm=NONE
+  hi PmenuShadow ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
+  hi Search ctermfg=white ctermbg=blue cterm=NONE
   hi SignColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=cyan ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=black ctermbg=grey cterm=NONE
   hi StatusLineNC ctermfg=black ctermbg=darkgrey cterm=NONE
   hi TabLine ctermfg=black ctermbg=darkgrey cterm=NONE
+  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi TitleBar ctermfg=grey ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ToolbarButton ctermfg=white ctermbg=blue cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=black ctermbg=darkgrey cterm=NONE
   hi Visual ctermfg=blue ctermbg=white cterm=reverse
   hi VisualNOS ctermfg=blue ctermbg=grey cterm=reverse,underline
@@ -280,40 +203,29 @@ if s:t_Co >= 16
   hi WildMenu ctermfg=yellow ctermbg=black cterm=NONE
   hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
   hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=red ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=black ctermbg=grey cterm=NONE
-  hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=green ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
-  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
-  hi Search ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=grey ctermbg=darkmagenta cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Error ctermfg=darkred ctermbg=grey cterm=reverse
   hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold,reverse
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=grey ctermbg=darkblue cterm=reverse
   hi LineNr ctermfg=green ctermbg=NONE cterm=bold
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
@@ -321,158 +233,62 @@ if s:t_Co >= 8
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=grey ctermbg=blue cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=blue ctermbg=grey cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PmenuBorder ctermfg=NONE ctermbg=blue cterm=NONE
   hi PmenuMatch ctermfg=grey ctermbg=blue cterm=bold
   hi PmenuMatchSel ctermfg=blue ctermbg=grey cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=blue ctermbg=grey cterm=NONE
+  hi PmenuShadow ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=grey ctermbg=darkmagenta cterm=NONE
   hi Search ctermfg=darkcyan ctermbg=blue cterm=NONE
   hi SignColumn ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
   hi SpellLocal ctermfg=darkcyan ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi StatusLine ctermfg=darkblue ctermbg=grey cterm=bold,reverse
   hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
   hi TabLine ctermfg=grey ctermbg=black cterm=reverse
   hi TabLineSel ctermfg=darkblue ctermbg=grey cterm=bold,reverse
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi TitleBar ctermfg=grey ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ToolbarButton ctermfg=darkblue ctermbg=grey cterm=bold,reverse
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
   hi Visual ctermfg=blue ctermbg=grey cterm=reverse
   hi VisualNOS ctermfg=blue ctermbg=grey cterm=reverse,underline
   hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=yellow ctermbg=black cterm=NONE
   hi debugBreakpoint ctermfg=darkgreen ctermbg=darkblue cterm=reverse
   hi debugPC ctermfg=darkcyan ctermbg=darkblue cterm=reverse
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: white         #FFFFFF           231               white
-" Color: black         #000000           16                black
-" Color: diffc         #0087af           31                darkcyan
-" Color: difft         #005f87           24                cyan
-" Color: cursorl       #666666           59                darkgrey
-" Color: ogDeepBlue    #000040           17                black
-" Color: ogDarkBlue    #00008b           18                darkblue
-" Color: ogBlue        #0030ff           27                blue
-" Color: ogLightBlue   #287eff           33                blue
-" Color: ogDarkGrey    #a9a9a9           248               grey
-" Color: ogGrey        #808080           102               darkgrey
-" Color: ogLightGrey   #c0c0c0           252               grey
-" Color: ogDarkViolet  #404080           61                darkblue
-" Color: ogViolet      #8080ff           105               blue
-" Color: ogLightViolet #80a0ff           111               blue
-" Color: ogDarkGreen   #006400           22                darkgreen
-" Color: ogGreen       #90f020           118               green
-" Color: ogDarkCyan    #008b8b           30                darkcyan
-" Color: ogCyan        #90fff0           123               cyan
-" Color: ogLightCyan   #b0ffff           159               cyan
-" Color: ogDarkerRed   #8b0000           88                darkred
-" Color: ogDarkRed     #d14a14           166               darkred
-" Color: ogRed         #ff0000           196               red
-" Color: ogLightRed    #ffa0a0           217               red
-" Color: ogDarkMag     #8b008b           90                darkmagenta
-" Color: ogMagenta     #ff00ff           201               darkmagenta
-" Color: ogLightMag    #ff80ff           213               magenta
-" Color: ogOrange      #ffa500           214               darkyellow
-" Color: ogYellow      #ffff60           227               yellow
-" Term colors: black  ogDarkerRed ogGreen ogOrange ogDarkBlue ogDarkMag ogDarkCyan ogLightGrey
-" Term colors: ogGrey ogLightRed  ogGreen ogYellow ogBlue     ogMagenta    ogCyan     white
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/delek.vim

@@ -2,419 +2,261 @@
 " Description:  Light background colorscheme.
 " Author:       Original author David Schweikert <david@schweikert.ch>
 " Maintainer:   Original maintainer David Schweikert <david@schweikert.ch>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2024 Aug 15
+" Last Change:  2025 Oct 08
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta10
 
 set background=light
 
 hi clear
 let g:colors_name = 'delek'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#ffffff', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#bcbcbc', '#ee0000', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#000000']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#ffffff', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#bcbcbc', '#ee0000', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#000000']
-endif
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
+hi! link CursorIM Cursor
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link ErrorMsg Error
+hi! link Float Number
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
 hi! link PopupNotification Todo
-hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi StatusLine guifg=#ffff00 guibg=#00008b gui=bold cterm=bold
-hi StatusLineNC guifg=#ffd700 guibg=#00008b gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#ffff00 guibg=#0000ff gui=bold cterm=bold
-hi StatusLineTermNC guifg=#e4e4e4 guibg=#0000ff gui=NONE cterm=NONE
-hi VertSplit guifg=#e4e4e4 guibg=#00008b gui=NONE cterm=NONE
-hi Pmenu guifg=#000000 guibg=#add8e6 gui=NONE cterm=NONE
-hi PmenuSel guifg=#ffffff guibg=#00008b gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi PmenuMatch guifg=#cd00cd guibg=#add8e6 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff87ff guibg=#00008b gui=NONE cterm=NONE
-hi TabLine guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
-hi TabLineFill guifg=NONE guibg=#bcbcbc gui=NONE cterm=NONE
-hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#bcbcbc gui=bold cterm=bold
-hi NonText guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi Conceal guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#00008b guibg=#e4e4e4 gui=NONE cterm=NONE
-hi Visual guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=#ee0000 gui=NONE cterm=NONE
-hi LineNr guifg=#a52a2a guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#00008b guibg=NONE gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=bold
-hi QuickFixLine guifg=#ffffff guibg=#008b8b gui=NONE cterm=NONE
-hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Underlined guifg=#6a5acd guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi WarningMsg guifg=#cd00cd guibg=#ffffff gui=NONE cterm=NONE
-hi MoreMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi ModeMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi Question guifg=#008700 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi MatchParen guifg=#ffffff guibg=#ff1493 gui=NONE cterm=NONE
-hi Search guifg=#ffffff guibg=#cd00cd gui=NONE cterm=NONE
-hi IncSearch guifg=#00cd00 guibg=NONE gui=reverse cterm=reverse
-hi WildMenu guifg=#00008b guibg=#ffd700 gui=bold cterm=bold
-hi ColorColumn guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
-hi Cursor guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
-hi lCursor guifg=#000000 guibg=#00cd00 gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#008b8b guibg=NONE guisp=#008b8b gui=undercurl cterm=underline
-hi SpellLocal guifg=#0000ff guibg=NONE guisp=#0000ff gui=undercurl cterm=underline
-hi SpellRare guifg=#cd00cd guibg=NONE guisp=#cd00cd gui=undercurl cterm=underline
-hi debugBreakpoint guifg=#ffff00 guibg=#0000ff gui=NONE cterm=NONE
-hi debugPC guifg=#ff1493 guibg=#0000ff gui=NONE cterm=NONE
-hi Comment guifg=#ee0000 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#00cd00 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#0000ff guibg=NONE gui=bold cterm=bold
-hi PreProc guifg=#cd00cd guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#0000ff guibg=NONE gui=bold cterm=bold
-hi Special guifg=#ff1493 guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#008b8b guibg=NONE gui=bold cterm=bold
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#cd00cd guibg=NONE gui=bold cterm=bold
-hi CursorLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link ErrorMsg Error
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi Normal ctermfg=16 ctermbg=231 cterm=NONE
-  hi EndOfBuffer ctermfg=250 ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=226 ctermbg=18 cterm=bold
-  hi StatusLineNC ctermfg=220 ctermbg=18 cterm=NONE
-  hi StatusLineTerm ctermfg=226 ctermbg=21 cterm=bold
-  hi StatusLineTermNC ctermfg=254 ctermbg=21 cterm=NONE
-  hi VertSplit ctermfg=254 ctermbg=18 cterm=NONE
-  hi Pmenu ctermfg=16 ctermbg=152 cterm=NONE
-  hi PmenuSel ctermfg=231 ctermbg=18 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=231 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=30 cterm=NONE
-  hi PmenuMatch ctermfg=164 ctermbg=152 cterm=NONE
-  hi PmenuMatchSel ctermfg=213 ctermbg=18 cterm=NONE
-  hi TabLine ctermfg=16 ctermbg=254 cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=250 cterm=NONE
-  hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=254 cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=250 cterm=bold
-  hi NonText ctermfg=250 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=250 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=250 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=18 ctermbg=254 cterm=NONE
-  hi Visual ctermfg=16 ctermbg=252 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=196 cterm=NONE
-  hi LineNr ctermfg=124 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=18 ctermbg=NONE cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
-  hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=231 ctermbg=30 cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=62 ctermbg=NONE cterm=underline
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi WarningMsg ctermfg=164 ctermbg=231 cterm=NONE
-  hi MoreMsg ctermfg=16 ctermbg=231 cterm=bold
-  hi ModeMsg ctermfg=16 ctermbg=231 cterm=bold
-  hi Question ctermfg=28 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=16 ctermbg=226 cterm=NONE
-  hi MatchParen ctermfg=231 ctermbg=198 cterm=NONE
-  hi Search ctermfg=231 ctermbg=164 cterm=NONE
-  hi IncSearch ctermfg=40 ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=18 ctermbg=220 cterm=bold
-  hi ColorColumn ctermfg=16 ctermbg=254 cterm=NONE
-  hi Cursor ctermfg=231 ctermbg=16 cterm=NONE
-  hi lCursor ctermfg=16 ctermbg=40 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=30 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=21 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=164 ctermbg=NONE cterm=underline
-  hi debugBreakpoint ctermfg=226 ctermbg=21 cterm=NONE
-  hi debugPC ctermfg=198 ctermbg=21 cterm=NONE
-  hi Comment ctermfg=196 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=40 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=21 ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=164 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=21 ctermbg=NONE cterm=bold
-  hi Special ctermfg=198 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=30 ctermbg=NONE cterm=bold
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=164 ctermbg=NONE cterm=bold
-  hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE
+hi ColorColumn guifg=#000000 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=reverse
+hi Comment guifg=#ee0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#00cd00 guibg=NONE guisp=NONE gui=NONE ctermfg=40 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=underline
+hi CursorLineNr guifg=#a52a2a guibg=NONE guisp=NONE gui=bold ctermfg=124 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#008b8b guibg=NONE guisp=NONE gui=bold ctermfg=30 ctermbg=NONE cterm=bold term=NONE
+hi EndOfBuffer guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#00008b guibg=NONE guisp=NONE gui=NONE ctermfg=18 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00008b guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=18 ctermbg=254 cterm=NONE term=NONE
+hi Identifier guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#00cd00 guibg=NONE guisp=NONE gui=reverse ctermfg=40 ctermbg=NONE cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#a52a2a guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#ffffff guibg=#ff1493 guisp=NONE gui=NONE ctermfg=231 ctermbg=198 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=bold
+hi MoreMsg guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=NONE
+hi NonText guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#000000 guibg=#add8e6 guisp=NONE gui=NONE ctermfg=16 ctermbg=152 cterm=NONE term=reverse
+hi PmenuMatch guifg=#cd00cd guibg=#add8e6 guisp=NONE gui=NONE ctermfg=164 ctermbg=152 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff87ff guibg=#00008b guisp=NONE gui=NONE ctermfg=213 ctermbg=18 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=reverse
+hi PmenuSel guifg=#ffffff guibg=#00008b guisp=NONE gui=NONE ctermfg=231 ctermbg=18 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#008b8b guisp=NONE gui=NONE ctermfg=NONE ctermbg=30 cterm=NONE term=NONE
+hi PreProc guifg=#cd00cd guibg=NONE guisp=NONE gui=NONE ctermfg=164 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#008700 guibg=NONE guisp=NONE gui=bold ctermfg=28 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#ffffff guibg=#008b8b guisp=NONE gui=NONE ctermfg=231 ctermbg=30 cterm=NONE term=NONE
+hi Search guifg=#ffffff guibg=#cd00cd guisp=NONE gui=NONE ctermfg=231 ctermbg=164 cterm=NONE term=reverse
+hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ff1493 guibg=NONE guisp=NONE gui=NONE ctermfg=198 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#008b8b guibg=NONE guisp=#008b8b gui=undercurl ctermfg=30 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#0000ff guibg=NONE guisp=#0000ff gui=undercurl ctermfg=21 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#cd00cd guibg=NONE guisp=#cd00cd gui=undercurl ctermfg=164 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=21 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#ffff00 guibg=#00008b guisp=NONE gui=bold ctermfg=226 ctermbg=18 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#ffd700 guibg=#00008b guisp=NONE gui=NONE ctermfg=220 ctermbg=18 cterm=NONE term=bold,underline
+hi StatusLineTerm guifg=#ffff00 guibg=#0000ff guisp=NONE gui=bold ctermfg=226 ctermbg=21 cterm=bold term=bold,reverse
+hi StatusLineTermNC guifg=#e4e4e4 guibg=#0000ff guisp=NONE gui=NONE ctermfg=254 ctermbg=21 cterm=NONE term=bold,underline
+hi TabLine guifg=#000000 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=bold,underline
+hi TabLineFill guifg=NONE guibg=#bcbcbc guisp=NONE gui=NONE ctermfg=NONE ctermbg=250 cterm=NONE term=NONE
+hi TabLineSel guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=bold,reverse
+hi Title guifg=#cd00cd guibg=NONE guisp=NONE gui=bold ctermfg=164 ctermbg=NONE cterm=bold term=NONE
+hi TitleBar guifg=#000000 guibg=#ececec guisp=NONE gui=NONE ctermfg=16 ctermbg=255 cterm=NONE term=NONE
+hi TitleBarNC guifg=#878787 guibg=#f5f5f5 guisp=NONE gui=NONE ctermfg=102 ctermbg=255 cterm=NONE term=NONE
+hi Todo guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#ffffff guibg=#bcbcbc guisp=NONE gui=bold ctermfg=231 ctermbg=250 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=reverse
+hi Type guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=21 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#6a5acd guibg=NONE guisp=NONE gui=underline ctermfg=62 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#e4e4e4 guibg=#00008b guisp=NONE gui=NONE ctermfg=254 ctermbg=18 cterm=NONE term=NONE
+hi Visual guifg=#000000 guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=16 ctermbg=252 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=#ee0000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=196 cterm=NONE term=NONE
+hi WarningMsg guifg=#cd00cd guibg=#ffffff guisp=NONE gui=NONE ctermfg=164 ctermbg=231 cterm=NONE term=standout
+hi WildMenu guifg=#00008b guibg=#ffd700 guisp=NONE gui=bold ctermfg=18 ctermbg=220 cterm=bold term=bold
+hi debugBreakpoint guifg=#ffff00 guibg=#0000ff guisp=NONE gui=NONE ctermfg=226 ctermbg=21 cterm=NONE term=NONE
+hi debugPC guifg=#ff1493 guibg=#0000ff guisp=NONE gui=NONE ctermfg=198 ctermbg=21 cterm=NONE term=NONE
+hi lCursor guifg=#000000 guibg=#00cd00 guisp=NONE gui=NONE ctermfg=16 ctermbg=40 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=black ctermbg=white cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=grey cterm=NONE
+  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=white ctermbg=black cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=grey cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkgrey ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=yellow ctermbg=darkblue cterm=bold
-  hi StatusLineNC ctermfg=darkyellow ctermbg=darkblue cterm=NONE
-  hi StatusLineTerm ctermfg=yellow ctermbg=blue cterm=bold
-  hi StatusLineTermNC ctermfg=grey ctermbg=blue cterm=NONE
-  hi VertSplit ctermfg=grey ctermbg=darkblue cterm=NONE
+  hi Error ctermfg=red ctermbg=white cterm=reverse
+  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=grey cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=white ctermbg=magenta cterm=NONE
+  hi ModeMsg ctermfg=black ctermbg=white cterm=bold
+  hi MoreMsg ctermfg=black ctermbg=white cterm=bold
+  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-  hi PmenuSel ctermfg=white ctermbg=darkblue cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi PmenuMatch ctermfg=darkmagenta ctermbg=grey cterm=NONE
   hi PmenuMatchSel ctermfg=magenta ctermbg=darkblue cterm=NONE
-  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
-  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=grey cterm=NONE
-  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
-  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=grey cterm=NONE
-  hi Visual ctermfg=black ctermbg=darkgrey cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=darkred cterm=NONE
-  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=grey cterm=NONE
-  hi CursorLineNr ctermfg=darkgrey ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=white ctermbg=darkcyan cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
-  hi Error ctermfg=red ctermbg=white cterm=reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
-  hi MoreMsg ctermfg=black ctermbg=white cterm=bold
-  hi ModeMsg ctermfg=black ctermbg=white cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE
+  hi PmenuSel ctermfg=white ctermbg=darkblue cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkcyan cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
-  hi MatchParen ctermfg=white ctermbg=magenta cterm=NONE
+  hi QuickFixLine ctermfg=white ctermbg=darkcyan cterm=NONE
   hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE
-  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=darkblue ctermbg=darkyellow cterm=bold
-  hi ColorColumn ctermfg=black ctermbg=grey cterm=NONE
-  hi Cursor ctermfg=white ctermbg=black cterm=NONE
-  hi lCursor ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=darkblue ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=yellow ctermbg=darkblue cterm=bold
+  hi StatusLineNC ctermfg=darkyellow ctermbg=darkblue cterm=NONE
+  hi StatusLineTerm ctermfg=yellow ctermbg=blue cterm=bold
+  hi StatusLineTermNC ctermfg=grey ctermbg=blue cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi TitleBar ctermfg=black ctermbg=white cterm=NONE
+  hi TitleBarNC ctermfg=gray ctermbg=white cterm=NONE
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=grey cterm=NONE
+  hi Type ctermfg=blue ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=grey ctermbg=darkblue cterm=NONE
+  hi Visual ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=darkred cterm=NONE
+  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
+  hi WildMenu ctermfg=darkblue ctermbg=darkyellow cterm=bold
   hi debugBreakpoint ctermfg=yellow ctermbg=darkblue cterm=NONE
   hi debugPC ctermfg=magenta ctermbg=darkblue cterm=NONE
-  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=blue ctermbg=NONE cterm=bold
-  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Visual ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi lCursor ctermfg=black ctermbg=darkgreen cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=black ctermbg=gray cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=white ctermbg=black cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=grey cterm=NONE
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=darkblue ctermbg=darkyellow cterm=bold,reverse
-  hi StatusLineNC ctermfg=darkblue ctermbg=darkyellow cterm=reverse
-  hi StatusLineTerm ctermfg=darkblue ctermbg=darkyellow cterm=bold,reverse
-  hi StatusLineTermNC ctermfg=darkblue ctermbg=darkyellow cterm=reverse
-  hi VertSplit ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi Error ctermfg=red ctermbg=gray cterm=reverse
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MatchParen ctermfg=black ctermbg=darkmagenta cterm=bold
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
   hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
   hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLine ctermfg=gray ctermbg=black cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=black cterm=NONE
-  hi TabLineSel ctermfg=black ctermbg=gray cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
-  hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold
-  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
-  hi Error ctermfg=red ctermbg=gray cterm=reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkmagenta cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
   hi SpellCap ctermfg=darkcyan ctermbg=black cterm=reverse
   hi SpellLocal ctermfg=darkblue ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=darkblue ctermbg=darkyellow cterm=bold,reverse
+  hi StatusLineNC ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi StatusLineTerm ctermfg=darkblue ctermbg=darkyellow cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi TabLine ctermfg=gray ctermbg=black cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=black cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=gray cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi TitleBar ctermfg=black ctermbg=white cterm=NONE
+  hi TitleBarNC ctermfg=gray ctermbg=white cterm=NONE
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
   hi debugBreakpoint ctermfg=darkyellow ctermbg=darkblue cterm=NONE
   hi debugPC ctermfg=darkmagenta ctermbg=darkblue cterm=NONE
-  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi lCursor ctermfg=black ctermbg=darkgreen cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi ErrorMsg term=bold,reverse
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: light
-" Color: comment     #ee0000        196            darkred
-" Color: constant    #00cd00        40             darkgreen
-" Color: identifier  #008b8b        30             darkcyan
-" Color: statement   #0000ff        21             darkblue
-" Color: preproc     #cd00cd        164            darkmagenta
-" Color: type        #0000ff        21             blue
-" Color: special     #ff1493        198            magenta
-" Color: fg0         #000000        16             black
-" Color: bg0         #ffffff        231            white
-" Color: bg1         #bcbcbc        250            darkgrey
-" Color: visual      #d0d0d0        252            darkgrey
-" Color: folded      #e4e4e4        254            grey
-" Color: pmenu       #add8e6        152            grey
-" Color: wildmenu    #00008b        18             darkblue
-" Color: error       #ff0000        196            red
-" Color: status_fg   #ffd700        220            darkyellow
-" Color: linenr      #a52a2a        124            darkgrey
-" Color: Yellow      #ffff00        226            yellow
-" Color: SlateBlue   #6a5acd        62             blue
-" Color: black       #000000        16             black
-" Color: darkred     #870000        88             darkred
-" Color: darkgreen   #008700        28             darkgreen
-" Color: darkyellow  #878700        100            darkyellow
-" Color: darkblue    #000087        18             darkblue
-" Color: darkmagenta #870087        18             darkmagenta
-" Color: darkcyan    #008787        30             darkcyan
-" Color: gray        #878787        102            gray
-" Color: magenta     #ff87ff        213            magenta
-" Term colors: bg0     statement constant preproc identifier type special bg1
-" Term colors: comment statement constant preproc identifier type special fg0
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/desert.vim

@@ -2,407 +2,262 @@
 " Description:  Light background colorscheme.
 " Author:       Original author Hans Fugal <hans@fugal.net>
 " Maintainer:   Original maintainer Hans Fugal <hans@fugal.net>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2024 Aug 15
+" Last Change:  2025 Oct 08
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta10
 
 set background=dark
 
 hi clear
 let g:colors_name = 'desert'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#7f7f8c', '#cd5c5c', '#9acd32', '#bdb76b', '#75a0ff', '#eeee00', '#cd853f', '#666666', '#8a7f7f', '#ff0000', '#89fb98', '#f0e68c', '#6dceeb', '#ffde9b', '#ffa0a0', '#c2bfa5']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#7f7f8c', '#cd5c5c', '#9acd32', '#bdb76b', '#75a0ff', '#eeee00', '#cd853f', '#666666', '#8a7f7f', '#ff0000', '#89fb98', '#f0e68c', '#6dceeb', '#ffde9b', '#ffa0a0', '#c2bfa5']
-endif
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link EndOfBuffer NonText
+hi! link Float Number
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
 hi! link PopupNotification Todo
-hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
-hi StatusLine guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
-hi StatusLineNC guifg=#7f7f8c guibg=#c2bfa5 gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
-hi StatusLineTermNC guifg=#ffffff guibg=#c2bfa5 gui=NONE cterm=NONE
-hi VertSplit guifg=#7f7f8c guibg=#c2bfa5 gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#666666 gui=NONE cterm=NONE
-hi PmenuSel guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#333333 gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#c2bfa5 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ffa0a0 guibg=#666666 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#cd5c5c guibg=#f0e68c gui=NONE cterm=NONE
-hi TabLine guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
-hi TabLineFill guifg=NONE guibg=#c2bfa5 gui=NONE cterm=NONE
-hi TabLineSel guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#333333 guibg=#ffde9b gui=bold cterm=bold
-hi NonText guifg=#6dceeb guibg=#4d4d4d gui=NONE cterm=NONE
-hi SpecialKey guifg=#9acd32 guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#eeee00 guibg=#4d4d4d gui=NONE cterm=NONE
-hi Visual guifg=#f0e68c guibg=#6b8e24 gui=NONE cterm=NONE
-hi VisualNOS guifg=#f0e68c guibg=#6dceeb gui=NONE cterm=NONE
-hi LineNr guifg=#eeee00 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#eeee00 guibg=#4d4d4d gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#eeee00 guibg=NONE gui=bold cterm=bold
-hi QuickFixLine guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
-hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Underlined guifg=#75a0ff guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi ModeMsg guifg=#ffde9b guibg=NONE gui=bold cterm=bold
-hi WarningMsg guifg=#cd5c5c guibg=NONE gui=bold cterm=bold
-hi MoreMsg guifg=#9acd32 guibg=NONE gui=bold cterm=bold
-hi Question guifg=#89fb98 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#ff0000 guibg=#eeee00 gui=NONE cterm=NONE
-hi MatchParen guifg=#7f7f8c guibg=#bdb76b gui=NONE cterm=NONE
-hi Search guifg=#f0e68c guibg=#7f7f8c gui=NONE cterm=NONE
-hi IncSearch guifg=#f0e68c guibg=#cd853f gui=NONE cterm=NONE
-hi WildMenu guifg=#333333 guibg=#eeee00 gui=NONE cterm=NONE
-hi ColorColumn guifg=#ffffff guibg=#cd5c5c gui=NONE cterm=NONE
-hi Cursor guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
-hi lCursor guifg=#333333 guibg=#ff0000 gui=NONE cterm=NONE
-hi debugPC guifg=#666666 guibg=NONE gui=reverse cterm=reverse
-hi debugBreakpoint guifg=#ffa0a0 guibg=NONE gui=reverse cterm=reverse
-hi SpellBad guifg=#cd5c5c guibg=NONE guisp=#cd5c5c gui=undercurl cterm=underline
-hi SpellCap guifg=#75a0ff guibg=NONE guisp=#75a0ff gui=undercurl cterm=underline
-hi SpellLocal guifg=#ffde9b guibg=NONE guisp=#ffde9b gui=undercurl cterm=underline
-hi SpellRare guifg=#9acd32 guibg=NONE guisp=#9acd32 gui=undercurl cterm=underline
-hi Comment guifg=#6dceeb guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#89fb98 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#f0e68c guibg=NONE gui=bold cterm=bold
-hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#cd5c5c guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#bdb76b guibg=NONE gui=bold cterm=bold
-hi Special guifg=#ffde9b guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#6dceeb guibg=NONE gui=NONE cterm=NONE
-hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#cd5c5c guibg=NONE gui=bold cterm=bold
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link TabPanel Normal
+hi! link TabPanelFill EndOfBuffer
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link EndOfBuffer NonText
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
-  hi StatusLine ctermfg=236 ctermbg=144 cterm=NONE
-  hi StatusLineNC ctermfg=242 ctermbg=144 cterm=NONE
-  hi StatusLineTerm ctermfg=236 ctermbg=144 cterm=NONE
-  hi StatusLineTermNC ctermfg=231 ctermbg=144 cterm=NONE
-  hi VertSplit ctermfg=242 ctermbg=144 cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=241 cterm=NONE
-  hi PmenuSel ctermfg=236 ctermbg=186 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=236 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=144 cterm=NONE
-  hi PmenuMatch ctermfg=217 ctermbg=241 cterm=NONE
-  hi PmenuMatchSel ctermfg=167 ctermbg=186 cterm=NONE
-  hi TabLine ctermfg=236 ctermbg=144 cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=144 cterm=NONE
-  hi TabLineSel ctermfg=236 ctermbg=186 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=241 cterm=NONE
-  hi ToolbarButton ctermfg=236 ctermbg=222 cterm=bold
-  hi NonText ctermfg=81 ctermbg=239 cterm=NONE
-  hi SpecialKey ctermfg=112 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=226 ctermbg=239 cterm=NONE
-  hi Visual ctermfg=186 ctermbg=64 cterm=NONE
-  hi VisualNOS ctermfg=186 ctermbg=81 cterm=NONE
-  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=226 ctermbg=239 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=241 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=241 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=236 ctermbg=186 cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi ErrorMsg ctermfg=196 ctermbg=231 cterm=reverse
-  hi ModeMsg ctermfg=222 ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=167 ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=112 ctermbg=NONE cterm=bold
-  hi Question ctermfg=120 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=196 ctermbg=226 cterm=NONE
-  hi MatchParen ctermfg=242 ctermbg=143 cterm=NONE
-  hi Search ctermfg=186 ctermbg=242 cterm=NONE
-  hi IncSearch ctermfg=186 ctermbg=172 cterm=NONE
-  hi WildMenu ctermfg=236 ctermbg=226 cterm=NONE
-  hi ColorColumn ctermfg=231 ctermbg=167 cterm=NONE
-  hi debugPC ctermfg=241 ctermbg=NONE cterm=reverse
-  hi debugBreakpoint ctermfg=217 ctermbg=NONE cterm=reverse
-  hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=111 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=222 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=112 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=81 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=120 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=186 ctermbg=NONE cterm=bold
-  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=167 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=143 ctermbg=NONE cterm=bold
-  hi Special ctermfg=222 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=81 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=167 ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#ffffff guibg=#333333 guisp=NONE gui=NONE ctermfg=231 ctermbg=236 cterm=NONE term=NONE
+hi ColorColumn guifg=#ffffff guibg=#cd5c5c guisp=NONE gui=NONE ctermfg=231 ctermbg=167 cterm=NONE term=reverse
+hi Comment guifg=#6dceeb guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ffa0a0 guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE
+hi CursorColumn guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=241 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=241 cterm=NONE term=underline
+hi CursorLineNr guifg=#eeee00 guibg=NONE guisp=NONE gui=bold ctermfg=226 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#6dceeb guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#eeee00 guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=226 ctermbg=239 cterm=NONE term=NONE
+hi Folded guifg=#eeee00 guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=226 ctermbg=239 cterm=NONE term=NONE
+hi Identifier guifg=#89fb98 guibg=NONE guisp=NONE gui=NONE ctermfg=120 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#f0e68c guibg=#cd853f guisp=NONE gui=NONE ctermfg=186 ctermbg=172 cterm=NONE term=bold,reverse,underline
+hi LineNr guifg=#eeee00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#7f7f8c guibg=#bdb76b guisp=NONE gui=NONE ctermfg=242 ctermbg=143 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#ffde9b guibg=NONE guisp=NONE gui=bold ctermfg=222 ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#9acd32 guibg=NONE guisp=NONE gui=bold ctermfg=112 ctermbg=NONE cterm=bold term=NONE
+hi NonText guifg=#6dceeb guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=81 ctermbg=239 cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#666666 guisp=NONE gui=NONE ctermfg=231 ctermbg=241 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ffa0a0 guibg=#666666 guisp=NONE gui=NONE ctermfg=217 ctermbg=241 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#cd5c5c guibg=#f0e68c guisp=NONE gui=NONE ctermfg=167 ctermbg=186 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=#333333 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=reverse
+hi PmenuSel guifg=#333333 guibg=#f0e68c guisp=NONE gui=NONE ctermfg=236 ctermbg=186 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=NONE ctermbg=144 cterm=NONE term=NONE
+hi PreProc guifg=#cd5c5c guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#89fb98 guibg=NONE guisp=NONE gui=bold ctermfg=120 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#333333 guibg=#f0e68c guisp=NONE gui=NONE ctermfg=236 ctermbg=186 cterm=NONE term=NONE
+hi Search guifg=#f0e68c guibg=#7f7f8c guisp=NONE gui=NONE ctermfg=186 ctermbg=242 cterm=NONE term=reverse
+hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ffde9b guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#9acd32 guibg=NONE guisp=NONE gui=NONE ctermfg=112 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#cd5c5c guibg=NONE guisp=#cd5c5c gui=undercurl ctermfg=167 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#75a0ff guibg=NONE guisp=#75a0ff gui=undercurl ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ffde9b guibg=NONE guisp=#ffde9b gui=undercurl ctermfg=222 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#9acd32 guibg=NONE guisp=#9acd32 gui=undercurl ctermfg=112 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#f0e68c guibg=NONE guisp=NONE gui=bold ctermfg=186 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#333333 guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=236 ctermbg=144 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#7f7f8c guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=242 ctermbg=144 cterm=NONE term=bold,underline
+hi StatusLineTerm guifg=#333333 guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=236 ctermbg=144 cterm=NONE term=bold,reverse
+hi StatusLineTermNC guifg=#ffffff guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=231 ctermbg=144 cterm=NONE term=bold,underline
+hi TabLine guifg=#333333 guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=236 ctermbg=144 cterm=NONE term=bold,underline
+hi TabLineFill guifg=NONE guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=NONE ctermbg=144 cterm=NONE term=NONE
+hi TabLineSel guifg=#333333 guibg=#f0e68c guisp=NONE gui=NONE ctermfg=236 ctermbg=186 cterm=NONE term=bold,reverse
+hi Title guifg=#cd5c5c guibg=NONE guisp=NONE gui=bold ctermfg=167 ctermbg=NONE cterm=bold term=NONE
+hi TitleBar guifg=#ffffff guibg=#4c4c4c guisp=NONE gui=NONE ctermfg=231 ctermbg=237 cterm=NONE term=NONE
+hi TitleBarNC guifg=#8a7f7f guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=244 ctermbg=236 cterm=NONE term=NONE
+hi Todo guifg=#ff0000 guibg=#eeee00 guisp=NONE gui=NONE ctermfg=196 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#333333 guibg=#ffde9b guisp=NONE gui=bold ctermfg=236 ctermbg=222 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=241 cterm=NONE term=reverse
+hi Type guifg=#bdb76b guibg=NONE guisp=NONE gui=bold ctermfg=143 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#75a0ff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#7f7f8c guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=242 ctermbg=144 cterm=NONE term=NONE
+hi Visual guifg=#f0e68c guibg=#6b8e24 guisp=NONE gui=NONE ctermfg=186 ctermbg=64 cterm=NONE term=reverse
+hi VisualNOS guifg=#f0e68c guibg=#6dceeb guisp=NONE gui=NONE ctermfg=186 ctermbg=81 cterm=NONE term=NONE
+hi WarningMsg guifg=#cd5c5c guibg=NONE guisp=NONE gui=bold ctermfg=167 ctermbg=NONE cterm=bold term=standout
+hi WildMenu guifg=#333333 guibg=#eeee00 guisp=NONE gui=NONE ctermfg=236 ctermbg=226 cterm=NONE term=bold
+hi debugBreakpoint guifg=#ffa0a0 guibg=NONE guisp=NONE gui=reverse ctermfg=217 ctermbg=NONE cterm=reverse term=reverse
+hi debugPC guifg=#666666 guibg=NONE guisp=NONE gui=reverse ctermfg=241 ctermbg=NONE cterm=reverse term=reverse
+
+if has('gui_running') || s:tgc
+  hi Cursor guifg=#333333 guibg=#f0e68c guisp=NONE gui=NONE cterm=NONE
+  hi lCursor guifg=#333333 guibg=#ff0000 guisp=NONE gui=NONE cterm=NONE
+endif
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineNC ctermfg=darkgrey ctermbg=grey cterm=NONE
-  hi StatusLineTerm ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineTermNC ctermfg=darkgrey ctermbg=grey cterm=NONE
-  hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE
-  hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
-  hi PmenuMatch ctermfg=NONE ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=white cterm=NONE
-  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkyellow ctermbg=darkgrey cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=blue ctermbg=NONE cterm=NONE
   hi Error ctermfg=red ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse
-  hi ModeMsg ctermfg=magenta ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Question ctermfg=green ctermbg=NONE cterm=bold
-  hi Todo ctermfg=red ctermbg=darkmagenta cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi FoldColumn ctermfg=darkyellow ctermbg=darkgrey cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=green ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=yellow cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi debugPC ctermfg=grey ctermbg=NONE cterm=reverse
-  hi debugBreakpoint ctermfg=cyan ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=magenta ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=NONE ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Question ctermfg=green ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE
+  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=grey cterm=reverse
   hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=green ctermbg=NONE cterm=NONE
   hi Statement ctermfg=yellow ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=grey cterm=NONE
+  hi StatusLineNC ctermfg=darkgrey ctermbg=grey cterm=NONE
+  hi StatusLineTerm ctermfg=black ctermbg=grey cterm=NONE
+  hi StatusLineTermNC ctermfg=darkgrey ctermbg=grey cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=white cterm=NONE
+  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
   hi Title ctermfg=darkred ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi TitleBar ctermfg=white ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE
+  hi Todo ctermfg=red ctermbg=darkmagenta cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE
+  hi Visual ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi WildMenu ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi debugBreakpoint ctermfg=cyan ctermbg=NONE cterm=reverse
+  hi debugPC ctermfg=grey ctermbg=NONE cterm=reverse
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
-  hi StatusLineTerm ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
-  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
   hi Error ctermfg=darkred ctermbg=grey cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=grey cterm=reverse
-  hi ModeMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Todo ctermfg=darkred ctermbg=darkmagenta cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi FoldColumn ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
-  hi debugPC ctermfg=grey ctermbg=NONE cterm=reverse
-  hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=grey cterm=reverse
   hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi StatusLineTerm ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
   hi Title ctermfg=darkred ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi TitleBar ctermfg=white ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE
+  hi Todo ctermfg=darkred ctermbg=darkmagenta cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi WildMenu ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi debugPC ctermfg=grey ctermbg=NONE cterm=reverse
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi Cursor term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi EndOfBuffer term=NONE
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: foreground  #ffffff        231            white
-" Color: background  #333333        236            black
-" Color: color00     #7f7f8c        242            black
-" Color: color08     #8a7f7f        244            darkgrey
-" Color: color01     #cd5c5c        167            darkred
-" Color: color09     #ff0000        196            red
-" Color: color02     #9acd32        112            darkgreen
-" Color: color10     #89fb98        120            green
-" Color: color03     #bdb76b        143            darkyellow
-" Color: color11     #f0e68c        186            yellow
-" Color: color04     #75a0ff        111            darkblue
-" Color: color12     #6dceeb        81             blue
-" Color: color05     #eeee00        226            darkmagenta
-" Color: color13     #ffde9b        222            magenta
-" Color: color06     #cd853f        172            darkcyan
-" Color: color14     #ffa0a0        217            cyan
-" Color: color07     #666666        241            grey
-" Color: color15     #c2bfa5        144            white
-" Color: color16     #6b8e24        64             darkgreen
-" Color: color17     #4d4d4d        239            grey
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/elflord.vim

@@ -1,23 +1,28 @@
 " Name:         elflord
 " Author:       original author Ron Aaron <ron@ronware.org>
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
-" Website:      https://www.github.com/vim/colorschemes
+" URL:          https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2024 Aug 15
+" Last Change:  2025 Oct 08
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta10
 
 set background=dark
 
 hi clear
 let g:colors_name = 'elflord'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 
-hi! link Terminal Normal
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Repeat
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
 hi! link Debug Special
 hi! link Define PreProc
 hi! link Delimiter Special
@@ -26,9 +31,12 @@ hi! link Float Number
 hi! link Include PreProc
 hi! link Keyword Statement
 hi! link Label Statement
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
-hi! link PopupSelected PmenuSel
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
 hi! link SpecialChar Special
 hi! link SpecialComment Special
@@ -37,194 +45,135 @@ hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link String Constant
 hi! link Structure Type
+hi! link TabPanel Normal
+hi! link TabPanelFill Normal
 hi! link Tag Special
 hi! link Typedef Type
 hi! link lCursor Cursor
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi Normal guifg=#00ffff guibg=#000000 gui=NONE cterm=NONE
-hi QuickFixLine guifg=#ffffff guibg=#2e8b57 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#cd0000 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold
-hi Folded guifg=#00ffff guibg=#666666 gui=NONE cterm=NONE
-hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#00ffff gui=NONE cterm=NONE
-hi Directory guifg=#00ffff guibg=#000000 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#0000ff guibg=#000000 gui=bold cterm=NONE
-hi ErrorMsg guifg=#ffffff guibg=#cd0000 gui=NONE cterm=NONE
-hi FoldColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi IncSearch guifg=NONE guibg=#000000 gui=reverse cterm=reverse
-hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
-hi NonText guifg=#0000ff guibg=NONE gui=bold cterm=bold
-hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#bebebe gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=bold cterm=bold
-hi PmenuMatchSel guifg=#ff00ff guibg=#00cdcd gui=bold cterm=bold
-hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
-hi Search guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#0000ff guibg=NONE guisp=#0000ff gui=undercurl cterm=underline
-hi SpellLocal guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl cterm=underline
-hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi StatusLine guifg=#000000 guibg=#00ffff gui=bold cterm=bold
-hi StatusLineNC guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
-hi TabLine guifg=#000000 guibg=#008b8b gui=NONE cterm=NONE
-hi TabLineFill guifg=NONE guibg=#000000 gui=reverse cterm=reverse
-hi TabLineSel guifg=#00ffff guibg=#000000 gui=bold cterm=bold
-hi Terminal guifg=#00ffff guibg=#000000 gui=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
-hi VertSplit guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
-hi Visual guifg=#000000 guibg=#a9a9a9 gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
-hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi Function guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#40ffff guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
-hi Operator guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Repeat guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#aa4444 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#0000ff guibg=#ffff00 gui=NONE cterm=NONE
-hi Type guifg=#60ff60 guibg=NONE gui=bold cterm=bold
-hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
-hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi Normal guifg=#00ffff guibg=#000000 guisp=NONE gui=NONE ctermfg=51 ctermbg=16 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#cd0000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=160 cterm=NONE term=reverse
+hi Comment guifg=#80a0ff guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=59 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ff00ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#00ffff guisp=NONE gui=NONE ctermfg=16 ctermbg=51 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=NONE
+hi CursorIM guifg=NONE guibg=fg guisp=NONE gui=NONE ctermfg=NONE ctermbg=fg cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=bold ctermfg=226 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#00ffff guibg=#000000 guisp=NONE gui=NONE ctermfg=51 ctermbg=16 cterm=NONE term=NONE
+hi EndOfBuffer guifg=#0000ff guibg=#000000 guisp=NONE gui=bold ctermfg=21 ctermbg=16 cterm=NONE term=NONE
+hi Error guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#cd0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=160 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00ffff guibg=#666666 guisp=NONE gui=NONE ctermfg=51 ctermbg=59 cterm=NONE term=NONE
+hi Function guifg=#ffffff guibg=NONE guisp=NONE gui=NONE ctermfg=231 ctermbg=NONE cterm=NONE term=NONE
+hi Identifier guifg=#40ffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#000000 guibg=#000000 guisp=NONE gui=NONE ctermfg=16 ctermbg=16 cterm=NONE term=NONE
+hi IncSearch guifg=NONE guibg=#000000 guisp=NONE gui=reverse ctermfg=NONE ctermbg=16 cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=#008b8b guisp=NONE gui=NONE ctermfg=NONE ctermbg=30 cterm=NONE term=bold,underline
+hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE
+hi NonText guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=21 ctermbg=NONE cterm=bold term=NONE
+hi Operator guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#444444 guisp=NONE gui=NONE ctermfg=231 ctermbg=238 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff00ff guibg=#444444 guisp=NONE gui=bold ctermfg=201 ctermbg=238 cterm=bold term=bold
+hi PmenuMatchSel guifg=#ff00ff guibg=#00cdcd guisp=NONE gui=bold ctermfg=201 ctermbg=44 cterm=bold term=bold
+hi PmenuSbar guifg=NONE guibg=#bebebe guisp=NONE gui=NONE ctermfg=NONE ctermbg=250 cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
+hi PreProc guifg=#ff80ff guibg=NONE guisp=NONE gui=NONE ctermfg=213 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=bold ctermfg=46 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#ffffff guibg=#2e8b57 guisp=NONE gui=NONE ctermfg=231 ctermbg=29 cterm=NONE term=NONE
+hi Repeat guifg=#ffffff guibg=NONE guisp=NONE gui=NONE ctermfg=231 ctermbg=NONE cterm=NONE term=NONE
+hi Search guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=reverse
+hi SignColumn guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#0000ff guibg=NONE guisp=#0000ff gui=undercurl ctermfg=21 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl ctermfg=226 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#aa4444 guibg=NONE guisp=NONE gui=bold ctermfg=131 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#000000 guibg=#00ffff guisp=NONE gui=bold ctermfg=16 ctermbg=51 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=bold,underline
+hi TabLine guifg=#000000 guibg=#008b8b guisp=NONE gui=NONE ctermfg=16 ctermbg=30 cterm=NONE term=bold,underline
+hi TabLineFill guifg=NONE guibg=#000000 guisp=NONE gui=reverse ctermfg=NONE ctermbg=16 cterm=reverse term=NONE
+hi TabLineSel guifg=#00ffff guibg=#000000 guisp=NONE gui=bold ctermfg=51 ctermbg=16 cterm=bold term=bold,reverse
+hi Terminal guifg=#00ffff guibg=#000000 guisp=NONE gui=NONE ctermfg=51 ctermbg=16 cterm=NONE term=NONE
+hi Title guifg=#ff00ff guibg=NONE guisp=NONE gui=bold ctermfg=201 ctermbg=NONE cterm=bold term=NONE
+hi TitleBar guifg=#00ffff guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=51 ctermbg=237 cterm=NONE term=NONE
+hi TitleBarNC guifg=#7f7f7f guibg=#2c2c2c guisp=NONE gui=NONE ctermfg=102 ctermbg=236 cterm=NONE term=NONE
+hi Todo guifg=#0000ff guibg=#ffff00 guisp=NONE gui=NONE ctermfg=21 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=bold ctermfg=16 ctermbg=254 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#60ff60 guibg=NONE guisp=NONE gui=bold ctermfg=83 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#80a0ff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=NONE
+hi Visual guifg=#000000 guibg=#a9a9a9 guisp=NONE gui=NONE ctermfg=16 ctermbg=145 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=#000000 guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=16 cterm=underline term=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
 
-if s:t_Co >= 256
-  hi Normal ctermfg=51 ctermbg=16 cterm=NONE
-  hi QuickFixLine ctermfg=231 ctermbg=29 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=160 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
-  hi Folded ctermfg=51 ctermbg=59 cterm=NONE
-  hi Conceal ctermfg=59 ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=51 cterm=NONE
-  hi Directory ctermfg=51 ctermbg=16 cterm=NONE
-  hi EndOfBuffer ctermfg=21 ctermbg=16 cterm=NONE
-  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-  hi FoldColumn ctermfg=51 ctermbg=NONE cterm=NONE
-  hi IncSearch ctermfg=NONE ctermbg=16 cterm=reverse
-  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=30 cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold
-  hi NonText ctermfg=21 ctermbg=NONE cterm=bold
-  hi Pmenu ctermfg=231 ctermbg=238 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=250 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=44 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=bold
-  hi PmenuMatchSel ctermfg=201 ctermbg=44 cterm=bold
-  hi Question ctermfg=46 ctermbg=NONE cterm=bold
-  hi Search ctermfg=16 ctermbg=226 cterm=NONE
-  hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=21 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=226 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=16 ctermbg=51 cterm=bold
-  hi StatusLineNC ctermfg=16 ctermbg=44 cterm=NONE
-  hi TabLine ctermfg=16 ctermbg=30 cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=16 cterm=reverse
-  hi TabLineSel ctermfg=51 ctermbg=16 cterm=bold
-  hi Terminal ctermfg=51 ctermbg=16 cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=bold
-  hi VertSplit ctermfg=16 ctermbg=44 cterm=NONE
-  hi Visual ctermfg=16 ctermbg=145 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
-  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Error ctermfg=231 ctermbg=196 cterm=NONE
-  hi Function ctermfg=231 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=87 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=16 ctermbg=16 cterm=NONE
-  hi Operator ctermfg=196 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=213 ctermbg=NONE cterm=NONE
-  hi Repeat ctermfg=231 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=196 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=131 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=21 ctermbg=226 cterm=NONE
-  hi Type ctermfg=83 ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=cyan ctermbg=black cterm=NONE
-  hi QuickFixLine ctermfg=white ctermbg=darkgreen cterm=NONE
   hi ColorColumn ctermfg=cyan ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=cyan cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=black ctermbg=cyan cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
   hi Directory ctermfg=cyan ctermbg=black cterm=NONE
   hi EndOfBuffer ctermfg=darkblue ctermbg=black cterm=NONE
+  hi Error ctermfg=white ctermbg=red cterm=NONE
   hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
   hi FoldColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Function ctermfg=white ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
   hi IncSearch ctermfg=NONE ctermbg=black cterm=reverse
   hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Operator ctermfg=red ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=magenta ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=magenta ctermbg=darkcyan cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
-  hi PmenuMatch ctermfg=magenta ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=magenta ctermbg=darkcyan cterm=bold
+  hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi Repeat ctermfg=white ctermbg=NONE cterm=NONE
   hi Search ctermfg=black ctermbg=yellow cterm=NONE
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=red ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=yellow ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
   hi StatusLine ctermfg=black ctermbg=cyan cterm=bold
   hi StatusLineNC ctermfg=black ctermbg=darkcyan cterm=NONE
   hi TabLine ctermfg=black ctermbg=darkcyan cterm=NONE
@@ -232,71 +181,73 @@ if s:t_Co >= 16
   hi TabLineSel ctermfg=cyan ctermbg=black cterm=bold
   hi Terminal ctermfg=cyan ctermbg=black cterm=NONE
   hi Title ctermfg=magenta ctermbg=NONE cterm=bold
+  hi TitleBar ctermfg=cyan ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE
+  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Visual ctermfg=black ctermbg=darkgrey cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
   hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
-  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Error ctermfg=white ctermbg=red cterm=NONE
-  hi Function ctermfg=white ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=black ctermbg=black cterm=NONE
-  hi Operator ctermfg=red ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Repeat ctermfg=white ctermbg=NONE cterm=NONE
-  hi Special ctermfg=red ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
-  hi Type ctermfg=green ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
   hi Normal ctermfg=darkcyan ctermbg=black cterm=NONE
-  hi QuickFixLine ctermfg=grey ctermbg=darkgreen cterm=NONE
   hi ColorColumn ctermfg=darkcyan ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=cyan cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=underline
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
   hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
   hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
   hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Function ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=NONE ctermbg=NONE cterm=reverse
   hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=black ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Operator ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=grey ctermbg=NONE cterm=NONE
+  hi PmenuMatch ctermfg=grey ctermbg=NONE cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
   hi PmenuSbar ctermfg=grey ctermbg=grey cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkcyan cterm=NONE
-  hi PmenuMatch ctermfg=grey ctermbg=NONE cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=grey ctermbg=darkgreen cterm=NONE
+  hi Repeat ctermfg=grey ctermbg=NONE cterm=NONE
   hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=darkyellow cterm=reverse
   hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi Statement ctermfg=darkred ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=darkcyan ctermbg=NONE cterm=bold,reverse
   hi StatusLineNC ctermfg=black ctermbg=darkcyan cterm=NONE
   hi TabLine ctermfg=black ctermbg=darkcyan cterm=NONE
@@ -304,154 +255,30 @@ if s:t_Co >= 8
   hi TabLineSel ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Terminal ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi TitleBar ctermfg=cyan ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Visual ctermfg=black ctermbg=grey cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
   hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
-  hi Function ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=black ctermbg=NONE cterm=NONE
-  hi Operator ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Repeat ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
   finish
 endif
 
-" Background: dark
-" Color: xterm0         #000000          16                black
-" Color: xterm1         #cd0000          160               darkred
-" Color: xterm2         #00cd00          40                darkgreen
-" Color: xterm3         #cdcd00          184               darkyellow
-" Color: xterm4         #0000ee          20                darkblue
-" Color: xterm5         #cd00cd          164               darkmagenta
-" Color: xterm6         #00cdcd          44                darkcyan
-" Color: xterm7         #e5e5e5          254               grey
-" Color: xterm8         #7f7f7f          102               darkgrey
-" Color: xterm9         #ff0000          196               red
-" Color: xterm10        #00ff00          46                green
-" Color: xterm11        #ffff00          226               yellow
-" Color: xterm12        #5c5cff          63                blue
-" Color: xterm13        #ff00ff          201               magenta
-" Color: xterm14        #00ffff          51                cyan
-" Color: xterm15        #ffffff          231               white
-" Color: Pmenu          #444444          238               darkgrey
-" Color: CursorLine     #3a3a3a          237               darkgrey
-" Color: rgbGrey40      #666666          59                darkgrey
-" Color: rgbDarkGrey    #a9a9a9          145               darkgrey
-" Color: rgbBlue        #0000ff          21                darkblue
-" Color: rgbDarkCyan    #008b8b          30                darkcyan
-" Color: Directory      #00ffff          51                cyan
-" Color: rgbSeaGreen    #2e8b57          29                darkgreen
-" Color: rgbGrey        #bebebe          250               grey
-" Color: Question       #00ff00          46                green
-" Color: SignColumn     #a9a9a9          248               grey
-" Color: SpecialKey     #00ffff          51                cyan
-" Color: Title          #ff00ff          201               magenta
-" Color: WarningMsg     #ff0000          196               red
-" Color: ToolbarLine    #7f7f7f          244               darkgrey
-" Color: Underlined     #80a0ff          111               blue
-" Color: elfComment     #80a0ff          111               blue
-" Color: elfIdentifier  #40ffff          87                cyan
-" Color: elfStatement   #aa4444          131               darkred
-" Color: elfPreProc     #ff80ff          213               magenta
-" Color: elfType        #60ff60          83                green
-" Color: elfBlue        #0000ff          21                blue
-" Term colors: xterm0 xterm1 xterm2 xterm3 xterm4 xterm5 xterm6 xterm7
-" Term colors: xterm8 xterm9 xterm10 xterm11 xterm12 xterm13
-" Term colors: xterm14 xterm15
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/evening.vim

@@ -2,48 +2,32 @@
 " Description:  This color scheme uses a dark grey background.
 " Author:       Original author Bram Moolenaar <Bram@vim.org>
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2024 Aug 15
+" Last Change:  2025 Oct 08
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta10
 
 set background=dark
 
 hi clear
 let g:colors_name = 'evening'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0087ff', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0087ff', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi! link VertSplit StatusLineNC
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
-hi! link TabLineFill TabLine
-hi! link Terminal Normal
-hi! link CursorColumn CursorLine
-hi! link CursorIM Cursor
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link Debug Special
 hi! link Added String
-hi! link Removed WarningMsg
-hi! link diffOnly WarningMsg
-hi! link diffNoEOL WarningMsg
-hi! link diffIsA WarningMsg
-hi! link diffIdentical WarningMsg
-hi! link diffDiffer WarningMsg
-hi! link diffCommon WarningMsg
-hi! link diffBDiffer WarningMsg
-hi! link lCursor Cursor
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
+hi! link CurSearch Search
+hi! link CursorColumn CursorLine
+hi! link CursorIM Cursor
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
+hi! link Debug Special
 hi! link Define PreProc
 hi! link Delimiter Special
 hi! link Exception Statement
@@ -52,488 +36,253 @@ hi! link Function Identifier
 hi! link Include PreProc
 hi! link Keyword Statement
 hi! link Label Statement
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
 hi! link Operator Statement
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
+hi! link Removed WarningMsg
 hi! link Repeat Statement
 hi! link SpecialChar Special
 hi! link SpecialComment Special
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link String Constant
 hi! link Structure Type
+hi! link TabLineFill TabLine
+hi! link TabPanel Normal
+hi! link TabPanelFill EndOfBuffer
 hi! link Tag Special
+hi! link Terminal Normal
 hi! link Typedef Type
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#8b0000 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=#666666 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#add8e6 guibg=#4d4d4d gui=NONE cterm=NONE
-hi StatusLine guifg=#333333 guibg=#ffffff gui=bold cterm=bold
-hi StatusLineNC guifg=#333333 guibg=#d3d3d3 gui=NONE cterm=NONE
-hi TabLineSel guifg=#333333 guibg=#ffffff gui=bold cterm=bold
-hi TabLine guifg=#333333 guibg=#d3d3d3 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff80ff guibg=#4d4d4d gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#8b008b guibg=#bebebe gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#4d4d4d gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#bebebe gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi QuickFixLine guifg=#ffffff guibg=#8b008b gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
-hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#00008b guibg=#d3d3d3 gui=bold cterm=bold
-hi IncSearch guifg=#00ff00 guibg=NONE gui=reverse cterm=reverse
-hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#add8e6 guibg=#4d4d4d gui=NONE cterm=NONE
-hi Question guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Search guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi SignColumn guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi ToolbarButton guifg=NONE guibg=#999999 gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Visual guifg=#ffffff guibg=#999999 gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=bold,underline
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold
-hi debugBreakpoint guifg=#00008b guibg=#ff0000 gui=NONE cterm=NONE
-hi debugPC guifg=#00008b guibg=#0000ff gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl cterm=underline
-hi SpellLocal guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline
-hi SpellRare guifg=#ff80ff guibg=NONE guisp=#ff80ff gui=undercurl cterm=underline
-hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#333333 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffff60 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#ffff00 guibg=#0000ff gui=reverse cterm=reverse
-hi Type guifg=#00ff00 guibg=NONE gui=bold cterm=bold
-hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link VertSplit StatusLineNC
+hi! link diffBDiffer WarningMsg
+hi! link diffCommon WarningMsg
+hi! link diffDiffer WarningMsg
+hi! link diffIdentical WarningMsg
+hi! link diffIsA WarningMsg
+hi! link diffNoEOL WarningMsg
+hi! link diffOnly WarningMsg
+hi! link lCursor Cursor
 
-if s:t_Co >= 256
-  hi! link VertSplit StatusLineNC
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLineFill TabLine
-  hi! link Terminal Normal
-  hi! link CursorColumn CursorLine
-  hi! link CursorIM Cursor
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Label Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Statement
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=88 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=241 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=241 cterm=NONE
-  hi EndOfBuffer ctermfg=153 ctermbg=239 cterm=NONE
-  hi StatusLine ctermfg=236 ctermbg=231 cterm=bold
-  hi StatusLineNC ctermfg=236 ctermbg=252 cterm=NONE
-  hi TabLineSel ctermfg=236 ctermbg=231 cterm=bold
-  hi TabLine ctermfg=236 ctermbg=252 cterm=NONE
-  hi PmenuMatch ctermfg=201 ctermbg=239 cterm=NONE
-  hi PmenuMatchSel ctermfg=90 ctermbg=250 cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=239 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=250 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi QuickFixLine ctermfg=231 ctermbg=90 cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
-  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=153 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=18 ctermbg=252 cterm=bold
-  hi IncSearch ctermfg=46 ctermbg=NONE cterm=reverse
-  hi MatchParen ctermfg=NONE ctermbg=30 cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=153 ctermbg=239 cterm=NONE
-  hi Question ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Search ctermfg=16 ctermbg=226 cterm=NONE
-  hi SignColumn ctermfg=30 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=246 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=231 ctermbg=246 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=bold
-  hi debugBreakpoint ctermfg=18 ctermbg=196 cterm=NONE
-  hi debugPC ctermfg=18 ctermbg=21 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=46 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=51 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
-  hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=236 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=227 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=226 ctermbg=21 cterm=reverse
-  hi Type ctermfg=46 ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#ffffff guibg=#333333 guisp=NONE gui=NONE ctermfg=231 ctermbg=236 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#8b0000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=88 cterm=NONE term=reverse
+hi Comment guifg=#80a0ff guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ffa0a0 guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#00ff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=46 cterm=NONE term=reverse
+hi CursorLine guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=241 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff00 guibg=#666666 guisp=NONE gui=NONE ctermfg=226 ctermbg=241 cterm=NONE term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#add8e6 guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=153 ctermbg=239 cterm=NONE term=NONE
+hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#add8e6 guibg=NONE guisp=NONE gui=NONE ctermfg=153 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00008b guibg=#d3d3d3 guisp=NONE gui=bold ctermfg=18 ctermbg=252 cterm=bold term=NONE
+hi Identifier guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#333333 guibg=NONE guisp=NONE gui=NONE ctermfg=236 ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#00ff00 guibg=NONE guisp=NONE gui=reverse ctermfg=46 ctermbg=NONE cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=#008b8b guisp=NONE gui=NONE ctermfg=NONE ctermbg=30 cterm=NONE term=bold,underline
+hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#add8e6 guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=153 ctermbg=239 cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=231 ctermbg=239 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff80ff guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=201 ctermbg=239 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#8b008b guibg=#bebebe guisp=NONE gui=NONE ctermfg=90 ctermbg=250 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#bebebe guisp=NONE gui=NONE ctermfg=16 ctermbg=250 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
+hi PreProc guifg=#ff80ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#ffffff guibg=#8b008b guisp=NONE gui=NONE ctermfg=231 ctermbg=90 cterm=NONE term=NONE
+hi Search guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=reverse
+hi SignColumn guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ffa500 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl ctermfg=46 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl ctermfg=51 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#ff80ff guibg=NONE guisp=#ff80ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffff60 guibg=NONE guisp=NONE gui=bold ctermfg=227 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#333333 guibg=#ffffff guisp=NONE gui=bold ctermfg=236 ctermbg=231 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#333333 guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=236 ctermbg=252 cterm=NONE term=bold,underline
+hi TabLine guifg=#333333 guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=236 ctermbg=252 cterm=NONE term=bold,underline
+hi TabLineSel guifg=#333333 guibg=#ffffff guisp=NONE gui=bold ctermfg=236 ctermbg=231 cterm=bold term=bold,reverse
+hi Title guifg=#ff80ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi TitleBar guifg=#ffffff guibg=#4c4c4c guisp=NONE gui=NONE ctermfg=231 ctermbg=237 cterm=NONE term=NONE
+hi TitleBarNC guifg=#bebebe guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=250 ctermbg=236 cterm=NONE term=NONE
+hi Todo guifg=#ffff00 guibg=#0000ff guisp=NONE gui=reverse ctermfg=226 ctermbg=21 cterm=reverse term=bold,reverse
+hi ToolbarButton guifg=NONE guibg=#999999 guisp=NONE gui=bold ctermfg=NONE ctermbg=246 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#00ff00 guibg=NONE guisp=NONE gui=bold ctermfg=46 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#80a0ff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi Visual guifg=#ffffff guibg=#999999 guisp=NONE gui=NONE ctermfg=231 ctermbg=246 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=NONE guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=bold,underline term=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=bold ctermfg=16 ctermbg=226 cterm=bold term=bold
+hi debugBreakpoint guifg=#00008b guibg=#ff0000 guisp=NONE gui=NONE ctermfg=18 ctermbg=196 cterm=NONE term=NONE
+hi debugPC guifg=#00008b guibg=#0000ff guisp=NONE gui=NONE ctermfg=18 ctermbg=21 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
-  hi! link VertSplit StatusLineNC
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLineFill TabLine
-  hi! link Terminal Normal
-  hi! link CursorColumn CursorLine
-  hi! link CursorIM Cursor
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Label Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Statement
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
   hi Normal ctermfg=white ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=lightblue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=lightblue ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=white cterm=NONE
-  hi StatusLineNC ctermfg=black ctermbg=gray cterm=NONE
-  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
-  hi TabLine ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuMatch ctermfg=white ctermbg=darkgray cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
-  hi Pmenu ctermfg=white ctermbg=darkgray cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
-  hi QuickFixLine ctermfg=white ctermbg=darkmagenta cterm=NONE
-  hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi Error ctermfg=red ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=darkgray ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=lightblue ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=gray cterm=bold
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=green ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=lightblue ctermbg=darkgray cterm=NONE
+  hi Pmenu ctermfg=white ctermbg=darkgray cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgray cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=white ctermbg=darkmagenta cterm=NONE
   hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=cyan ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=yellow ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=black ctermbg=white cterm=NONE
+  hi StatusLineNC ctermfg=black ctermbg=gray cterm=NONE
+  hi TabLine ctermfg=black ctermbg=gray cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi TitleBar ctermfg=white ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=gray ctermbg=black cterm=NONE
+  hi Todo ctermfg=darkyellow ctermbg=blue cterm=reverse
   hi ToolbarButton ctermfg=NONE ctermbg=darkgray cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=lightblue ctermbg=NONE cterm=underline
   hi Visual ctermfg=white ctermbg=darkgray cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
   hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
   hi debugBreakpoint ctermfg=darkblue ctermbg=red cterm=NONE
   hi debugPC ctermfg=darkblue ctermbg=blue cterm=NONE
-  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=cyan ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=underline
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=lightblue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=yellow ctermbg=NONE cterm=bold
-  hi Todo ctermfg=darkyellow ctermbg=blue cterm=reverse
-  hi Type ctermfg=green ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=lightblue ctermbg=NONE cterm=underline
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=gray ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=gray ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=bold
-  hi StatusLine ctermfg=gray ctermbg=black cterm=bold,reverse
-  hi StatusLineNC ctermfg=gray ctermbg=black cterm=reverse
-  hi TabLineSel ctermfg=gray ctermbg=black cterm=bold,reverse
-  hi TabLine ctermfg=gray ctermbg=black cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
-  hi QuickFixLine ctermfg=gray ctermbg=darkmagenta cterm=NONE
   hi Error ctermfg=red ctermbg=gray cterm=reverse
   hi ErrorMsg ctermfg=gray ctermbg=red cterm=NONE
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=gray cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=blue ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=gray ctermbg=darkmagenta cterm=NONE
   hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=gray ctermbg=black cterm=reverse
+  hi TabLine ctermfg=gray ctermbg=black cterm=reverse
+  hi TabLineSel ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi TitleBar ctermfg=white ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=gray ctermbg=black cterm=NONE
+  hi Todo ctermfg=darkyellow ctermbg=blue cterm=reverse
   hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
   hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
   hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
   hi debugBreakpoint ctermfg=darkblue ctermbg=darkred cterm=NONE
   hi debugPC ctermfg=darkblue ctermbg=darkyellow cterm=NONE
-  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
-  hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi SpellLocal ctermfg=darkcyan ctermbg=NONE cterm=reverse
-  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Todo ctermfg=darkyellow ctermbg=blue cterm=reverse
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorColumn term=NONE
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi VertSplit term=NONE
   finish
 endif
 
-" Background: dark
-" Color: lightmagenta  #ffa0a0           217               magenta
-" Color: blue          #0000ff           21                blue
-" Color: cyan          #00ffff           51                cyan
-" Color: yellow        #ffff00           226               darkyellow
-" Color: white         #ffffff           231               white
-" Color: black         #000000           16                black
-" Color: green         #00ff00           46                green
-" Color: magenta       #ff80ff           201               darkmagenta
-" Color: red           #ff0000           196               red
-" Color: lightyellow   #ffff60           227               yellow
-" Color: darkblue      #00008b           18                darkblue
-" Color: darkcyan      #008b8b           30                darkcyan
-" Color: darkmagenta   #8b008b           90                darkmagenta
-" Color: lightblue     #add8e6           153               lightblue
-" Color: orange        #ffa500           214               darkred
-" Color: seagreen      #2e8b57           29                darkgreen
-" Color: lightgrey     #d3d3d3           252               gray
-" Color: grey          #bebebe           250               gray
-" Color: grey20        #333333           236               gray
-" Color: grey30        #4d4d4d           239               darkgray
-" Color: grey40        #666666           241               darkgray
-" Color: grey60        #999999           246               darkgray
-" Color: comment       #80a0ff           111               lightblue
-" Color: darkred       #8b0000           88                darkred
-" Color: x_black       #000000           16                black
-" Color: x_darkred     #cd0000           160               darkred
-" Color: x_darkgreen   #00cd00           40                darkgreen
-" Color: x_darkyellow  #cdcd00           184               darkyellow
-" Color: x_darkblue_m  #0087ff           33                darkblue
-" Color: x_darkmagenta #cd00cd           164               darkmagenta
-" Color: x_darkcyan    #00cdcd           44                darkcyan
-" Color: x_gray        #e5e5e5           254               gray
-" Color: x_darkgray    #7f7f7f           244               darkgray
-" Color: x_red         #ff0000           196               red
-" Color: x_green       #00ff00           46                green
-" Color: x_yellow      #ffff00           226               yellow
-" Color: x_blue        #5c5cff           63                blue
-" Color: x_magenta     #ff00ff           201               magenta
-" Color: x_cyan        #00ffff           51                cyan
-" Color: x_white       #ffffff           231               white
-" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue_m x_darkmagenta x_darkcyan x_gray
-" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/habamax.vim

@@ -1,475 +1,344 @@
 " Name:         habamax
 " Description:  Hubba hubba hubba.
 " Author:       Maxim Kim <habamax@gmail.com>
-" Maintainer:   Maxim Kim <habamax@gmail.com>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2024 Aug 15
+" Last Change:  2025 Oct 22
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta10
 
 set background=dark
 
 hi clear
 let g:colors_name = 'habamax'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#1c1c1c', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d75f87', '#87d787', '#d7af87', '#5fafd7', '#d787d7', '#87afaf', '#bcbcbc']
-endif
-hi! link Terminal Normal
-hi! link StatuslineTerm Statusline
-hi! link StatuslineTermNC StatuslineNC
+let g:terminal_ansi_colors = ['#1c1c1c', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d75f87', '#87d787', '#d7af87', '#5fafd7', '#d787d7', '#87afaf', '#c7c7c7']
+
+hi! link CurSearch IncSearch
+hi! link CursorLineFold FoldColumn
+hi! link CursorLineSign FoldColumn
+hi! link Float Number
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
+hi! link PopupNotification Normal
+hi! link PopupSelected PmenuSel
+hi! link PreInsert NonText
+hi! link Quote String
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link TabPanel Normal
+hi! link TabPanelFill Normal
+hi! link Terminal Normal
+hi! link asciidoctorBlock Special
+hi! link asciidoctorCode String
+hi! link asciidoctorH1Delimiter Statement
+hi! link asciidoctorH2Delimiter Statement
+hi! link asciidoctorH3Delimiter Statement
+hi! link asciidoctorH4Delimiter Statement
+hi! link asciidoctorH5Delimiter Statement
+hi! link asciidoctorH6Delimiter Statement
+hi! link asciidoctorListMarker Constant
+hi! link asciidoctorMacro Special
+hi! link asciidoctorOption Special
+hi! link asciidoctorSetextHeaderDelimiter Statement
+hi! link asciidoctorTitleDelimiter Statement
 hi! link javaScriptFunction Statement
 hi! link javaScriptIdentifier Statement
-hi! link sqlKeyword Statement
-hi! link yamlBlockMappingKey Statement
-hi! link rubyMacro Statement
-hi! link rubyDefine Statement
-hi! link vimVar Normal
-hi! link vimOper Normal
-hi! link vimSep Normal
-hi! link vimParenSep Normal
-hi! link vimCommentString Comment
+hi! link lspDiagSignErrorText Removed
+hi! link lspDiagSignHintText Added
+hi! link lspDiagSignInfoText Question
+hi! link lspDiagSignWarningText Changed
+hi! link lspDiagVirtualTextError Removed
+hi! link lspDiagVirtualTextHint Added
+hi! link lspDiagVirtualTextInfo Question
+hi! link lspDiagVirtualTextWarning Changed
 hi! link markdownUrl String
-hi Normal guifg=#bcbcbc guibg=#1c1c1c gui=NONE cterm=NONE
-hi Statusline guifg=#1c1c1c guibg=#9e9e9e gui=NONE cterm=NONE
-hi StatuslineNC guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
-hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
-hi TabLine guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
-hi TabLineFill guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
-hi TabLineSel guifg=#1c1c1c guibg=#9e9e9e gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#767676 guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
-hi QuickFixLine guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
-hi CursorLineNr guifg=#dadada guibg=NONE gui=bold cterm=bold
-hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi LineNrAbove guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi LineNrBelow guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#87afaf guibg=#1c1c1c gui=reverse cterm=reverse
-hi VisualNOS guifg=#1c1c1c guibg=#5f8787 gui=NONE cterm=NONE
-hi Pmenu guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#767676 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=NONE guibg=#585858 gui=NONE cterm=NONE
-hi PmenuKind guifg=#5f8787 guibg=#3a3a3a gui=NONE cterm=NONE
-hi PmenuKindSel guifg=#5f8787 guibg=#585858 gui=NONE cterm=NONE
-hi PmenuExtra guifg=#767676 guibg=#3a3a3a gui=NONE cterm=NONE
-hi PmenuExtraSel guifg=#9e9e9e guibg=#585858 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ffaf5f guibg=#3a3a3a gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ffaf5f guibg=#585858 gui=NONE cterm=NONE
-hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Error guifg=#af5f5f guibg=#1c1c1c gui=reverse cterm=reverse
-hi ErrorMsg guifg=#af5f5f guibg=#1c1c1c gui=reverse cterm=reverse
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi MoreMsg guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
-hi Question guifg=#d7af87 guibg=NONE gui=NONE cterm=NONE
-hi WarningMsg guifg=#d75f87 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#dadada guibg=NONE gui=bold cterm=bold
-hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
-hi Search guifg=#5fafd7 guibg=#1c1c1c gui=reverse cterm=reverse
-hi IncSearch guifg=#ffaf5f guibg=#1c1c1c gui=reverse cterm=reverse
-hi CurSearch guifg=#ffaf5f guibg=#1c1c1c gui=reverse cterm=reverse
-hi WildMenu guifg=#1c1c1c guibg=#d7af87 gui=bold cterm=bold
-hi debugPC guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#1c1c1c guibg=#d75f87 gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
-hi lCursor guifg=#1c1c1c guibg=#5fff00 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-hi Folded guifg=#9e9e9e guibg=#262626 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi SpellCap guifg=NONE guibg=NONE guisp=#ffaf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi SpellLocal guifg=NONE guibg=NONE guisp=#5fd75f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi SpellRare guifg=NONE guibg=NONE guisp=#d787d7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#d75f87 guibg=NONE gui=NONE cterm=NONE
-hi String guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
-hi Character guifg=#87d787 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#87afaf guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#af87af guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#af875f guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#5f87af guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi Directory guifg=#87afaf guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Debug guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
-hi DiffAdd guifg=#5faf5f guibg=NONE gui=reverse cterm=reverse
-hi DiffChange guifg=#5f87af guibg=NONE gui=reverse cterm=reverse
-hi DiffText guifg=#af87af guibg=NONE gui=reverse cterm=reverse
-hi DiffDelete guifg=#af5f5f guibg=NONE gui=reverse cterm=reverse
-hi Added guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
-hi Changed guifg=#ffaf5f guibg=NONE gui=NONE cterm=NONE
-hi Removed guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
+hi! link rubyDefine Statement
+hi! link rubyMacro Statement
+hi! link sqlKeyword Statement
+hi! link sqlSpecial Constant
+hi! link vimCommentString Comment
+hi! link vimOper Normal
+hi! link vimParenSep Normal
+hi! link vimSep Normal
+hi! link vimVar Normal
+hi! link yamlBlockMappingKey Statement
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link StatuslineTerm Statusline
-  hi! link StatuslineTermNC StatuslineNC
-  hi! link MessageWindow Pmenu
-  hi! link javaScriptFunction Statement
-  hi! link javaScriptIdentifier Statement
-  hi! link sqlKeyword Statement
-  hi! link yamlBlockMappingKey Statement
-  hi! link rubyMacro Statement
-  hi! link rubyDefine Statement
-  hi! link vimVar Normal
-  hi! link vimOper Normal
-  hi! link vimSep Normal
-  hi! link vimParenSep Normal
-  hi! link vimCommentString Comment
-  hi! link markdownUrl String
-  hi Normal ctermfg=250 ctermbg=234 cterm=NONE
-  hi Statusline ctermfg=234 ctermbg=247 cterm=NONE
-  hi StatuslineNC ctermfg=234 ctermbg=243 cterm=NONE
-  hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
-  hi TabLine ctermfg=234 ctermbg=243 cterm=NONE
-  hi TabLineFill ctermfg=234 ctermbg=243 cterm=NONE
-  hi TabLineSel ctermfg=234 ctermbg=247 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=243 ctermbg=234 cterm=bold,reverse
-  hi QuickFixLine ctermfg=234 ctermbg=67 cterm=NONE
-  hi CursorLineNr ctermfg=253 ctermbg=NONE cterm=bold
-  hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
-  hi LineNrAbove ctermfg=240 ctermbg=NONE cterm=NONE
-  hi LineNrBelow ctermfg=240 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=109 ctermbg=234 cterm=reverse
-  hi VisualNOS ctermfg=234 ctermbg=66 cterm=NONE
-  hi Pmenu ctermfg=NONE ctermbg=237 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=NONE ctermbg=240 cterm=NONE
-  hi PmenuKind ctermfg=66 ctermbg=237 cterm=NONE
-  hi PmenuKindSel ctermfg=66 ctermbg=240 cterm=NONE
-  hi PmenuExtra ctermfg=243 ctermbg=237 cterm=NONE
-  hi PmenuExtraSel ctermfg=247 ctermbg=240 cterm=NONE
-  hi PmenuMatch ctermfg=215 ctermbg=237 cterm=NONE
-  hi PmenuMatchSel ctermfg=215 ctermbg=240 cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error ctermfg=131 ctermbg=234 cterm=reverse
-  hi ErrorMsg ctermfg=131 ctermbg=234 cterm=reverse
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=71 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=180 ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=168 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=253 ctermbg=NONE cterm=bold
-  hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
-  hi Search ctermfg=74 ctermbg=234 cterm=reverse
-  hi IncSearch ctermfg=215 ctermbg=234 cterm=reverse
-  hi CurSearch ctermfg=215 ctermbg=234 cterm=reverse
-  hi WildMenu ctermfg=234 ctermbg=180 cterm=bold
-  hi debugPC ctermfg=234 ctermbg=67 cterm=NONE
-  hi debugBreakpoint ctermfg=234 ctermbg=168 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
-  hi Folded ctermfg=247 ctermbg=235 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE
-  hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=215 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=176 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=243 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=168 ctermbg=NONE cterm=NONE
-  hi String ctermfg=71 ctermbg=NONE cterm=NONE
-  hi Character ctermfg=114 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=109 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=139 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=137 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=67 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=66 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Directory ctermfg=109 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=240 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Debug ctermfg=66 ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=71 ctermbg=NONE cterm=reverse
-  hi DiffChange ctermfg=67 ctermbg=NONE cterm=reverse
-  hi DiffText ctermfg=139 ctermbg=NONE cterm=reverse
-  hi DiffDelete ctermfg=131 ctermbg=NONE cterm=reverse
-  hi Added ctermfg=77 ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=215 ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=167 ctermbg=NONE cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#c7c7c7 guibg=#1c1c1c guisp=NONE gui=NONE ctermfg=251 ctermbg=234 cterm=NONE term=NONE
+hi Added guifg=#5fd75f guibg=NONE guisp=NONE gui=NONE ctermfg=77 ctermbg=NONE cterm=NONE term=NONE
+hi Changed guifg=#ffaf5f guibg=NONE guisp=NONE gui=NONE ctermfg=215 ctermbg=NONE cterm=NONE term=NONE
+hi Character guifg=#87d787 guibg=NONE guisp=NONE gui=NONE ctermfg=114 ctermbg=NONE cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=reverse
+hi Comment guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#d75f87 guibg=NONE guisp=NONE gui=NONE ctermfg=168 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#dadada guisp=NONE gui=NONE ctermfg=16 ctermbg=253 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=underline
+hi CursorLineNr guifg=#dadada guibg=NONE guisp=NONE gui=bold ctermfg=253 ctermbg=NONE cterm=bold term=bold
+hi Debug guifg=#5f8787 guibg=NONE guisp=NONE gui=NONE ctermfg=66 ctermbg=NONE cterm=NONE term=NONE
+hi DiffAdd guifg=NONE guibg=#273923 guisp=NONE gui=NONE ctermfg=247 ctermbg=22 cterm=NONE term=reverse
+hi DiffChange guifg=NONE guibg=#37352f guisp=NONE gui=NONE ctermfg=247 ctermbg=237 cterm=NONE term=NONE
+hi DiffDelete guifg=#767676 guibg=#2f1f1a guisp=NONE gui=NONE ctermfg=243 ctermbg=52 cterm=NONE term=reverse
+hi DiffText guifg=NONE guibg=#0f4f4f guisp=NONE gui=NONE ctermfg=247 ctermbg=23 cterm=NONE term=reverse
+hi Directory guifg=#87afaf guibg=NONE guisp=NONE gui=bold ctermfg=109 ctermbg=NONE cterm=bold term=NONE
+hi EndOfBuffer guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=NONE guibg=#a03f2f guisp=NONE gui=NONE ctermfg=131 ctermbg=234 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#af5f5f guibg=#1c1c1c guisp=NONE gui=reverse ctermfg=131 ctermbg=234 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#9e9e9e guibg=#262626 guisp=NONE gui=NONE ctermfg=247 ctermbg=235 cterm=NONE term=NONE
+hi Identifier guifg=#87afaf guibg=NONE guisp=NONE gui=NONE ctermfg=109 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=NONE guibg=#5a4a45 guisp=NONE gui=NONE ctermfg=215 ctermbg=234 cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#ff00af guibg=NONE guisp=NONE gui=bold ctermfg=199 ctermbg=NONE cterm=bold term=bold,underline
+hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#5faf5f guibg=NONE guisp=NONE gui=NONE ctermfg=71 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=NONE guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=reverse
+hi PmenuBorder guifg=#767676 guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=243 ctermbg=237 cterm=NONE term=NONE
+hi PmenuExtra guifg=#767676 guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=243 ctermbg=237 cterm=NONE term=NONE
+hi PmenuExtraSel guifg=#9e9e9e guibg=#585858 guisp=NONE gui=NONE ctermfg=247 ctermbg=240 cterm=NONE term=NONE
+hi PmenuKind guifg=#5f8787 guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=66 ctermbg=237 cterm=NONE term=NONE
+hi PmenuKindSel guifg=#5f8787 guibg=#585858 guisp=NONE gui=NONE ctermfg=66 ctermbg=240 cterm=NONE term=NONE
+hi PmenuMatch guifg=#ffaf5f guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=215 ctermbg=237 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ffaf5f guibg=#585858 guisp=NONE gui=NONE ctermfg=215 ctermbg=240 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=NONE guibg=#585858 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE term=bold
+hi PmenuShadow guifg=#767676 guibg=#121212 guisp=NONE gui=NONE ctermfg=243 ctermbg=233 cterm=NONE term=NONE
+hi PmenuThumb guifg=NONE guibg=#767676 guisp=NONE gui=NONE ctermfg=NONE ctermbg=243 cterm=NONE term=NONE
+hi PreProc guifg=#af875f guibg=NONE guisp=NONE gui=NONE ctermfg=137 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#d7af87 guibg=NONE guisp=NONE gui=NONE ctermfg=180 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=NONE guibg=#4f2f4f guisp=NONE gui=NONE ctermfg=251 ctermbg=53 cterm=NONE term=NONE
+hi Removed guifg=#d75f5f guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE
+hi Search guifg=NONE guibg=#374a44 guisp=NONE gui=NONE ctermfg=114 ctermbg=234 cterm=reverse term=reverse
+hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#5f8787 guibg=NONE guisp=NONE gui=NONE ctermfg=66 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=167 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=NONE guibg=NONE guisp=#ffaf5f gui=undercurl ctermfg=215 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=NONE guibg=NONE guisp=#5fd75f gui=undercurl ctermfg=77 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=NONE guibg=NONE guisp=#d787d7 gui=undercurl ctermfg=176 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#af87af guibg=NONE guisp=NONE gui=NONE ctermfg=139 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#1c1c1c guibg=#9e9e9e guisp=NONE gui=NONE ctermfg=234 ctermbg=247 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#1c1c1c guibg=#767676 guisp=NONE gui=NONE ctermfg=234 ctermbg=243 cterm=NONE term=bold,underline
+hi String guifg=#5faf5f guibg=NONE guisp=NONE gui=NONE ctermfg=71 ctermbg=NONE cterm=NONE term=NONE
+hi TabLine guifg=#1c1c1c guibg=#767676 guisp=NONE gui=NONE ctermfg=234 ctermbg=243 cterm=NONE term=bold,underline
+hi TabLineFill guifg=#1c1c1c guibg=#767676 guisp=NONE gui=NONE ctermfg=234 ctermbg=243 cterm=NONE term=NONE
+hi TabLineSel guifg=#1c1c1c guibg=#9e9e9e guisp=NONE gui=bold ctermfg=234 ctermbg=247 cterm=bold term=bold,reverse
+hi Title guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=NONE
+hi TitleBar guifg=#dadada guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=253 ctermbg=237 cterm=NONE term=NONE
+hi TitleBarNC guifg=#767676 guibg=#2c2c2c guisp=NONE gui=NONE ctermfg=243 ctermbg=236 cterm=NONE term=NONE
+hi Todo guifg=#dadada guibg=NONE guisp=NONE gui=bold ctermfg=253 ctermbg=NONE cterm=bold term=bold,reverse
+hi ToolbarButton guifg=#767676 guibg=#1c1c1c guisp=NONE gui=bold,reverse ctermfg=243 ctermbg=234 cterm=bold,reverse term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#5f87af guibg=NONE guisp=NONE gui=NONE ctermfg=67 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#767676 guibg=#767676 guisp=NONE gui=NONE ctermfg=243 ctermbg=243 cterm=NONE term=NONE
+hi Visual guifg=NONE guibg=#1a3456 guisp=NONE gui=NONE ctermfg=109 ctermbg=234 cterm=reverse term=reverse
+hi VisualNOS guifg=#1c1c1c guibg=#5f8787 guisp=NONE gui=NONE ctermfg=234 ctermbg=66 cterm=NONE term=NONE
+hi WarningMsg guifg=#d75f87 guibg=NONE guisp=NONE gui=NONE ctermfg=168 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#1c1c1c guibg=#d7af87 guisp=NONE gui=bold ctermfg=234 ctermbg=180 cterm=bold term=bold
+hi debugBreakpoint guifg=#1c1c1c guibg=#d75f87 guisp=NONE gui=NONE ctermfg=234 ctermbg=168 cterm=NONE term=NONE
+hi debugPC guifg=#1c1c1c guibg=#5f87af guisp=NONE gui=NONE ctermfg=234 ctermbg=67 cterm=NONE term=NONE
+hi lCursor guifg=#1c1c1c guibg=#5fff00 guisp=NONE gui=NONE ctermfg=234 ctermbg=82 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
+  if s:tgc
+    hi Error cterm=NONE
+    hi IncSearch cterm=NONE
+    hi QuickFixLine cterm=NONE
+    hi Search cterm=NONE
+    hi SpellBad guifg=#d75f5f guibg=NONE ctermfg=167 ctermbg=NONE cterm=underline
+    hi SpellCap guifg=#ffaf5f guibg=NONE ctermfg=215 ctermbg=NONE cterm=underline
+    hi SpellLocal guifg=#5fd75f guibg=NONE ctermfg=77 ctermbg=NONE cterm=underline
+    hi SpellRare guifg=#d787d7 guibg=NONE ctermfg=176 ctermbg=NONE cterm=underline
+    hi Visual cterm=NONE
+  endif
   finish
 endif
 
 if s:t_Co >= 16
-  hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi Statusline ctermfg=black ctermbg=gray cterm=NONE
-  hi StatuslineNC ctermfg=black ctermbg=darkgray cterm=NONE
-  hi VertSplit ctermfg=darkgray ctermbg=darkgray cterm=NONE
-  hi TabLine ctermfg=black ctermbg=darkgray cterm=NONE
-  hi TabLineFill ctermfg=black ctermbg=darkgray cterm=NONE
-  hi TabLineSel ctermfg=black ctermbg=gray cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=darkgray ctermbg=black cterm=bold,reverse
-  hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE
-  hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold
-  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi LineNrAbove ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi LineNrBelow ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Normal ctermfg=gray ctermbg=black cterm=NONE
+  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=white cterm=NONE
+  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi DiffChange ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+  hi DiffText ctermfg=darkblue ctermbg=black cterm=reverse
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=bold
   hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=cyan ctermbg=black cterm=reverse
-  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
-  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-  hi PmenuExtra ctermfg=darkgray ctermbg=gray cterm=NONE
-  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=gray cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error ctermfg=darkred ctermbg=black cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
+  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=gray ctermbg=NONE cterm=underline
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuBorder ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuMatch ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuMatchSel ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi PmenuShadow ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=white ctermbg=NONE cterm=bold
-  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
-  hi Search ctermfg=blue ctermbg=black cterm=reverse
-  hi IncSearch ctermfg=red ctermbg=black cterm=reverse
-  hi CurSearch ctermfg=red ctermbg=black cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
-  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
-  hi debugBreakpoint ctermfg=black ctermbg=red cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
+  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Search ctermfg=green ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
-  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=red ctermbg=NONE cterm=NONE
-  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Character ctermfg=green ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=black ctermbg=gray cterm=NONE
+  hi StatusLineNC ctermfg=black ctermbg=darkgray cterm=NONE
+  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi TabLine ctermfg=black ctermbg=darkgray cterm=NONE
+  hi TabLineFill ctermfg=black ctermbg=darkgray cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=gray cterm=bold
   hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
-  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
-  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
-  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
-  unlet s:t_Co
+  hi TitleBar ctermfg=white ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=darkgray ctermbg=black cterm=NONE
+  hi Todo ctermfg=white ctermbg=NONE cterm=bold
+  hi ToolbarButton ctermfg=darkgray ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkgray ctermbg=darkgray cterm=NONE
+  hi Visual ctermfg=cyan ctermbg=black cterm=reverse
+  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
+  hi debugBreakpoint ctermfg=black ctermbg=red cterm=NONE
+  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
+  hi lCursor ctermfg=black ctermbg=green cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=gray ctermbg=black cterm=NONE
-  hi Statusline ctermfg=gray ctermbg=black cterm=bold,reverse
-  hi StatuslineNC ctermfg=gray ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=gray ctermbg=gray cterm=NONE
+  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=white cterm=NONE
+  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi DiffChange ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+  hi DiffText ctermfg=darkblue ctermbg=black cterm=reverse
+  hi Directory ctermfg=NONE ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=black cterm=reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=gray ctermbg=NONE cterm=underline
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuBorder ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuMatch ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuMatchSel ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi PmenuShadow ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
+  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
+  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=gray cterm=NONE
+  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi TabLine ctermfg=black ctermbg=gray cterm=NONE
   hi TabLineFill ctermfg=gray ctermbg=gray cterm=NONE
   hi TabLineSel ctermfg=black ctermbg=gray cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=gray ctermbg=black cterm=reverse
-  hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE
-  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi LineNr ctermfg=gray ctermbg=NONE cterm=bold
-  hi LineNrAbove ctermfg=gray ctermbg=NONE cterm=bold
-  hi LineNrBelow ctermfg=gray ctermbg=NONE cterm=bold
-  hi NonText ctermfg=gray ctermbg=NONE cterm=bold
-  hi EndOfBuffer ctermfg=gray ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold
-  hi FoldColumn ctermfg=gray ctermbg=NONE cterm=bold
-  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
-  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-  hi PmenuExtra ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=gray cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse
-  hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=gray ctermbg=NONE cterm=bold
-  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
-  hi Search ctermfg=black ctermbg=darkblue cterm=NONE
-  hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
-  hi debugBreakpoint ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi SpellBad ctermfg=darkred ctermbg=gray cterm=reverse
-  hi SpellCap ctermfg=darkblue ctermbg=gray cterm=reverse
-  hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
-  hi SpellRare ctermfg=darkmagenta ctermbg=gray cterm=reverse
-  hi Comment ctermfg=gray ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
-  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
-  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
-  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
-  unlet s:t_Co
+  hi TitleBar ctermfg=white ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=darkgray ctermbg=black cterm=NONE
+  hi Todo ctermfg=white ctermbg=NONE cterm=bold
+  hi ToolbarButton ctermfg=gray ctermbg=black cterm=reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=gray ctermbg=gray cterm=NONE
+  hi Visual ctermfg=darkcyan ctermbg=black cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi lCursor ctermfg=black ctermbg=green cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: color00          #1c1c1c        234            black
-" Color: color08          #767676        243            darkgray
-" Color: color01          #af5f5f        131            darkred
-" Color: color09          #d75f87        168            red
-" Color: color02          #5faf5f        71             darkgreen
-" Color: color10          #87d787        114            green
-" Color: color03          #af875f        137            darkyellow
-" Color: color11          #d7af87        180            yellow
-" Color: color04          #5f87af        67             darkblue
-" Color: color12          #5fafd7        74             blue
-" Color: color05          #af87af        139            darkmagenta
-" Color: color13          #d787d7        176            magenta
-" Color: color06          #5f8787        66             darkcyan
-" Color: color14          #87afaf        109            cyan
-" Color: color07          #9e9e9e        247            gray
-" Color: color15          #bcbcbc        250            white
-" Color: colorLine        #303030        236            darkgrey
-" Color: colorB           #3a3a3a        237            darkgrey
-" Color: colorF           #262626        235            darkgrey
-" Color: colorNonT        #585858        240            darkgrey
-" Color: colorC           #ffaf5f        215            red
-" Color: colorlC          #5fff00        82             green
-" Color: colorV           #1f3f5f        109            cyan
-" Color: colorMP          #ff00af        199            magenta
-" Color: diffAdd          #5faf5f        71             darkgreen
-" Color: diffDelete       #af5f5f        131            darkred
-" Color: diffChange       #5f87af        67             darkblue
-" Color: diffText         #af87af        139            darkmagenta
-" Color: black            #000000        16             black
-" Color: white            #dadada        253            white
-" Color: Added            #5fd75f        77             darkgreen
-" Color: Changed          #ffaf5f        215            darkyellow
-" Color: Removed          #d75f5f        167            darkred
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
 " vim: et ts=8 sw=2 sts=2

runtime/colors/industry.vim

@@ -2,419 +2,259 @@
 " Description:  "industry" stands for 'industrial' color scheme.
 " Author:       Original author Shian Lee.
 " Maintainer:   Original maintainer Shian Lee.
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2024 Aug 15
+" Last Change:  2025 Oct 08
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta10
 
 set background=dark
 
 hi clear
 let g:colors_name = 'industry'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#303030', '#870000', '#5fd75f', '#afaf00', '#87afff', '#af00af', '#00afaf', '#6c6c6c', '#444444', '#ff0000', '#00ff00', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#303030', '#870000', '#5fd75f', '#afaf00', '#87afff', '#af00af', '#00afaf', '#6c6c6c', '#444444', '#ff0000', '#00ff00', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi Normal guifg=#dadada guibg=#000000 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#444444 guibg=#000000 gui=NONE cterm=NONE
-hi StatusLine guifg=#000000 guibg=#dadada gui=bold cterm=bold
-hi StatusLineNC guifg=#000000 guibg=#6c6c6c gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#000000 guibg=#00ff00 gui=bold cterm=bold
-hi StatusLineTermNC guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE
-hi VertSplit guifg=#000000 guibg=#6c6c6c gui=NONE cterm=NONE
-hi Pmenu guifg=#dadada guibg=#444444 gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#000000 gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 gui=NONE cterm=NONE
-hi TabLine guifg=#dadada guibg=#444444 gui=NONE cterm=NONE
-hi TabLineFill guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
-hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold
-hi ToolbarButton guifg=#dadada guibg=#6c6c6c gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-hi NonText guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#00afaf guibg=#303030 gui=NONE cterm=NONE
-hi Visual guifg=#dadada guibg=#6c6c6c gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold
-hi ColorColumn guifg=NONE guibg=#444444 gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#ff00ff gui=NONE cterm=NONE
-hi VisualNOS guifg=#dadada guibg=#6c6c6c gui=NONE cterm=NONE
-hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi SignColumn guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#87afff guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi ModeMsg guifg=#ffffff guibg=NONE gui=bold cterm=bold
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=bold cterm=bold
-hi MoreMsg guifg=#5fd75f guibg=NONE gui=bold cterm=bold
-hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#005fff guibg=#ffff00 gui=NONE cterm=NONE
-hi MatchParen guifg=#303030 guibg=#afaf00 gui=NONE cterm=NONE
-hi Search guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi IncSearch guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
-hi lCursor guifg=#000000 guibg=#ff0000 gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#005fff guibg=NONE guisp=#005fff gui=undercurl cterm=underline
-hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi SpellRare guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl cterm=underline
-hi Comment guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
-hi Function guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffffff guibg=NONE gui=bold cterm=bold
-hi Constant guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#00ff00 guibg=NONE gui=bold cterm=bold
-hi Special guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi Delimiter guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Conceal guifg=#6c6c6c guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link Float Number
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
 hi! link PopupNotification Todo
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link TabPanel Normal
+hi! link TabPanelFill Normal
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi Normal ctermfg=253 ctermbg=16 cterm=NONE
-  hi EndOfBuffer ctermfg=238 ctermbg=16 cterm=NONE
-  hi StatusLine ctermfg=16 ctermbg=253 cterm=bold
-  hi StatusLineNC ctermfg=16 ctermbg=242 cterm=NONE
-  hi StatusLineTerm ctermfg=16 ctermbg=46 cterm=bold
-  hi StatusLineTermNC ctermfg=16 ctermbg=77 cterm=NONE
-  hi VertSplit ctermfg=16 ctermbg=242 cterm=NONE
-  hi Pmenu ctermfg=253 ctermbg=238 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=16 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=242 cterm=NONE
-  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=NONE
-  hi PmenuMatchSel ctermfg=201 ctermbg=226 cterm=NONE
-  hi TabLine ctermfg=253 ctermbg=238 cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=242 cterm=NONE
-  hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold
-  hi ToolbarButton ctermfg=253 ctermbg=242 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=236 cterm=NONE
-  hi NonText ctermfg=37 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=37 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=37 ctermbg=236 cterm=NONE
-  hi Visual ctermfg=253 ctermbg=242 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=242 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=242 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
-  hi ColorColumn ctermfg=NONE ctermbg=238 cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=201 cterm=NONE
-  hi VisualNOS ctermfg=253 ctermbg=242 cterm=NONE
-  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=37 ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=37 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi Error ctermfg=231 ctermbg=196 cterm=NONE
-  hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
-  hi ModeMsg ctermfg=231 ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=77 ctermbg=NONE cterm=bold
-  hi Question ctermfg=46 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=27 ctermbg=226 cterm=NONE
-  hi MatchParen ctermfg=236 ctermbg=142 cterm=NONE
-  hi Search ctermfg=16 ctermbg=226 cterm=NONE
-  hi IncSearch ctermfg=16 ctermbg=46 cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=253 cterm=NONE
-  hi lCursor ctermfg=16 ctermbg=196 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=27 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=201 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=46 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=37 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Function ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=231 ctermbg=NONE cterm=bold
-  hi Constant ctermfg=51 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=226 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=46 ctermbg=NONE cterm=bold
-  hi Special ctermfg=196 ctermbg=NONE cterm=NONE
-  hi Delimiter ctermfg=226 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=242 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=bold
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#dadada guibg=#000000 guisp=NONE gui=NONE ctermfg=253 ctermbg=16 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#444444 guisp=NONE gui=NONE ctermfg=NONE ctermbg=238 cterm=NONE term=reverse
+hi Comment guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#6c6c6c guibg=NONE guisp=NONE gui=NONE ctermfg=242 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#dadada guisp=NONE gui=NONE ctermfg=16 ctermbg=253 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=bold ctermfg=226 ctermbg=NONE cterm=bold term=bold
+hi Delimiter guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#444444 guibg=#000000 guisp=NONE gui=NONE ctermfg=238 ctermbg=16 cterm=NONE term=NONE
+hi Error guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00afaf guibg=#303030 guisp=NONE gui=NONE ctermfg=37 ctermbg=236 cterm=NONE term=NONE
+hi Function guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=NONE
+hi Identifier guifg=#ff00ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#000000 guibg=#00ff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=46 cterm=NONE term=bold,reverse,underline
+hi LineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#303030 guibg=#afaf00 guisp=NONE gui=NONE ctermfg=236 ctermbg=142 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#ffffff guibg=NONE guisp=NONE gui=bold ctermfg=231 ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#5fd75f guibg=NONE guisp=NONE gui=bold ctermfg=77 ctermbg=NONE cterm=bold term=NONE
+hi NonText guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#dadada guibg=#444444 guisp=NONE gui=NONE ctermfg=253 ctermbg=238 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff00ff guibg=#444444 guisp=NONE gui=NONE ctermfg=201 ctermbg=238 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 guisp=NONE gui=NONE ctermfg=201 ctermbg=226 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 cterm=NONE term=NONE
+hi PreProc guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=bold ctermfg=46 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#000000 guibg=#ff00ff guisp=NONE gui=NONE ctermfg=16 ctermbg=201 cterm=NONE term=NONE
+hi Search guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=reverse
+hi SignColumn guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#005fff guibg=NONE guisp=#005fff gui=undercurl ctermfg=27 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl ctermfg=46 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffffff guibg=NONE guisp=NONE gui=bold ctermfg=231 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#000000 guibg=#dadada guisp=NONE gui=bold ctermfg=16 ctermbg=253 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#000000 guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=16 ctermbg=242 cterm=NONE term=bold,underline
+hi StatusLineTerm guifg=#000000 guibg=#00ff00 guisp=NONE gui=bold ctermfg=16 ctermbg=46 cterm=bold term=bold,reverse
+hi StatusLineTermNC guifg=#000000 guibg=#5fd75f guisp=NONE gui=NONE ctermfg=16 ctermbg=77 cterm=NONE term=bold,underline
+hi TabLine guifg=#dadada guibg=#444444 guisp=NONE gui=NONE ctermfg=253 ctermbg=238 cterm=NONE term=bold,underline
+hi TabLineFill guifg=NONE guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 cterm=NONE term=NONE
+hi TabLineSel guifg=#ffffff guibg=#000000 guisp=NONE gui=bold ctermfg=231 ctermbg=16 cterm=bold term=bold,reverse
+hi Title guifg=#ff00ff guibg=NONE guisp=NONE gui=bold ctermfg=201 ctermbg=NONE cterm=bold term=NONE
+hi TitleBar guifg=#dadada guibg=#4c4c4c guisp=NONE gui=NONE ctermfg=253 ctermbg=237 cterm=NONE term=NONE
+hi TitleBarNC guifg=#6c6c6c guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=242 ctermbg=236 cterm=NONE term=NONE
+hi Todo guifg=#005fff guibg=#ffff00 guisp=NONE gui=NONE ctermfg=27 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=reverse
+hi Type guifg=#00ff00 guibg=NONE guisp=NONE gui=bold ctermfg=46 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#87afff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#000000 guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=16 ctermbg=242 cterm=NONE term=NONE
+hi Visual guifg=#dadada guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=253 ctermbg=242 cterm=NONE term=reverse
+hi VisualNOS guifg=#dadada guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=253 ctermbg=242 cterm=NONE term=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE guisp=NONE gui=bold ctermfg=196 ctermbg=NONE cterm=bold term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi lCursor guifg=#000000 guibg=#ff0000 guisp=NONE gui=NONE ctermfg=16 ctermbg=196 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=darkgrey ctermbg=black cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=white cterm=bold
-  hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineTerm ctermfg=black ctermbg=green cterm=bold
-  hi StatusLineTermNC ctermfg=black ctermbg=darkgreen cterm=NONE
-  hi VertSplit ctermfg=black ctermbg=grey cterm=NONE
-  hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
-  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
-  hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
-  hi TabLineSel ctermfg=white ctermbg=black cterm=bold
-  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=black ctermbg=grey cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
   hi ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
-  hi VisualNOS ctermfg=white ctermbg=grey cterm=NONE
-  hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=white cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
+  hi Delimiter ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=darkgrey ctermbg=black cterm=NONE
   hi Error ctermfg=white ctermbg=red cterm=NONE
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
-  hi ModeMsg ctermfg=white ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Question ctermfg=green ctermbg=NONE cterm=bold
-  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Search ctermfg=black ctermbg=yellow cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Function ctermfg=green ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=green cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
-  hi Cursor ctermfg=black ctermbg=white cterm=NONE
-  hi lCursor ctermfg=black ctermbg=red cterm=NONE
+  hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=white ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PreProc ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi Question ctermfg=green ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
+  hi Search ctermfg=black ctermbg=yellow cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=red ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=magenta ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=green ctermbg=NONE cterm=underline
-  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Function ctermfg=green ctermbg=NONE cterm=NONE
   hi Statement ctermfg=white ctermbg=NONE cterm=bold
-  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=green ctermbg=NONE cterm=bold
-  hi Special ctermfg=red ctermbg=NONE cterm=NONE
-  hi Delimiter ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=white cterm=bold
+  hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
+  hi StatusLineTerm ctermfg=black ctermbg=green cterm=bold
+  hi StatusLineTermNC ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=white ctermbg=black cterm=bold
   hi Title ctermfg=magenta ctermbg=NONE cterm=bold
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi TitleBar ctermfg=white ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=grey ctermbg=black cterm=NONE
+  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
+  hi ToolbarLine ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=black ctermbg=grey cterm=NONE
+  hi Visual ctermfg=black ctermbg=grey cterm=NONE
+  hi VisualNOS ctermfg=white ctermbg=grey cterm=NONE
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=red cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=grey ctermbg=black cterm=bold
-  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
-  hi StatusLineTerm ctermfg=darkgreen ctermbg=black cterm=bold,reverse
-  hi StatusLineTermNC ctermfg=darkgreen ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
-  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
-  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi VisualNOS ctermfg=black ctermbg=grey cterm=NONE
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=white cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Delimiter ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=grey ctermbg=black cterm=bold
   hi Error ctermfg=grey ctermbg=darkred cterm=NONE
   hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
-  hi ModeMsg ctermfg=grey ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Function ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=grey ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=darkyellow cterm=reverse
   hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
   hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Function ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Statement ctermfg=grey ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Delimiter ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi StatusLineTerm ctermfg=darkgreen ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi TitleBar ctermfg=white ctermbg=black cterm=NONE
+  hi TitleBarNC ctermfg=grey ctermbg=black cterm=NONE
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=black ctermbg=grey cterm=NONE
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=red cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Number term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: foreground  #dadada        253            white
-" Color: background  #000000        16             black
-" Color: color00     #303030        236            black
-" Color: color08     #444444        238            darkgrey
-" Color: color01     #870000        88             darkred
-" Color: color09     #FF0000        196            red
-" Color: color02     #5FD75F        77             darkgreen
-" Color: color10     #00FF00        46             green
-" Color: color03     #AFAF00        142            darkyellow
-" Color: color11     #FFFF00        226            yellow
-" Color: color04     #87AFFF        111            darkblue
-" Color: color12     #005FFF        27             blue
-" Color: color05     #AF00AF        127            darkmagenta
-" Color: color13     #FF00FF        201            magenta
-" Color: color06     #00AFAF        37             darkcyan
-" Color: color14     #00FFFF        51             cyan
-" Color: color07     #6C6C6C        242            grey
-" Color: color15     #FFFFFF        231            white
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2