diff --git a/.cirrus.yml b/.cirrus.yml index 8b44a156b3..b8d9c78525 100644 --- a/.cirrus.yml +++ b/.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/* diff --git a/.editorconfig b/.editorconfig index dd6d050efb..7b09a2cae1 100644 --- a/.editorconfig +++ b/.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 diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 4d064077ee..bae6b6c6f5 100644 --- a/.git-blame-ignore-revs +++ b/.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 diff --git a/.gitattributes b/.gitattributes index 9216dbe8db..bad1d9edb2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,31 @@ src/testdir/test42.in diff + +# `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 hiddning 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 diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index d41773721a..27fd0b69f9 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.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] + 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: MacVim installation method + description: > + Was MacVim downloaded from GitHub release, installed via Homebrew / Homebrew Cask / MacPorts, or built from source manually? - 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 + 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: | - Operating system: + macOS version: + Mac: Terminal: - Value of $TERM: - Shell: validations: required: true - - type: input - attributes: - label: How MacVim was installed - description: > - MacVim has been downloaded from GitHub, installed via Homebrew, MacPorts or builed from git - 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 diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS index a17e53281b..bfd22e464e 100644 --- a/.github/MAINTAINERS +++ b/.github/MAINTAINERS @@ -9,661 +9,687 @@ # So if a pull request only touches javascript files, only these owners # will be requested to review. -nsis/lang/russian.nsi @RestorerZ -runtime/autoload/freebasic.vim @dkearns -runtime/autoload/hare.vim @selenebun -runtime/autoload/haskell.vim @alx741 -runtime/autoload/hcl.vim @gpanders -runtime/autoload/javascript.vim @jsit -runtime/autoload/modula2.vim @dkearns -runtime/autoload/php.vim @david-szabo97 -runtime/autoload/rubycomplete.vim @segfault @dkearns -runtime/autoload/rust.vim @lilyball -runtime/autoload/typst.vim @saccarosium -runtime/autoload/xmlformat.vim @chrisbra -runtime/autoload/dist/json.vim @habamax -runtime/colors/blue.vim @habamax @romainl @neutaaaaan -runtime/colors/darkblue.vim @habamax @romainl @neutaaaaan -runtime/colors/default.vim @habamax @romainl @neutaaaaan -runtime/colors/delek.vim @habamax @romainl @neutaaaaan -runtime/colors/desert.vim @habamax @romainl @neutaaaaan -runtime/colors/elflord.vim @habamax @romainl @neutaaaaan -runtime/colors/evening.vim @habamax @romainl @neutaaaaan -runtime/colors/habamax.vim @habamax @romainl @neutaaaaan -runtime/colors/industry.vim @habamax @romainl @neutaaaaan -runtime/colors/koehler.vim @habamax @romainl @neutaaaaan -runtime/colors/lunaperche.vim @habamax @romainl @neutaaaaan -runtime/colors/morning.vim @habamax @romainl @neutaaaaan -runtime/colors/murphy.vim @habamax @romainl @neutaaaaan -runtime/colors/pablo.vim @habamax @romainl @neutaaaaan -runtime/colors/peachpuff.vim @habamax @romainl @neutaaaaan -runtime/colors/quiet.vim @habamax @romainl @neutaaaaan -runtime/colors/retrobox.vim @habamax @romainl @neutaaaaan -runtime/colors/ron.vim @habamax @romainl @neutaaaaan -runtime/colors/shine.vim @habamax @romainl @neutaaaaan -runtime/colors/slate.vim @habamax @romainl @neutaaaaan -runtime/colors/sorbet.vim @habamax @romainl @neutaaaaan -runtime/colors/tools @habamax @romainl @neutaaaaan -runtime/colors/torte.vim @habamax @romainl @neutaaaaan -runtime/colors/wildcharm.vim @habamax @romainl @neutaaaaan -runtime/colors/zaibatsu.vim @habamax @romainl @neutaaaaan -runtime/colors/zellner.vim @habamax @romainl @neutaaaaan -runtime/compiler/checkstyle.vim @dkearns -runtime/compiler/cm3.vim @dkearns -runtime/compiler/cucumber.vim @tpope -runtime/compiler/dart.vim @dkearns -runtime/compiler/dart2js.vim @dkearns -runtime/compiler/dart2native.vim @dkearns -runtime/compiler/dartanalyser.vim @dkearns -runtime/compiler/dartdevc.vim @dkearns -runtime/compiler/dartdoc.vim @dkearns -runtime/compiler/dartfmt.vim @dkearns -runtime/compiler/dotnet.vim @nickspoons -runtime/compiler/eruby.vim @dkearns -runtime/compiler/fbc.vim @dkearns -runtime/compiler/gawk.vim @dkearns -runtime/compiler/gjs.vim @dkearns -runtime/compiler/gm2.vim @dkearns -runtime/compiler/go.vim @dbarnett -runtime/compiler/groff.vim @Konfekt -runtime/compiler/haml.vim @tpope -runtime/compiler/hare.vim @selenebun -runtime/compiler/icon.vim @dkearns -runtime/compiler/javac.vim @dkearns -runtime/compiler/jest.vim @dkearns -runtime/compiler/jjs.vim @dkearns -runtime/compiler/jshint.vim @dkearns -runtime/compiler/jsonlint.vim @dkearns -runtime/compiler/jq.vim @vito-c -runtime/compiler/lazbuild.vim @dkearns -runtime/compiler/pandoc.vim @Konfekt -runtime/compiler/perl.vim @petdance @heptite -runtime/compiler/perlcritic.vim @petdance @dkearns -runtime/compiler/php.vim @dkearns -runtime/compiler/podchecker.vim @petdance @dkearns -runtime/compiler/powershell.vim @heaths -runtime/compiler/raco.vim @benknoble -runtime/compiler/racomake.vim @benknoble -runtime/compiler/racosetup.vim @benknoble -runtime/compiler/racotest.vim @benknoble -runtime/compiler/rake.vim @tpope @dkearns -runtime/compiler/rhino.vim @dkearns -runtime/compiler/rspec.vim @tpope @dkearns -runtime/compiler/rubocop.vim @dkearns -runtime/compiler/ruby.vim @tpope @dkearns -runtime/compiler/rubyunit.vim @dkearns -runtime/compiler/sass.vim @tpope -runtime/compiler/sdoc.vim @gpanders -runtime/compiler/se.vim @dkearns -runtime/compiler/shellcheck.vim @dkearns -runtime/compiler/sml.vim @dkearns -runtime/compiler/spectral.vim @romainl -runtime/compiler/stylelint.vim @dkearns -runtime/compiler/tcl.vim @dkearns -runtime/compiler/tidy.vim @dkearns -runtime/compiler/ts-node.vim @dkearns -runtime/compiler/tsc.vim @dkearns -runtime/compiler/typedoc.vim @dkearns -runtime/compiler/typst.vim @saccarosium -runtime/compiler/xmllint.vim @dkearns -runtime/compiler/xo.vim @dkearns -runtime/compiler/yamllint.vim @romainl -runtime/compiler/zsh.vim @dkearns -runtime/doc/ft_hare.txt @selenebun -runtime/doc/ps1.txt @heaths -runtime/doc/evim-ru.1 @RestorerZ -runtime/doc/evim-ru.UTF-8.1 @RestorerZ -runtime/doc/vim-ru.1 @RestorerZ -runtime/doc/vim-ru.UTF-8.1 @RestorerZ -runtime/doc/vimdiff-ru.1 @RestorerZ -runtime/doc/vimdiff-ru.UTF-8.1 @RestorerZ -runtime/doc/vimtutor-ru.1 @RestorerZ -runtime/doc/vimtutor-ru.UTF-8.1 @RestorerZ -runtime/doc/xxd-ru.1 @RestorerZ -runtime/doc/xxd-ru.UTF-8.1 @RestorerZ -runtime/ftplugin/abaqus.vim @costerwi -runtime/ftplugin/antlr4.vim @jiangyinzuo -runtime/ftplugin/apache.vim @dubgeiser -runtime/ftplugin/arduino.vim @k-takata -runtime/ftplugin/asciidoc.vim @saccarosium -runtime/ftplugin/astro.vim @romainl -runtime/ftplugin/asy.vim @avidseeker -runtime/ftplugin/autohotkey.vim @telemachus -runtime/ftplugin/awk.vim @dkearns -runtime/ftplugin/basic.vim @dkearns -runtime/ftplugin/bst.vim @tpope -runtime/ftplugin/c3.vim @ttytm -runtime/ftplugin/cabal.vim @ribru17 -runtime/ftplugin/cedar.vim @ribru17 -runtime/ftplugin/cfg.vim @chrisbra -runtime/ftplugin/chatito.vim @ObserverOfTime -runtime/ftplugin/chicken.vim @evhan -runtime/ftplugin/clojure.vim @axvr -runtime/ftplugin/cmakecache.vim @ribru17 -runtime/ftplugin/cook.vim @ribru17 -runtime/ftplugin/cs.vim @nickspoons -runtime/ftplugin/csh.vim @dkearns -runtime/ftplugin/css.vim @dkearns -runtime/ftplugin/csv.vim @habamax -runtime/ftplugin/cucumber.vim @tpope -runtime/ftplugin/cuda.vim @ribru17 -runtime/ftplugin/dart.vim @ribru17 -runtime/ftplugin/deb822sources.vim @jamessan -runtime/ftplugin/debchangelog.vim @jamessan -runtime/ftplugin/debcontrol.vim @jamessan -runtime/ftplugin/debsources.vim @jamessan -runtime/ftplugin/desktop.vim @e-kwsm -runtime/ftplugin/dnsmasq.vim @dringsim -runtime/ftplugin/dosbatch.vim @mrdubya -runtime/ftplugin/editorconfig.vim @ribru17 -runtime/ftplugin/eiffel.vim @dkearns -runtime/ftplugin/elixir.vim @mhanberg -runtime/ftplugin/erlang.vim @hcs42 -runtime/ftplugin/eruby.vim @tpope @dkearns -runtime/ftplugin/expect.vim @dkearns -runtime/ftplugin/exports.vim @mperry2 -runtime/ftplugin/fennel.vim @gpanders -runtime/ftplugin/fetchmail.vim @dkearns -runtime/ftplugin/forth.vim @jkotlinski -runtime/ftplugin/fpcmake.vim @dkearns -runtime/ftplugin/freebasic.vim @dkearns -runtime/ftplugin/fstab.vim @rid9 -runtime/ftplugin/gdb.vim @xeyownt -runtime/ftplugin/gdscript.vim @habamax -runtime/ftplugin/gdshader.vim @habamax -runtime/ftplugin/git.vim @tpope -runtime/ftplugin/gitattributes.vim @ObserverOfTime -runtime/ftplugin/gitcommit.vim @tpope -runtime/ftplugin/gitconfig.vim @tpope -runtime/ftplugin/gitignore.vim @ObserverOfTime -runtime/ftplugin/gitrebase.vim @tpope -runtime/ftplugin/gitsendemail.vim @tpope -runtime/ftplugin/gleam.vim @trilowy -runtime/ftplugin/go.vim @dbarnett -runtime/ftplugin/goaccess.vim @meonkeys -runtime/ftplugin/gomod.vim @yu-yk -runtime/ftplugin/gprof.vim @dpelle -runtime/ftplugin/graphql.vim @jparise -runtime/ftplugin/gyp.vim @ObserverOfTime -runtime/ftplugin/haml.vim @tpope -runtime/ftplugin/hare.vim @selenebun -runtime/ftplugin/haredoc.vim @selenebun -runtime/ftplugin/heex.vim @cvincent -runtime/ftplugin/hcl.vim @gpanders -runtime/ftplugin/hgcommit.vim @k-takata -runtime/ftplugin/hlsplaylist.vim @avidseeker -runtime/ftplugin/hog.vim @wtfbbqhax -runtime/ftplugin/html.vim @dkearns -runtime/ftplugin/http.vim @ribru17 -runtime/ftplugin/hyprlang.vim @ribru17 -runtime/ftplugin/i3config.vim @hiqua -runtime/ftplugin/icon.vim @dkearns -runtime/ftplugin/indent.vim @dkearns -runtime/ftplugin/ishd.vim @dkearns -runtime/ftplugin/j.vim @glts -runtime/ftplugin/java.vim @zzzyxwvut -runtime/ftplugin/javacc.vim @ribru17 -runtime/ftplugin/javascript.vim @dkearns -runtime/ftplugin/javascriptreact.vim @dkearns -runtime/ftplugin/jjdescription.vim @gpanders -runtime/ftplugin/json.vim @dbarnett -runtime/ftplugin/json5.vim @dkearns -runtime/ftplugin/jsonc.vim @izhakjakov -runtime/ftplugin/julia.vim @carlobaldassi -runtime/ftplugin/just.vim @pbnj -runtime/ftplugin/jq.vim @vito-c -runtime/ftplugin/kconfig.vim @chrisbra -runtime/ftplugin/kdl.vim @imsnif @jiangyinzuo -runtime/ftplugin/kivy.vim @ribru17 -runtime/ftplugin/kotlin.vim @udalov -runtime/ftplugin/ldapconf.vim @ribru17 -runtime/ftplugin/leo.vim @ribru17 -runtime/ftplugin/less.vim @genoma -runtime/ftplugin/lex.vim @ribru17 -runtime/ftplugin/liquid.vim @tpope -runtime/ftplugin/lua.vim @dkearns -runtime/ftplugin/lc.vim @ribru17 -runtime/ftplugin/lynx.vim @dkearns -runtime/ftplugin/m3build.vim @dkearns -runtime/ftplugin/m3quake.vim @dkearns -runtime/ftplugin/markdown.vim @tpope -runtime/ftplugin/mediawiki.vim @avidseeker -runtime/ftplugin/meson.vim @Liambeguin -runtime/ftplugin/modula2.vim @dkearns -runtime/ftplugin/modula3.vim @dkearns -runtime/ftplugin/mojo.vim @ribru17 -runtime/ftplugin/mss.vim @Freed-Wu -runtime/ftplugin/nginx.vim @chr4 -runtime/ftplugin/nim.vim @ribru17 -runtime/ftplugin/nroff.vim @a-vrma -runtime/ftplugin/nsis.vim @k-takata -runtime/ftplugin/nu.vim @mrcjkb -runtime/ftplugin/octave.vim @dkearns -runtime/ftplugin/ondir.vim @jparise -runtime/ftplugin/opencl.vim @Freed-Wu -runtime/ftplugin/openvpn.vim @ObserverOfTime -runtime/ftplugin/org.vim @saccarosium -runtime/ftplugin/pascal.vim @dkearns -runtime/ftplugin/pbtxt.vim @lakshayg -runtime/ftplugin/pdf.vim @tpope -runtime/ftplugin/perl.vim @petdance @dkearns -runtime/ftplugin/php.vim @dkearns -runtime/ftplugin/pod.vim @petdance @dkearns -runtime/ftplugin/poefilter.vim @ObserverOfTime -runtime/ftplugin/postscr.vim @mrdubya -runtime/ftplugin/prisma.vim @ribru17 -runtime/ftplugin/proto.vim @Limero -runtime/ftplugin/ps1.vim @heaths -runtime/ftplugin/ps1xml.vim @heaths -runtime/ftplugin/ptx.vim @jiangyinzuo -runtime/ftplugin/purescript.vim @ribru17 -runtime/ftplugin/pymanifest.vim @ObserverOfTime -runtime/ftplugin/python.vim @tpict -runtime/ftplugin/qb64.vim @dkearns -runtime/ftplugin/qml.vim @ChaseKnowlden -runtime/ftplugin/racket.vim @benknoble -runtime/ftplugin/rasi.vim @fymyte -runtime/ftplugin/readline.vim @dkearns -runtime/ftplugin/rescript.vim @ribru17 -runtime/ftplugin/routeros.vim @zainin -runtime/ftplugin/rst.vim @marshallward -runtime/ftplugin/ruby.vim @tpope @dkearns -runtime/ftplugin/rust.vim @lilyball -runtime/ftplugin/samba.vim @mperry2 -runtime/ftplugin/sass.vim @tpope -runtime/ftplugin/scala.vim @derekwyatt -runtime/ftplugin/scheme.vim @evhan -runtime/ftplugin/scss.vim @tpope -runtime/ftplugin/sdoc.vim @gpanders -runtime/ftplugin/sed.vim @dkearns -runtime/ftplugin/sh.vim @dkearns -runtime/ftplugin/shaderslang.vim @mTvare6 -runtime/ftplugin/slint.vim @ribru17 -runtime/ftplugin/snakemake.vim @ribru17 -runtime/ftplugin/solidity.vim @cothi -runtime/ftplugin/solution.vim @dkearns -runtime/ftplugin/spec.vim @ignatenkobrain -runtime/ftplugin/squirrel.vim @ribru17 -runtime/ftplugin/ssa.vim @ObserverOfTime -runtime/ftplugin/sshdconfig.vim @jiangyinzuo -runtime/ftplugin/svelte.vim @igorlfs -runtime/ftplugin/sway.vim @ribru17 -runtime/ftplugin/swayconfig.vim @jamespeapen -runtime/ftplugin/systemverilog.vim @Kocha -runtime/ftplugin/swig.vim @jmarrec -runtime/ftplugin/tap.vim @petdance -runtime/ftplugin/tcsh.vim @dkearns -runtime/ftplugin/terraform.vim @JannoTjarks -runtime/ftplugin/tf.vim @ribru17 -runtime/ftplugin/thrift.vim @jiangyinzuo -runtime/ftplugin/tiasm.vim @Freed-Wu -runtime/ftplugin/tidy.vim @dkearns -runtime/ftplugin/tmux.vim @ericpruitt -runtime/ftplugin/toml.vim @averms -runtime/ftplugin/tt2html.vim @petdance -runtime/ftplugin/typescript.vim @dkearns -runtime/ftplugin/typescriptreact.vim @dkearns -runtime/ftplugin/typst.vim @saccarosium -runtime/ftplugin/unison.vim @chuwy -runtime/ftplugin/v.vim @ribru17 -runtime/ftplugin/vdf.vim @ObserverOfTime -runtime/ftplugin/vim.vim @dkearns -runtime/ftplugin/wast.vim @rhysd -runtime/ftplugin/wget.vim @dkearns -runtime/ftplugin/wget2.vim @dkearns -runtime/ftplugin/xcompose.vim @ObserverOfTime -runtime/ftplugin/xml.vim @chrisbra -runtime/ftplugin/xs.vim @petdance -runtime/ftplugin/yacc.vim @ribru17 -runtime/ftplugin/zsh.vim @chrisbra -runtime/import/dist/vimhighlight.vim @lacygoill -runtime/indent/arduino.vim @k-takata -runtime/indent/astro.vim @wuelnerdotexe -runtime/indent/basic.vim @dkearns -runtime/indent/bst.vim @tpope -runtime/indent/cdl.vim @dkearns -runtime/indent/chatito.vim @ObserverOfTime -runtime/indent/clojure.vim @axvr -runtime/indent/config.vim @dkearns -runtime/indent/cs.vim @nickspoons -runtime/indent/css.vim @dkearns -runtime/indent/cucumber.vim @tpope -runtime/indent/d.vim @dkearns -runtime/indent/dosbatch.vim @k-takata -runtime/indent/dtd.vim @dkearns -runtime/indent/dylan.vim @dkearns -runtime/indent/eiffel.vim @jocelyn -runtime/indent/elm.vim @andys8 -runtime/indent/erlang.vim @hcs42 -runtime/indent/eruby.vim @tpope @dkearns -runtime/indent/eterm.vim @dkearns -runtime/indent/falcon.vim @steveno -runtime/indent/framescript.vim @dkearns -runtime/indent/freebasic.vim @dkearns -runtime/indent/gdscript.vim @habamax -runtime/indent/gitconfig.vim @tpope -runtime/indent/gitolite.vim @sitaramc -runtime/indent/glsl.vim @gpanders -runtime/indent/go.vim @dbarnett -runtime/indent/graphql.vim @jparise -runtime/indent/gyp.vim @ObserverOfTime -runtime/indent/haml.vim @tpope -runtime/indent/hare.vim @selenebun -runtime/indent/hcl.vim @gpanders -runtime/indent/hog.vim @wtfbbqhax -runtime/indent/idlang.vim @dkearns -runtime/indent/j.vim @glts -runtime/indent/java.vim @xuhdev -runtime/indent/javascript.vim @bounceme -runtime/indent/json.vim @elzr -runtime/indent/jsonc.vim @izhakjakov -runtime/indent/julia.vim @carlobaldassi -runtime/indent/just.vim @pbnj -runtime/indent/kdl.vim @imsnif @jiangyinzuo -runtime/indent/kotlin.vim @udalov -runtime/indent/krl.vim @KnoP-01 -runtime/indent/ld.vim @dkearns -runtime/indent/less.vim @genoma -runtime/indent/liquid.vim @tpope -runtime/indent/lua.vim @marcuscf -runtime/indent/make.vim @dkearns -runtime/indent/meson.vim @Liambeguin -runtime/indent/mma.vim @dkearns -runtime/indent/mojo.vim @ribru17 -runtime/indent/nginx.vim @chr4 -runtime/indent/nsis.vim @k-takata -runtime/indent/occam.vim @dkearns -runtime/indent/perl.vim @petdance -runtime/indent/php.vim @2072 -runtime/indent/postscr.vim @mrdubya -runtime/indent/prolog.vim @dkearns -runtime/indent/proto.vim @Limero -runtime/indent/ps1.vim @heaths -runtime/indent/qb64.vim @dkearns -runtime/indent/qml.vim @ChaseKnowlden -runtime/indent/racket.vim @benknoble -runtime/indent/rapid.vim @KnoP-01 -runtime/indent/readline.vim @dkearns -runtime/indent/ruby.vim @AndrewRadev @dkearns -runtime/indent/sass.vim @tpope -runtime/indent/scala.vim @derekwyatt -runtime/indent/scheme.vim @evhan -runtime/indent/scss.vim @tpope -runtime/indent/sh.vim @chrisbra -runtime/indent/solidity.vim @cothi -runtime/indent/systemverilog.vim @Kocha -runtime/indent/tcl.vim @dkearns -runtime/indent/tcsh.vim @dkearns -runtime/indent/teraterm.vim @k-takata -runtime/indent/terraform.vim @gpanders -runtime/indent/thrift.vim @jiangyinzuo -runtime/indent/typescript.vim @HerringtonDarkholme -runtime/indent/typst.vim @saccarosium -runtime/indent/vroom.vim @dbarnett -runtime/indent/wast.vim @rhysd -runtime/indent/xml.vim @chrisbra -runtime/indent/zsh.vim @chrisbra -runtime/keymap/armenian-eastern_utf-8.vim @blinskey -runtime/keymap/armenian-western_utf-8.vim @blinskey -runtime/keymap/russian-typograph.vim @RestorerZ -runtime/keymap/tamil_tscii.vim @yegappan -runtime/keymap/ukrainian-enhanced.vim @Dolfost -runtime/lang/menu_en_gb.latin1.vim @mrdubya -runtime/lang/menu_ru_ru.cp1251.vim @RestorerZ -runtime/lang/menu_ru_ru.koi8-r.vim @RestorerZ -runtime/lang/menu_ru_ru.utf-8.vim @RestorerZ +nsis/lang/russian.nsi @RestorerZ +runtime/autoload/freebasic.vim @dkearns +runtime/autoload/hare.vim @selenebun +runtime/autoload/hcl.vim @gpanders +runtime/autoload/modula2.vim @dkearns +runtime/autoload/rubycomplete.vim @segfault @dkearns +runtime/autoload/rust.vim @lilyball +runtime/autoload/xmlformat.vim @chrisbra +runtime/autoload/dist/json.vim @habamax +runtime/colors/blue.vim @habamax @romainl @neutaaaaan +runtime/colors/darkblue.vim @habamax @romainl @neutaaaaan +runtime/colors/default.vim @habamax @romainl @neutaaaaan +runtime/colors/delek.vim @habamax @romainl @neutaaaaan +runtime/colors/desert.vim @habamax @romainl @neutaaaaan +runtime/colors/elflord.vim @habamax @romainl @neutaaaaan +runtime/colors/evening.vim @habamax @romainl @neutaaaaan +runtime/colors/habamax.vim @habamax @romainl @neutaaaaan +runtime/colors/industry.vim @habamax @romainl @neutaaaaan +runtime/colors/koehler.vim @habamax @romainl @neutaaaaan +runtime/colors/lunaperche.vim @habamax @romainl @neutaaaaan +runtime/colors/morning.vim @habamax @romainl @neutaaaaan +runtime/colors/murphy.vim @habamax @romainl @neutaaaaan +runtime/colors/pablo.vim @habamax @romainl @neutaaaaan +runtime/colors/peachpuff.vim @habamax @romainl @neutaaaaan +runtime/colors/quiet.vim @habamax @romainl @neutaaaaan +runtime/colors/retrobox.vim @habamax @romainl @neutaaaaan +runtime/colors/ron.vim @habamax @romainl @neutaaaaan +runtime/colors/shine.vim @habamax @romainl @neutaaaaan +runtime/colors/slate.vim @habamax @romainl @neutaaaaan +runtime/colors/sorbet.vim @habamax @romainl @neutaaaaan +runtime/colors/tools @habamax @romainl @neutaaaaan +runtime/colors/torte.vim @habamax @romainl @neutaaaaan +runtime/colors/wildcharm.vim @habamax @romainl @neutaaaaan +runtime/colors/zaibatsu.vim @habamax @romainl @neutaaaaan +runtime/colors/zellner.vim @habamax @romainl @neutaaaaan +runtime/compiler/checkstyle.vim @dkearns +runtime/compiler/cm3.vim @dkearns +runtime/compiler/cucumber.vim @tpope +runtime/compiler/dart.vim @dkearns +runtime/compiler/dart2js.vim @dkearns +runtime/compiler/dart2native.vim @dkearns +runtime/compiler/dartanalyser.vim @dkearns +runtime/compiler/dartdevc.vim @dkearns +runtime/compiler/dartdoc.vim @dkearns +runtime/compiler/dartfmt.vim @dkearns +runtime/compiler/dotnet.vim @nickspoons +runtime/compiler/eruby.vim @dkearns +runtime/compiler/fbc.vim @dkearns +runtime/compiler/gawk.vim @dkearns +runtime/compiler/gjs.vim @dkearns +runtime/compiler/gm2.vim @dkearns +runtime/compiler/go.vim @dbarnett +runtime/compiler/groff.vim @Konfekt +runtime/compiler/haml.vim @tpope +runtime/compiler/hare.vim @selenebun +runtime/compiler/icon.vim @dkearns +runtime/compiler/javac.vim @dkearns +runtime/compiler/jest.vim @dkearns +runtime/compiler/jjs.vim @dkearns +runtime/compiler/jshint.vim @dkearns +runtime/compiler/jsonlint.vim @dkearns +runtime/compiler/jq.vim @vito-c +runtime/compiler/pandoc.vim @Konfekt +runtime/compiler/perl.vim @petdance @heptite +runtime/compiler/perlcritic.vim @petdance @dkearns +runtime/compiler/php.vim @dkearns +runtime/compiler/phpstan.vim @dietrichm +runtime/compiler/podchecker.vim @petdance @dkearns +runtime/compiler/powershell.vim @heaths +runtime/compiler/raco.vim @benknoble +runtime/compiler/racomake.vim @benknoble +runtime/compiler/racosetup.vim @benknoble +runtime/compiler/racotest.vim @benknoble +runtime/compiler/rake.vim @tpope @dkearns +runtime/compiler/rhino.vim @dkearns +runtime/compiler/rspec.vim @tpope @dkearns +runtime/compiler/rubocop.vim @dkearns +runtime/compiler/ruby.vim @tpope @dkearns +runtime/compiler/rubyunit.vim @dkearns +runtime/compiler/sass.vim @tpope +runtime/compiler/se.vim @dkearns +runtime/compiler/shellcheck.vim @dkearns +runtime/compiler/sml.vim @dkearns +runtime/compiler/spectral.vim @romainl +runtime/compiler/svelte-check.vim @Konfekt +runtime/compiler/stylelint.vim @dkearns +runtime/compiler/tcl.vim @dkearns +runtime/compiler/tidy.vim @dkearns +runtime/compiler/ts-node.vim @dkearns +runtime/compiler/tsc.vim @dkearns +runtime/compiler/typedoc.vim @dkearns +runtime/compiler/xmllint.vim @dkearns +runtime/compiler/xo.vim @dkearns +runtime/compiler/yamllint.vim @romainl +runtime/compiler/zsh.vim @dkearns +runtime/doc/ft_hare.txt @selenebun +runtime/doc/evim-ru.1 @RestorerZ +runtime/doc/evim-ru.UTF-8.1 @RestorerZ +runtime/doc/vim-ru.1 @RestorerZ +runtime/doc/vim-ru.UTF-8.1 @RestorerZ +runtime/doc/vimdiff-ru.1 @RestorerZ +runtime/doc/vimdiff-ru.UTF-8.1 @RestorerZ +runtime/doc/vimtutor-ru.1 @RestorerZ +runtime/doc/vimtutor-ru.UTF-8.1 @RestorerZ +runtime/doc/xxd-ru.1 @RestorerZ +runtime/doc/xxd-ru.UTF-8.1 @RestorerZ +runtime/ftplugin/abaqus.vim @costerwi +runtime/ftplugin/abnf.vim @A4-Tacks +runtime/ftplugin/antlr4.vim @jiangyinzuo +runtime/ftplugin/apache.vim @dubgeiser +runtime/ftplugin/arduino.vim @k-takata +runtime/ftplugin/astro.vim @romainl +runtime/ftplugin/asy.vim @avidseeker +runtime/ftplugin/autohotkey.vim @telemachus +runtime/ftplugin/awk.vim @dkearns +runtime/ftplugin/basic.vim @dkearns +runtime/ftplugin/brighterscript.vim @ribru17 +runtime/ftplugin/brightscript.vim @ribru17 +runtime/ftplugin/bst.vim @tpope +runtime/ftplugin/c3.vim @ttytm +runtime/ftplugin/cabal.vim @ribru17 +runtime/ftplugin/cedar.vim @ribru17 +runtime/ftplugin/cfg.vim @chrisbra +runtime/ftplugin/chatito.vim @ObserverOfTime +runtime/ftplugin/chicken.vim @evhan +runtime/ftplugin/clojure.vim @axvr +runtime/ftplugin/cmakecache.vim @ribru17 +runtime/ftplugin/codeowners.vim @jparise +runtime/ftplugin/cook.vim @ribru17 +runtime/ftplugin/cs.vim @nickspoons +runtime/ftplugin/csh.vim @dkearns +runtime/ftplugin/css.vim @dkearns +runtime/ftplugin/csv.vim @habamax +runtime/ftplugin/cucumber.vim @tpope +runtime/ftplugin/cuda.vim @ribru17 +runtime/ftplugin/dart.vim @ribru17 +runtime/ftplugin/dax.vim @anarion80 +runtime/ftplugin/deb822sources.vim @jamessan +runtime/ftplugin/debchangelog.vim @jamessan +runtime/ftplugin/debcontrol.vim @jamessan +runtime/ftplugin/debsources.vim @jamessan +runtime/ftplugin/desktop.vim @e-kwsm +runtime/ftplugin/dnsmasq.vim @dringsim +runtime/ftplugin/dosbatch.vim @mrdubya +runtime/ftplugin/editorconfig.vim @ribru17 +runtime/ftplugin/eiffel.vim @dkearns +runtime/ftplugin/elixir.vim @mhanberg +runtime/ftplugin/erlang.vim @hcs42 +runtime/ftplugin/eruby.vim @tpope @dkearns +runtime/ftplugin/expect.vim @dkearns +runtime/ftplugin/exports.vim @mperry2 +runtime/ftplugin/fennel.vim @gpanders +runtime/ftplugin/fetchmail.vim @dkearns +runtime/ftplugin/fga.vim @ribru17 +runtime/ftplugin/forth.vim @jkotlinski +runtime/ftplugin/fpcmake.vim @dkearns +runtime/ftplugin/freebasic.vim @dkearns +runtime/ftplugin/fstab.vim @rid9 +runtime/ftplugin/gdb.vim @xeyownt +runtime/ftplugin/gdscript.vim @habamax +runtime/ftplugin/gdshader.vim @habamax +runtime/ftplugin/git.vim @tpope +runtime/ftplugin/gitattributes.vim @ObserverOfTime +runtime/ftplugin/gitcommit.vim @tpope +runtime/ftplugin/gitconfig.vim @tpope +runtime/ftplugin/gitignore.vim @ObserverOfTime +runtime/ftplugin/gitrebase.vim @tpope +runtime/ftplugin/gitsendemail.vim @tpope +runtime/ftplugin/gleam.vim @kirillmorozov +runtime/ftplugin/go.vim @dbarnett +runtime/ftplugin/goaccess.vim @meonkeys +runtime/ftplugin/gomod.vim @yu-yk +runtime/ftplugin/gprof.vim @dpelle +runtime/ftplugin/graphql.vim @jparise +runtime/ftplugin/groff.vim @e-kwsm +runtime/ftplugin/gyp.vim @ObserverOfTime +runtime/ftplugin/haml.vim @tpope +runtime/ftplugin/hare.vim @selenebun +runtime/ftplugin/haredoc.vim @selenebun +runtime/ftplugin/hcl.vim @gpanders +runtime/ftplugin/heex.vim @cvincent +runtime/ftplugin/hgcommit.vim @k-takata +runtime/ftplugin/hlsplaylist.vim @avidseeker +runtime/ftplugin/hog.vim @wtfbbqhax +runtime/ftplugin/html.vim @dkearns +runtime/ftplugin/http.vim @ribru17 +runtime/ftplugin/hyprlang.vim @ribru17 +runtime/ftplugin/i3config.vim @hiqua +runtime/ftplugin/icon.vim @dkearns +runtime/ftplugin/indent.vim @dkearns +runtime/ftplugin/ishd.vim @dkearns +runtime/ftplugin/j.vim @glts +runtime/ftplugin/java.vim @zzzyxwvut +runtime/ftplugin/javacc.vim @ribru17 +runtime/ftplugin/javascript.vim @dkearns +runtime/ftplugin/javascriptreact.vim @dkearns +runtime/ftplugin/jjdescription.vim @gpanders +runtime/ftplugin/jq.vim @vito-c +runtime/ftplugin/json.vim @dbarnett +runtime/ftplugin/json5.vim @dkearns +runtime/ftplugin/jsonc.vim @izhakjakov +runtime/ftplugin/julia.vim @carlobaldassi +runtime/ftplugin/just.vim @pbnj +runtime/ftplugin/kconfig.vim @chrisbra +runtime/ftplugin/kdl.vim @imsnif @jiangyinzuo +runtime/ftplugin/kerml.vim @daumantas-kavolis-sensmetry +runtime/ftplugin/kivy.vim @ribru17 +runtime/ftplugin/kotlin.vim @udalov +runtime/ftplugin/lc.vim @ribru17 +runtime/ftplugin/ldapconf.vim @ribru17 +runtime/ftplugin/leo.vim @ribru17 +runtime/ftplugin/less.vim @genoma +runtime/ftplugin/lex.vim @ribru17 +runtime/ftplugin/lf.vim @andis-sprinkis +runtime/ftplugin/liquid.vim @tpope +runtime/ftplugin/lua.vim @dkearns +runtime/ftplugin/lynx.vim @dkearns +runtime/ftplugin/m17ndb.vim @dseomn +runtime/ftplugin/m3build.vim @dkearns +runtime/ftplugin/m3quake.vim @dkearns +runtime/ftplugin/markdown.vim @tpope +runtime/ftplugin/mbsync.vim @fymyte +runtime/ftplugin/mediawiki.vim @avidseeker +runtime/ftplugin/meson.vim @Liambeguin +runtime/ftplugin/modula2.vim @dkearns +runtime/ftplugin/modula3.vim @dkearns +runtime/ftplugin/mojo.vim @ribru17 +runtime/ftplugin/mss.vim @Freed-Wu +runtime/ftplugin/nginx.vim @chr4 +runtime/ftplugin/nim.vim @ribru17 +runtime/ftplugin/nroff.vim @averms +runtime/ftplugin/nsis.vim @k-takata +runtime/ftplugin/nu.vim @elkasztano +runtime/ftplugin/octave.vim @dkearns +runtime/ftplugin/ondir.vim @jparise +runtime/ftplugin/opencl.vim @Freed-Wu +runtime/ftplugin/openscad.vim @squibid +runtime/ftplugin/openvpn.vim @ObserverOfTime +runtime/ftplugin/pascal.vim @dkearns +runtime/ftplugin/pbtxt.vim @lakshayg +runtime/ftplugin/pdf.vim @tpope +runtime/ftplugin/perl.vim @petdance @dkearns +runtime/ftplugin/php.vim @dkearns +runtime/ftplugin/pkl.vim @ribru17 +runtime/ftplugin/plsql.vim @lee-lindley +runtime/ftplugin/pod.vim @petdance @dkearns +runtime/ftplugin/poefilter.vim @ObserverOfTime +runtime/ftplugin/postscr.vim @mrdubya +runtime/ftplugin/pq.vim @anarion80 +runtime/ftplugin/prisma.vim @ribru17 +runtime/ftplugin/proto.vim @Limero +runtime/ftplugin/ps1.vim @heaths +runtime/ftplugin/ps1xml.vim @heaths +runtime/ftplugin/ptx.vim @jiangyinzuo +runtime/ftplugin/purescript.vim @ribru17 +runtime/ftplugin/pymanifest.vim @ObserverOfTime +runtime/ftplugin/python.vim @tpict +runtime/ftplugin/qb64.vim @dkearns +runtime/ftplugin/qml.vim @ChaseKnowlden +runtime/ftplugin/racket.vim @benknoble +runtime/ftplugin/rasi.vim @fymyte +runtime/ftplugin/readline.vim @dkearns +runtime/ftplugin/remind.vim @joereynolds +runtime/ftplugin/rescript.vim @ribru17 +runtime/ftplugin/routeros.vim @zainin +runtime/ftplugin/rst.vim @marshallward +runtime/ftplugin/ruby.vim @tpope @dkearns +runtime/ftplugin/rust.vim @lilyball +runtime/ftplugin/samba.vim @mperry2 +runtime/ftplugin/sass.vim @tpope +runtime/ftplugin/scala.vim @derekwyatt +runtime/ftplugin/scheme.vim @evhan +runtime/ftplugin/scss.vim @tpope +runtime/ftplugin/sed.vim @dkearns +runtime/ftplugin/sh.vim @dkearns +runtime/ftplugin/shaderslang.vim @mTvare6 +runtime/ftplugin/slint.vim @ribru17 +runtime/ftplugin/snakemake.vim @ribru17 +runtime/ftplugin/solidity.vim @coti-z +runtime/ftplugin/solution.vim @dkearns +runtime/ftplugin/spajson.vim @dseomn +runtime/ftplugin/spec.vim @ignatenkobrain +runtime/ftplugin/squirrel.vim @ribru17 +runtime/ftplugin/ssa.vim @ObserverOfTime +runtime/ftplugin/sshdconfig.vim @jiangyinzuo +runtime/ftplugin/svelte.vim @igorlfs +runtime/ftplugin/sway.vim @ribru17 +runtime/ftplugin/swayconfig.vim @jamespeapen +runtime/ftplugin/sysml.vim @daumantas-kavolis-sensmetry +runtime/ftplugin/systemverilog.vim @Kocha +runtime/ftplugin/swig.vim @jmarrec +runtime/ftplugin/tap.vim @petdance +runtime/ftplugin/tcsh.vim @dkearns +runtime/ftplugin/tera.vim @MuntasirSZN +runtime/ftplugin/terraform.vim @JannoTjarks +runtime/ftplugin/tf.vim @ribru17 +runtime/ftplugin/thrift.vim @jiangyinzuo +runtime/ftplugin/tiasm.vim @Freed-Wu +runtime/ftplugin/tidy.vim @dkearns +runtime/ftplugin/tmux.vim @ericpruitt +runtime/ftplugin/toml.vim @averms +runtime/ftplugin/tt2html.vim @petdance +runtime/ftplugin/twig.vim @ribru17 +runtime/ftplugin/typescript.vim @dkearns +runtime/ftplugin/typescriptreact.vim @dkearns +runtime/ftplugin/uc.vim @ribru17 +runtime/ftplugin/unison.vim @chuwy +runtime/ftplugin/v.vim @ribru17 +runtime/ftplugin/vdf.vim @ObserverOfTime +runtime/ftplugin/vim.vim @dkearns +runtime/ftplugin/wget.vim @dkearns +runtime/ftplugin/wget2.vim @dkearns +runtime/ftplugin/xcompose.vim @ObserverOfTime +runtime/ftplugin/xml.vim @chrisbra +runtime/ftplugin/xs.vim @petdance +runtime/ftplugin/yacc.vim @ribru17 +runtime/ftplugin/zsh.vim @chrisbra +runtime/import/dist/vimhighlight.vim @lacygoill +runtime/indent/arduino.vim @k-takata +runtime/indent/astro.vim @wuelnerdotexe +runtime/indent/basic.vim @dkearns +runtime/indent/bst.vim @tpope +runtime/indent/cdl.vim @dkearns +runtime/indent/chatito.vim @ObserverOfTime +runtime/indent/clojure.vim @axvr +runtime/indent/config.vim @dkearns +runtime/indent/cs.vim @nickspoons +runtime/indent/css.vim @dkearns +runtime/indent/cucumber.vim @tpope +runtime/indent/d.vim @dkearns +runtime/indent/dosbatch.vim @k-takata +runtime/indent/dtd.vim @dkearns +runtime/indent/dylan.vim @dkearns +runtime/indent/eiffel.vim @jocelyn +runtime/indent/elm.vim @andys8 +runtime/indent/erlang.vim @hcs42 +runtime/indent/eruby.vim @tpope @dkearns +runtime/indent/eterm.vim @dkearns +runtime/indent/falcon.vim @steveno +runtime/indent/framescript.vim @dkearns +runtime/indent/freebasic.vim @dkearns +runtime/indent/gdscript.vim @habamax +runtime/indent/gitconfig.vim @tpope +runtime/indent/gitolite.vim @sitaramc +runtime/indent/glsl.vim @gpanders +runtime/indent/go.vim @dbarnett +runtime/indent/graphql.vim @jparise +runtime/indent/gyp.vim @ObserverOfTime +runtime/indent/haml.vim @tpope +runtime/indent/hare.vim @selenebun +runtime/indent/hcl.vim @gpanders +runtime/indent/hog.vim @wtfbbqhax +runtime/indent/idlang.vim @dkearns +runtime/indent/j.vim @glts +runtime/indent/java.vim @xuhdev +runtime/indent/javascript.vim @bounceme +runtime/indent/json.vim @elzr +runtime/indent/jsonc.vim @izhakjakov +runtime/indent/julia.vim @carlobaldassi +runtime/indent/just.vim @pbnj +runtime/indent/kdl.vim @imsnif @jiangyinzuo +runtime/indent/kotlin.vim @udalov +runtime/indent/krl.vim @KnoP-01 +runtime/indent/ld.vim @dkearns +runtime/indent/less.vim @genoma +runtime/indent/liquid.vim @tpope +runtime/indent/lua.vim @marcuscf +runtime/indent/m17ndb.vim @dseomn +runtime/indent/make.vim @dkearns +runtime/indent/meson.vim @Liambeguin +runtime/indent/mma.vim @dkearns +runtime/indent/mojo.vim @ribru17 +runtime/indent/nginx.vim @chr4 +runtime/indent/nsis.vim @k-takata +runtime/indent/nu.vim @elkasztano +runtime/indent/occam.vim @dkearns +runtime/indent/perl.vim @petdance +runtime/indent/php.vim @2072 +runtime/indent/postscr.vim @mrdubya +runtime/indent/prolog.vim @dkearns +runtime/indent/proto.vim @Limero +runtime/indent/ps1.vim @heaths +runtime/indent/qb64.vim @dkearns +runtime/indent/qml.vim @ChaseKnowlden +runtime/indent/racket.vim @benknoble +runtime/indent/rapid.vim @KnoP-01 +runtime/indent/readline.vim @dkearns +runtime/indent/ruby.vim @AndrewRadev @dkearns +runtime/indent/sass.vim @tpope +runtime/indent/scala.vim @derekwyatt +runtime/indent/scheme.vim @evhan +runtime/indent/scss.vim @tpope +runtime/indent/sh.vim @chrisbra +runtime/indent/solidity.vim @coti-z +runtime/indent/spajson.vim @dseomn +runtime/indent/systemverilog.vim @Kocha +runtime/indent/tcl.vim @dkearns +runtime/indent/tcsh.vim @dkearns +runtime/indent/teraterm.vim @k-takata +runtime/indent/terraform.vim @gpanders +runtime/indent/thrift.vim @jiangyinzuo +runtime/indent/typescript.vim @HerringtonDarkholme +runtime/indent/vroom.vim @dbarnett +runtime/indent/xml.vim @chrisbra +runtime/indent/zsh.vim @chrisbra +runtime/keymap/armenian-eastern_utf-8.vim @blinskey +runtime/keymap/armenian-western_utf-8.vim @blinskey +runtime/keymap/brazilian_portuguese-abnt.vim @LuMarquesIlva +runtime/keymap/brazilian_portuguese-compact.vim @LuMarquesIlva +runtime/keymap/russian-typograph.vim @RestorerZ +runtime/keymap/tamil_tscii.vim @yegappan +runtime/keymap/ukrainian-enhanced.vim @Dolfost +runtime/lang/menu_en_gb.latin1.vim @mrdubya +runtime/lang/menu_ru_ru.cp1251.vim @RestorerZ +runtime/lang/menu_ru_ru.koi8-r.vim @RestorerZ +runtime/lang/menu_ru_ru.utf-8.vim @RestorerZ runtime/pack/dist/opt/cfilter/plugin/cfilter.vim @yegappan -runtime/pack/dist/opt/comment/ @habamax -runtime/pack/dist/opt/matchit/ @chrisbra -runtime/pack/dist/opt/nohlsearch/ @habamax -runtime/plugin/manpager.vim @Konfekt -runtime/syntax/shared/hgcommitDiff.vim @vegerot -runtime/syntax/abaqus.vim @costerwi -runtime/syntax/aidl.vim @dpelle -runtime/syntax/ant.vim @dkearns -runtime/syntax/antlr4.vim @jiangyinzuo -runtime/syntax/arduino.vim @johshoff -runtime/syntax/asciidoc.vim @aerostitch -runtime/syntax/asm.vim @dkearns -runtime/syntax/asmh8300.vim @dkearns -runtime/syntax/asterisk.vim @jaunis -runtime/syntax/astro.vim @wuelnerdotexe -runtime/syntax/asy.vim @avidseeker -runtime/syntax/autohotkey.vim @mmikeww -runtime/syntax/awk.vim @dkearns -runtime/syntax/basic.vim @dkearns -runtime/syntax/bst.vim @tpope -runtime/syntax/bzl.vim @dbarnett -runtime/syntax/bzr.vim @hdima -runtime/syntax/cabal.vim @coot -runtime/syntax/cabalconfig.vim @coot -runtime/syntax/cabalproject.vim @coot -runtime/syntax/cf.vim @ernstvanderlinden -runtime/syntax/chatito.vim @ObserverOfTime -runtime/syntax/chicken.vim @evhan -runtime/syntax/chuck.vim @gacallea -runtime/syntax/clojure.vim @axvr -runtime/syntax/cs.vim @nickspoons -runtime/syntax/csv.vim @habamax -runtime/syntax/cucumber.vim @tpope -runtime/syntax/d.vim @JesseKPhillips -runtime/syntax/dart.vim @pr3d4t0r -runtime/syntax/datascript.vim @dpelle -runtime/syntax/deb822sources.vim @jamessan -runtime/syntax/debchangelog.vim @jamessan -runtime/syntax/debcontrol.vim @jamessan -runtime/syntax/debcopyright.vim @jamessan -runtime/syntax/debsources.vim @jamessan -runtime/syntax/dep3patch.vim @jamessan -runtime/syntax/desktop.vim @e-kwsm -runtime/syntax/dosbatch.vim @mrdubya -runtime/syntax/dosini.vim @xuhdev -runtime/syntax/dot.vim @mmottl -runtime/syntax/doxygen.vim @frogonwheels -runtime/syntax/dtd.vim @chrisbra -runtime/syntax/dts.vim @zonque -runtime/syntax/editorconfig.vim @gpanders -runtime/syntax/eiffel.vim @jocelyn -runtime/syntax/erlang.vim @hcs42 -runtime/syntax/eruby.vim @tpope @dkearns -runtime/syntax/expect.vim @dkearns -runtime/syntax/falcon.vim @steveno -runtime/syntax/fennel.vim @gpanders -runtime/syntax/fetchmail.vim @dkearns -runtime/syntax/forth.vim @jkotlinski -runtime/syntax/fpcmake.vim @dkearns -runtime/syntax/freebasic.vim @dkearns -runtime/syntax/fstab.vim @rid9 -runtime/syntax/gdresource.vim @habamax -runtime/syntax/gdscript.vim @habamax -runtime/syntax/gdshader.vim @habamax -runtime/syntax/git.vim @tpope -runtime/syntax/gitattributes.vim @ObserverOfTime -runtime/syntax/gitcommit.vim @tpope -runtime/syntax/gitconfig.vim @tpope -runtime/syntax/gitignore.vim @ObserverOfTime -runtime/syntax/gitolite.vim @sitaramc -runtime/syntax/gitrebase.vim @tpope -runtime/syntax/glsl.vim @gpanders -runtime/syntax/go.vim @bhcleek -runtime/syntax/goaccess.vim @meonkeys -runtime/syntax/godoc.vim @dbarnett -runtime/syntax/gp.vim @KBelabas -runtime/syntax/gprof.vim @dpelle -runtime/syntax/graphql.vim @jparise -runtime/syntax/groff.vim @jmarshall -runtime/syntax/gyp.vim @ObserverOfTime -runtime/syntax/haml.vim @tpope -runtime/syntax/hare.vim @selenebun -runtime/syntax/haredoc.vim @selenebun -runtime/syntax/haskell.vim @coot -runtime/syntax/hcl.vim @gpanders -runtime/syntax/help_ru.vim @RestorerZ -runtime/syntax/hgcommit.vim @k-takata -runtime/syntax/hitest.vim @lacygoill -runtime/syntax/hog.vim @wtfbbqhax -runtime/syntax/hollywood.vim @sodero -runtime/syntax/html.vim @dkearns -runtime/syntax/htmlangular.vim @dlvandenberg -runtime/syntax/hyprlang.vim @saccarosium -runtime/syntax/i3config.vim @hiqua -runtime/syntax/icon.vim @dkearns -runtime/syntax/indent.vim @dkearns -runtime/syntax/j.vim @glts -runtime/syntax/jargon.vim @h3xx -runtime/syntax/java.vim @zzzyxwvut -runtime/syntax/javascript.vim @fleiner -runtime/syntax/jinja.vim @gpanders -runtime/syntax/jjdescription.vim @gpanders -runtime/syntax/json.vim @vito-c -runtime/syntax/jsonc.vim @izhakjakov -runtime/syntax/julia.vim @carlobaldassi -runtime/syntax/just.vim @pbnj -runtime/syntax/jq.vim @vito-c -runtime/syntax/karel.vim @kirillmorozov -runtime/syntax/kconfig.vim @chrisbra -runtime/syntax/kivy.vim @prophittcorey -runtime/syntax/kotlin.vim @udalov -runtime/syntax/kdl.vim @imsnif @jiangyinzuo -runtime/syntax/krl.vim @KnoP-01 -runtime/syntax/less.vim @genoma -runtime/syntax/lf.vim @andis-sprinkis -runtime/syntax/liquid.vim @tpope -runtime/syntax/lua.vim @marcuscf -runtime/syntax/lyrics.vim @ObserverOfTime -runtime/syntax/lynx.vim @dkearns -runtime/syntax/m3build.vim @dkearns -runtime/syntax/m3quake.vim @dkearns -runtime/syntax/mailcap.vim @dkearns -runtime/syntax/make.vim @rohieb -runtime/syntax/mallard.vim @jhradilek -runtime/syntax/markdown.vim @tpope -runtime/syntax/mason.vim @petdance -runtime/syntax/mediawiki.vim @avidseeker -runtime/syntax/meson.vim @Liambeguin -runtime/syntax/modula2.vim @dkearns -runtime/syntax/modula2/opt/iso.vim @trijezdci -runtime/syntax/modula2/opt/pim.vim @trijezdci -runtime/syntax/modula2/opt/r10.vim @trijezdci -runtime/syntax/modula3.vim @dkearns -runtime/syntax/mss.vim @Freed-Wu -runtime/syntax/n1ql.vim @pr3d4t0r -runtime/syntax/nginx.vim @chr4 -runtime/syntax/ninja.vim @nico -runtime/syntax/nix.vim @equill -runtime/syntax/nroff.vim @jmarshall -runtime/syntax/nsis.vim @k-takata -runtime/syntax/ondir.vim @jparise -runtime/syntax/opencl.vim @Freed-Wu -runtime/syntax/openvpn.vim @ObserverOfTime -runtime/syntax/org.vim @saccarosium -runtime/syntax/pacmanlog.vim @rpigott -runtime/syntax/pascal.vim @dkearns -runtime/syntax/pbtxt.vim @lakshayg -runtime/syntax/pdf.vim @tpope -runtime/syntax/perl.vim @petdance -runtime/syntax/php.vim @TysonAndre -runtime/syntax/plsql.vim @lee-lindley -runtime/syntax/pod.vim @petdance -runtime/syntax/poefilter.vim @ObserverOfTime -runtime/syntax/postscr.vim @mrdubya -runtime/syntax/privoxy.vim @dkearns -runtime/syntax/progress.vim @rdnlsmith -runtime/syntax/prolog.vim @XVilka -runtime/syntax/ps1.vim @heaths -runtime/syntax/ps1xml.vim @heaths -runtime/syntax/psl.vim @danielkho -runtime/syntax/ptx.vim @jiangyinzuo -runtime/syntax/pymanifest.vim @ObserverOfTime -runtime/syntax/qb64.vim @dkearns -runtime/syntax/qml.vim @ChaseKnowlden -runtime/syntax/racket.vim @benknoble -runtime/syntax/raml.vim @in3d -runtime/syntax/rapid.vim @KnoP-01 -runtime/syntax/ratpoison.vim @trapd00r -runtime/syntax/rasi.vim @fymyte -runtime/syntax/rc.vim @chrisbra -runtime/syntax/rcs.vim @hdima -runtime/syntax/rebol.vim @mrdubya -runtime/syntax/rego.vim @zenmatic -runtime/syntax/resolv.vim @rid9 -runtime/syntax/rng.vim @jhradilek -runtime/syntax/routeros.vim @zainin -runtime/syntax/rst.vim @marshallward -runtime/syntax/ruby.vim @dkearns -runtime/syntax/salt.vim @gpanders -runtime/syntax/sass.vim @tpope -runtime/syntax/scala.vim @derekwyatt -runtime/syntax/scheme.vim @evhan -runtime/syntax/scss.vim @tpope -runtime/syntax/sdoc.vim @gpanders -runtime/syntax/sed.vim @dkearns -runtime/syntax/shared/debversions.vim @jamessan -runtime/syntax/shaderslang.vim @mTvare6 -runtime/syntax/solidity.vim @cothi -runtime/syntax/spec.vim @ignatenkobrain -runtime/syntax/sqloracle.vim @chrisbra -runtime/syntax/squirrel.vim @zenmatic -runtime/syntax/srt.vim @ObserverOfTime -runtime/syntax/ssa.vim @ObserverOfTime -runtime/syntax/sshconfig.vim @Jakuje -runtime/syntax/sshdconfig.vim @Jakuje -runtime/syntax/sudoers.vim @e-kwsm -runtime/syntax/svn.vim @hdima -runtime/syntax/swayconfig.vim @jamespeapen -runtime/syntax/swig.vim @jmarrec -runtime/syntax/systemverilog.vim @Kocha -runtime/syntax/tap.vim @petdance -runtime/syntax/tcsh.vim @dkearns -runtime/syntax/teraterm.vim @k-takata -runtime/syntax/terraform.vim @gpanders -runtime/syntax/thrift.vim @jiangyinzuo -runtime/syntax/tiasm.vim @Freed-Wu -runtime/syntax/tidy.vim @dkearns -runtime/syntax/tmux.vim @ericpruitt -runtime/syntax/toml.vim @averms -runtime/syntax/tt2.vim @petdance -runtime/syntax/tt2html.vim @petdance -runtime/syntax/tt2js.vim @petdance -runtime/syntax/typescript.vim @HerringtonDarkholme @rhysd -runtime/syntax/typescriptreact.vim @HerringtonDarkholme @rhysd -runtime/syntax/typst.vim @gpanders -runtime/syntax/shared/typescriptcommon.vim @HerringtonDarkholme @rhysd -runtime/syntax/unison.vim @chuwy -runtime/syntax/vdf.vim @ObserverOfTime -runtime/syntax/vroom.vim @dbarnett -runtime/syntax/wast.vim @rhysd -runtime/syntax/wdl.vim @zenmatic -runtime/syntax/wget.vim @dkearns -runtime/syntax/wget2.vim @dkearns -runtime/syntax/xbl.vim @dkearns -runtime/syntax/xcompose.vim @ObserverOfTime -runtime/syntax/xml.vim @chrisbra -runtime/syntax/xs.vim @petdance -runtime/syntax/xslt.vim @Boobies -runtime/syntax/zserio.vim @dpelle -runtime/syntax/zsh.vim @chrisbra -runtime/tutor/tutor.eo @dpelle -runtime/tutor/tutor.eo.utf-8 @dpelle -runtime/tutor/tutor.fr @dpelle -runtime/tutor/tutor.fr.utf-8 @dpelle -runtime/tutor/tutor.ru @RestorerZ -runtime/tutor/tutor.ru.cp1251 @RestorerZ -runtime/tutor/tutor.ru.utf-8 @RestorerZ -src/iscygpty.* @k-takata -src/libvterm/ @leonerd -src/po/am.po @gagikh -src/po/ca.po @nfdisco -src/po/de.po @chrisbra -src/po/eo.po @dpelle -src/po/es.po @victorhck -src/po/fi.po @flammie -src/po/fr.po @dpelle -src/po/ga.po @kscanne -src/po/it.po @azc100 -src/po/ja.po @k-takata -src/po/ru.po @RestorerZ -src/po/sr.po @eevan78 -src/po/tr.po @bitigchi -src/po/uk.po @sakhnik -src/xxd/ @jnweiger +runtime/pack/dist/opt/comment/ @habamax +runtime/pack/dist/opt/helptoc/ @kennypete +runtime/pack/dist/opt/matchit/ @chrisbra +runtime/pack/dist/opt/nohlsearch/ @habamax +runtime/plugin/manpager.vim @Konfekt +runtime/syntax/shared/hgcommitDiff.vim @vegerot +runtime/syntax/abaqus.vim @costerwi +runtime/syntax/abnf.vim @A4-Tacks +runtime/syntax/aidl.vim @dpelle +runtime/syntax/ant.vim @dkearns +runtime/syntax/antlr4.vim @jiangyinzuo +runtime/syntax/arduino.vim @johshoff +runtime/syntax/asciidoc.vim @aerostitch +runtime/syntax/asm.vim @dkearns +runtime/syntax/asmh8300.vim @dkearns +runtime/syntax/asterisk.vim @jaunis +runtime/syntax/astro.vim @wuelnerdotexe +runtime/syntax/asy.vim @avidseeker +runtime/syntax/autohotkey.vim @mmikeww +runtime/syntax/awk.vim @dkearns +runtime/syntax/basic.vim @dkearns +runtime/syntax/bst.vim @tpope +runtime/syntax/bzl.vim @dbarnett +runtime/syntax/bzr.vim @hdima +runtime/syntax/cabal.vim @coot +runtime/syntax/cabalconfig.vim @coot +runtime/syntax/cabalproject.vim @coot +runtime/syntax/cangjie.vim @WuJunkai2004 +runtime/syntax/cf.vim @ernstvanderlinden +runtime/syntax/chatito.vim @ObserverOfTime +runtime/syntax/chicken.vim @evhan +runtime/syntax/chuck.vim @andreacfromtheapp +runtime/syntax/clojure.vim @axvr +runtime/syntax/codeowners.vim @jparise +runtime/syntax/cs.vim @nickspoons +runtime/syntax/csv.vim @habamax +runtime/syntax/cucumber.vim @tpope +runtime/syntax/d.vim @JesseKPhillips +runtime/syntax/dart.vim @pr3d4t0r +runtime/syntax/datascript.vim @dpelle +runtime/syntax/dax.vim @anarion80 +runtime/syntax/deb822sources.vim @jamessan +runtime/syntax/debchangelog.vim @jamessan +runtime/syntax/debcontrol.vim @jamessan +runtime/syntax/debcopyright.vim @jamessan +runtime/syntax/debsources.vim @jamessan +runtime/syntax/dep3patch.vim @jamessan +runtime/syntax/desktop.vim @e-kwsm +runtime/syntax/dosbatch.vim @mrdubya +runtime/syntax/dosini.vim @xuhdev +runtime/syntax/dot.vim @mmottl +runtime/syntax/doxygen.vim @frogonwheels +runtime/syntax/dtd.vim @chrisbra +runtime/syntax/dts.vim @zonque +runtime/syntax/editorconfig.vim @gpanders +runtime/syntax/eiffel.vim @jocelyn +runtime/syntax/erlang.vim @hcs42 +runtime/syntax/eruby.vim @tpope @dkearns +runtime/syntax/expect.vim @dkearns +runtime/syntax/falcon.vim @steveno +runtime/syntax/fetchmail.vim @dkearns +runtime/syntax/forth.vim @jkotlinski +runtime/syntax/fpcmake.vim @dkearns +runtime/syntax/freebasic.vim @dkearns +runtime/syntax/fstab.vim @rid9 +runtime/syntax/gdresource.vim @habamax +runtime/syntax/gdscript.vim @habamax +runtime/syntax/gdshader.vim @habamax +runtime/syntax/git.vim @tpope +runtime/syntax/gitattributes.vim @ObserverOfTime +runtime/syntax/gitcommit.vim @tpope +runtime/syntax/gitconfig.vim @tpope +runtime/syntax/gitignore.vim @ObserverOfTime +runtime/syntax/gitolite.vim @sitaramc +runtime/syntax/gitrebase.vim @tpope +runtime/syntax/gleam.vim @kirillmorozov +runtime/syntax/glsl.vim @gpanders +runtime/syntax/go.vim @bhcleek +runtime/syntax/goaccess.vim @meonkeys +runtime/syntax/godoc.vim @dbarnett +runtime/syntax/gp.vim @KBelabas +runtime/syntax/gprof.vim @dpelle +runtime/syntax/graphql.vim @jparise +runtime/syntax/groff.vim @jmarshall +runtime/syntax/gyp.vim @ObserverOfTime +runtime/syntax/haml.vim @tpope +runtime/syntax/hare.vim @selenebun +runtime/syntax/haredoc.vim @selenebun +runtime/syntax/haskell.vim @coot +runtime/syntax/hcl.vim @gpanders +runtime/syntax/help.vim @dkearns +runtime/syntax/help_ru.vim @RestorerZ +runtime/syntax/hgcommit.vim @k-takata +runtime/syntax/hitest.vim @lacygoill +runtime/syntax/hog.vim @wtfbbqhax +runtime/syntax/hollywood.vim @sodero +runtime/syntax/html.vim @dkearns +runtime/syntax/htmlangular.vim @dlvandenberg +runtime/syntax/i3config.vim @hiqua +runtime/syntax/icon.vim @dkearns +runtime/syntax/indent.vim @dkearns +runtime/syntax/j.vim @glts +runtime/syntax/jargon.vim @h3xx +runtime/syntax/java.vim @zzzyxwvut +runtime/syntax/javascript.vim @fleiner +runtime/syntax/jinja.vim @gpanders +runtime/syntax/jjdescription.vim @gpanders +runtime/syntax/json.vim @vito-c +runtime/syntax/jsonc.vim @izhakjakov +runtime/syntax/julia.vim @carlobaldassi +runtime/syntax/just.vim @pbnj +runtime/syntax/jq.vim @vito-c +runtime/syntax/karel.vim @kirillmorozov +runtime/syntax/kconfig.vim @chrisbra +runtime/syntax/kitty.vim @OXY2DEV +runtime/syntax/kivy.vim @prophittcorey +runtime/syntax/kotlin.vim @udalov +runtime/syntax/kdl.vim @imsnif @jiangyinzuo +runtime/syntax/krl.vim @KnoP-01 +runtime/syntax/less.vim @genoma +runtime/syntax/lf.vim @andis-sprinkis +runtime/syntax/liquid.vim @tpope +runtime/syntax/log.vim @mao-yining +runtime/syntax/lua.vim @marcuscf +runtime/syntax/lynx.vim @dkearns +runtime/syntax/lyrics.vim @ObserverOfTime +runtime/syntax/m17ndb.vim @dseomn +runtime/syntax/m3build.vim @dkearns +runtime/syntax/m3quake.vim @dkearns +runtime/syntax/mailcap.vim @dkearns +runtime/syntax/make.vim @rohieb +runtime/syntax/mallard.vim @jhradilek +runtime/syntax/markdown.vim @tpope +runtime/syntax/mbsync.vim @fymyte +runtime/syntax/mason.vim @petdance +runtime/syntax/mediawiki.vim @avidseeker +runtime/syntax/meson.vim @Liambeguin +runtime/syntax/modula2.vim @dkearns +runtime/syntax/modula2/opt/iso.vim @trijezdci +runtime/syntax/modula2/opt/pim.vim @trijezdci +runtime/syntax/modula2/opt/r10.vim @trijezdci +runtime/syntax/modula3.vim @dkearns +runtime/syntax/mss.vim @Freed-Wu +runtime/syntax/n1ql.vim @pr3d4t0r +runtime/syntax/nginx.vim @chr4 +runtime/syntax/ninja.vim @nico +runtime/syntax/nix.vim @equill +runtime/syntax/nroff.vim @jmarshall +runtime/syntax/nsis.vim @k-takata +runtime/syntax/nu.vim @elkasztano +runtime/syntax/odin.vim @habamax +runtime/syntax/omnimark.vim @kennypete +runtime/syntax/ondir.vim @jparise +runtime/syntax/opencl.vim @Freed-Wu +runtime/syntax/openvpn.vim @ObserverOfTime +runtime/syntax/pacmanlog.vim @rpigott +runtime/syntax/pascal.vim @dkearns +runtime/syntax/pbtxt.vim @lakshayg +runtime/syntax/pdf.vim @tpope +runtime/syntax/perl.vim @petdance +runtime/syntax/php.vim @TysonAndre +runtime/syntax/pkl.vim @jclsn +runtime/syntax/plsql.vim @lee-lindley +runtime/syntax/pod.vim @petdance +runtime/syntax/poefilter.vim @ObserverOfTime +runtime/syntax/postscr.vim @mrdubya +runtime/syntax/pq.vim @anarion80 +runtime/syntax/privoxy.vim @dkearns +runtime/syntax/progress.vim @rdnlsmith +runtime/syntax/prolog.vim @XVilka +runtime/syntax/prql.vim @vanillajonathan +runtime/syntax/ps1.vim @heaths +runtime/syntax/ps1xml.vim @heaths +runtime/syntax/psl.vim @danielkho +runtime/syntax/ptx.vim @jiangyinzuo +runtime/syntax/pymanifest.vim @ObserverOfTime +runtime/syntax/qb64.vim @dkearns +runtime/syntax/qml.vim @ChaseKnowlden +runtime/syntax/racket.vim @benknoble +runtime/syntax/raml.vim @in3d +runtime/syntax/rapid.vim @KnoP-01 +runtime/syntax/ratpoison.vim @trapd00r +runtime/syntax/rasi.vim @fymyte +runtime/syntax/rc.vim @chrisbra +runtime/syntax/rcs.vim @hdima +runtime/syntax/rebol.vim @mrdubya +runtime/syntax/rego.vim @zenmatic +runtime/syntax/resolv.vim @rid9 +runtime/syntax/rng.vim @jhradilek +runtime/syntax/routeros.vim @zainin +runtime/syntax/rst.vim @marshallward +runtime/syntax/ruby.vim @dkearns +runtime/syntax/salt.vim @gpanders +runtime/syntax/sass.vim @tpope +runtime/syntax/scala.vim @derekwyatt +runtime/syntax/scheme.vim @evhan +runtime/syntax/scss.vim @tpope +runtime/syntax/sed.vim @dkearns +runtime/syntax/shared/debversions.vim @jamessan +runtime/syntax/shaderslang.vim @mTvare6 +runtime/syntax/solidity.vim @coti-z +runtime/syntax/spajson.vim @dseomn +runtime/syntax/spec.vim @ignatenkobrain +runtime/syntax/sqloracle.vim @chrisbra +runtime/syntax/squirrel.vim @zenmatic +runtime/syntax/srt.vim @ObserverOfTime +runtime/syntax/ssa.vim @ObserverOfTime +runtime/syntax/sshconfig.vim @Jakuje +runtime/syntax/sshdconfig.vim @Jakuje +runtime/syntax/sudoers.vim @e-kwsm +runtime/syntax/svn.vim @hdima +runtime/syntax/swayconfig.vim @jamespeapen +runtime/syntax/swig.vim @jmarrec +runtime/syntax/systemverilog.vim @Kocha +runtime/syntax/tap.vim @petdance +runtime/syntax/tcsh.vim @dkearns +runtime/syntax/tera.vim @MuntasirSZN +runtime/syntax/teraterm.vim @k-takata +runtime/syntax/terraform.vim @gpanders +runtime/syntax/thrift.vim @jiangyinzuo +runtime/syntax/tiasm.vim @Freed-Wu +runtime/syntax/tidy.vim @dkearns +runtime/syntax/tmux.vim @ericpruitt +runtime/syntax/toml.vim @averms +runtime/syntax/tt2.vim @petdance +runtime/syntax/tt2html.vim @petdance +runtime/syntax/tt2js.vim @petdance +runtime/syntax/typescript.vim @HerringtonDarkholme @rhysd +runtime/syntax/typescriptreact.vim @HerringtonDarkholme @rhysd +runtime/syntax/typst.vim @gpanders +runtime/syntax/shared/typescriptcommon.vim @HerringtonDarkholme @rhysd +runtime/syntax/unison.vim @chuwy +runtime/syntax/vdf.vim @ObserverOfTime +runtime/syntax/vroom.vim @dbarnett +runtime/syntax/wdl.vim @zenmatic +runtime/syntax/wget.vim @dkearns +runtime/syntax/wget2.vim @dkearns +runtime/syntax/xbl.vim @dkearns +runtime/syntax/xcompose.vim @ObserverOfTime +runtime/syntax/xml.vim @chrisbra +runtime/syntax/xs.vim @petdance +runtime/syntax/xslt.vim @Boobies +runtime/syntax/zserio.vim @dpelle +runtime/syntax/zsh.vim @chrisbra +runtime/tutor/tutor1.eo @dpelle +runtime/tutor/tutor1.fr @dpelle +runtime/tutor/tutor1.ru @RestorerZ +src/iscygpty.* @k-takata +src/libvterm/ @leonerd +src/po/ca.po @nfdisco +src/po/de.po @chrisbra +src/po/eo.po @dpelle +src/po/es.po @victorhck +src/po/fi.po @flammie +src/po/fr.po @dpelle +src/po/ga.po @kscanne +src/po/hy.po @gagikh +src/po/it.po @azc100 +src/po/ja.po @k-takata +src/po/ru.po @RestorerZ +src/po/sr.po @eevan78 +src/po/tr.po @bitigchi +src/po/uk.po @sakhnik +src/proto/gen_prototypes.py @h-east +src/xxd/ @jnweiger + +# vim:ft=codeowners diff --git a/.github/actions/test_artifacts/action.yml b/.github/actions/test_artifacts/action.yml index 44738c505e..cbab486c69 100644 --- a/.github/actions/test_artifacts/action.yml +++ b/.github/actions/test_artifacts/action.yml @@ -7,7 +7,7 @@ runs: uses: actions/upload-artifact@v4 with: # Name of the artifact to upload. - name: ${{ github.workflow }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-tests + name: GH-${{ github.run_id }}-${{ github.run_attempt }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-tests # A file, directory or wildcard pattern that describes what # to upload. diff --git a/.github/actions/universal-package/action.yml b/.github/actions/universal-package/action.yml index 5b10af62e6..6d5f0a9e5a 100644 --- a/.github/actions/universal-package/action.yml +++ b/.github/actions/universal-package/action.yml @@ -40,6 +40,13 @@ runs: 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 + # 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 +60,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,7 +82,7 @@ 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} @@ -93,3 +101,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 }} diff --git a/.github/labeler.yml b/.github/labeler.yml index aab3af32d0..5b884c89e0 100644 --- a/.github/labeler.yml +++ b/.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: @@ -146,7 +144,7 @@ plugin-netrw: - changed-files: - any-glob-to-any-file: - 'runtime/plugin/netrwPlugin.vim' - - 'runtime/autoload/netrw*' + - 'runtime/pack/dist/opt/netrw/**' xxd: - all: diff --git a/.github/workflows/ci-macvim.yaml b/.github/workflows/ci-macvim.yaml index 8cc41bd1aa..7bd4fedcc8 100644 --- a/.github/workflows/ci-macvim.yaml +++ b/.github/workflows/ci-macvim.yaml @@ -41,7 +41,7 @@ jobs: # 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: true publish: true optimized: true @@ -52,6 +52,7 @@ jobs: 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 }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d84920b22e..5969e95e33 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout repository from github - uses: actions/checkout@v4 + uses: actions/checkout@v5 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 90a6e9ff0c..f74174636b 100644 --- a/.github/workflows/coverity.yml +++ b/.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@v5 - 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 diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index d23c4d403f..e413603bd4 100644 --- a/.github/workflows/label.yml +++ b/.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 }}" diff --git a/.github/workflows/link-check.yml b/.github/workflows/link-check.yml new file mode 100644 index 0000000000..59ced56920 --- /dev/null +++ b/.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@v5 + - name: Run Lychee + uses: lycheeverse/lychee-action@v2 + with: + args: --verbose --config ci/lychee.toml . diff --git a/.github/workflows/macvim-buildtest.yaml b/.github/workflows/macvim-buildtest.yaml index a94f994465..7b71f0f364 100644 --- a/.github/workflows/macvim-buildtest.yaml +++ b/.github/workflows/macvim-buildtest.yaml @@ -13,6 +13,8 @@ on: type: boolean xcode: type: string + testgui: + type: boolean publish: type: boolean publish_postfix: @@ -62,7 +64,7 @@ jobs: runs-on: ${{ inputs.os }} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up legacy build if: inputs.legacy @@ -363,7 +365,7 @@ jobs: make ${MAKE_BUILD_ARGS} -j${NPROC} -C src unittesttargets - name: Test Vim - if: startsWith(github.ref, 'refs/tags/') || !matrix.testgui + if: startsWith(github.ref, 'refs/tags/') || !inputs.testgui timeout-minutes: 30 run: | defaults delete org.vim.MacVim # Clean up stale states @@ -373,7 +375,7 @@ jobs: make ${MAKE_BUILD_ARGS} -C src test - name: Test Vim (GUI) - if: startsWith(github.ref, 'refs/tags/') || matrix.testgui + if: startsWith(github.ref, 'refs/tags/') || inputs.testgui timeout-minutes: 30 run: | defaults delete org.vim.MacVim # Clean up stale states diff --git a/.github/workflows/macvim-issues.yaml b/.github/workflows/macvim-issues.yaml index 2f6587dbd3..6237cfb133 100644 --- a/.github/workflows/macvim-issues.yaml +++ b/.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 diff --git a/.gitignore b/.gitignore index fec0abeaa5..f0769ff1cd 100644 --- a/.gitignore +++ b/.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-* diff --git a/.hgignore b/.hgignore index 5c9754e2ec..80e59634db 100644 --- a/.hgignore +++ b/.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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 17bb9b307d..b37315d030 100644 --- a/CONTRIBUTING.md +++ b/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,48 @@ 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 +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". +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. # 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 +71,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/README.txt][5] + +- 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 +130,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] @@ -113,3 +157,6 @@ 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 diff --git a/Filelist b/Filelist index 22a987c4db..9ab71cb892 100644 --- a/Filelist +++ b/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 \ @@ -76,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 \ @@ -147,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 \ @@ -157,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 \ @@ -171,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 \ @@ -178,64 +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/Make_all.mak \ + src/testdir/README.txt \ + src/testdir/commondumps.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/sautest/autoload/*.vim \ - src/testdir/testluaplugin/lua/testluaplugin/*.lua \ - src/testdir/check.vim \ - 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/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/Makefile \ - src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.po \ - 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 \ @@ -277,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 \ @@ -329,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 \ @@ -338,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 \ @@ -349,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 \ @@ -481,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 \ @@ -499,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. @@ -521,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 \ @@ -532,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 \ @@ -541,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 \ @@ -596,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 \ @@ -609,8 +638,8 @@ 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 \ @@ -649,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). @@ -680,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 \ @@ -773,10 +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/sr/vim-01-beginner.tutor \ - runtime/tutor/sr/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 \ @@ -803,7 +830,10 @@ RT_ALL = \ runtime/pack/dist/opt/editorconfig/ftdetect/editorconfig.vim \ runtime/pack/dist/opt/editorconfig/plugin/editorconfig.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 \ @@ -816,8 +846,9 @@ RT_ALL = \ 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/own.vim \ - runtime/pack/dist/opt/netrw/autoload/netrwSettings.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 \ @@ -856,6 +887,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 \ @@ -876,6 +908,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 \ @@ -918,7 +951,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 \ @@ -1072,24 +1104,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 \ @@ -1133,6 +1161,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 = \ @@ -1148,6 +1177,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 \ diff --git a/Makefile b/Makefile index 12aa1f37da..c334613455 100644 --- a/Makefile +++ b/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. @@ -408,7 +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) license nsis/gvim_version.nsh +dossrc: dist dist/$(COMMENT_SRC) license -rm -rf dist/vim$(VERSION)src.zip -rm -rf dist/vim mkdir dist/vim @@ -421,7 +423,6 @@ dossrc: dist dist/$(COMMENT_SRC) license nsis/gvim_version.nsh $(SRC_DOS_UNIX) \ lang/LICENSE.*.txt \ lang/README.*.txt \ - nsis/gvim_version.nsh \ | (cd dist/vim/$(VIMRTDIR); tar xf -) mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR) rmdir dist/vim/$(VIMRTDIR)/runtime @@ -430,9 +431,6 @@ dossrc: dist dist/$(COMMENT_SRC) license nsis/gvim_version.nsh license: cd nsis && $(MAKE) -f Makefile $@ -nsis/gvim_version.nsh: Makefile - cd nsis && $(MAKE) -f Makefile $(@F) - dosrt: dist dist/$(COMMENT_RT) dosrt_files -rm -rf dist/vim$(VERSION)rt.zip cd dist && zip -9 -rD -z vim$(VERSION)rt.zip vim <$(COMMENT_RT) diff --git a/README.md b/README.md index 980b8be3c2..f11c5643ec 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,78 @@ -Vim - the text editor - for macOS +

+MacVim logo
+MacVim +

+

+Website · Documentation +

+

+MacVim GitHub CI +GitHub release +Packaging status +

-- MacVim homepage: -- Download the latest version from [Releases](https://github.com/macvim-dev/macvim/releases/latest) +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. -- How to [build MacVim from source](https://github.com/macvim-dev/macvim/wiki/Building) +
-- Vim README: [README_vim.md](README_vim.md) +

+ + + + macvim-screenshot-light + +

-- [![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) +## Features -- 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) +- 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. + +## 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. diff --git a/README.txt b/README.txt index d90ebbc1fa..80ec9e3c43 100644 --- a/README.txt +++ b/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, diff --git a/README_vim.md b/README_vim.md index cfee68e8a2..30b0bd7b51 100644 --- a/README_vim.md +++ b/README_vim.md @@ -1,3 +1,16 @@ +
+ Special thanks for supporting Vim by donating to the ICCF: +
+
+ + Warp sponsorship + + +### [Warp, built for coding with multiple AI agents.](https://www.warp.dev/vim) +[Available for MacOS, Linux, & Windows](https://www.warp.dev/vim)
+
+
+ # [![Vim The editor](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org) [![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22) @@ -32,6 +45,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, diff --git a/ci/appveyor.bat b/ci/appveyor.bat index c77cee19d2..17d95ff691 100644 --- a/ci/appveyor.bat +++ b/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. diff --git a/ci/ddebs.list b/ci/ddebs.list new file mode 100644 index 0000000000..e4491a6042 --- /dev/null +++ b/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 diff --git a/ci/hlgroups.ignore b/ci/hlgroups.ignore new file mode 100644 index 0000000000..a046eb127d --- /dev/null +++ b/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 diff --git a/ci/hlgroups.make b/ci/hlgroups.make new file mode 100644 index 0000000000..65b39a8c1d --- /dev/null +++ b/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/.*: 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 diff --git a/ci/if_feat_check.vim b/ci/if_feat_check.vim new file mode 100644 index 0000000000..f846f7cbf8 --- /dev/null +++ b/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 diff --git a/ci/if_ver-1.vim b/ci/if_ver-1.vim index adc40a7cb0..397c05a456 100644 --- a/ci/if_ver-1.vim +++ b/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(':h') .. '/if_ver-cmd.vim' echo "*** Interface versions ***\n" diff --git a/ci/if_ver-2.vim b/ci/if_ver-2.vim index 83e80e48ff..f717ec1e56 100644 --- a/ci/if_ver-2.vim +++ b/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(':h') .. '/if_ver-cmd.vim' echo 'Python 3:' diff --git a/ci/lychee.toml b/ci/lychee.toml new file mode 100644 index 0000000000..941a2d7f6f --- /dev/null +++ b/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', +] diff --git a/ci/pinned-pkgs b/ci/pinned-pkgs new file mode 100644 index 0000000000..0603e141ab --- /dev/null +++ b/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 diff --git a/ci/unlisted.make b/ci/unlisted.make index 04dfcb53f3..6d506eb79c 100644 --- a/ci/unlisted.make +++ b/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)) diff --git a/lang/LICENSE.pt_br.txt b/lang/LICENSE.pt_br.txt new file mode 100644 index 0000000000..a3d6e9e1f9 --- /dev/null +++ b/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 é + +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. diff --git a/lang/README.pt_br.txt b/lang/README.pt_br.txt new file mode 100644 index 0000000000..f5084ce1d6 --- /dev/null +++ b/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: + + +AUTOR PRINCIPAL + +A maior parte do Vim foi criada por Bram Moolenaar , +":help Bram-Moolenaar" + +Envie quaisquer outros comentários, patches, flores e sugestões para +a lista de discussão vim-dev: diff --git a/lang/README.ru.txt b/lang/README.ru.txt index a2a29db45b..5a58e1ef87 100644 --- a/lang/README.ru.txt +++ b/lang/README.ru.txt @@ -20,6 +20,11 @@ README.ru.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! diff --git a/nsis/Make_mvc.mak b/nsis/Make_mvc.mak index c5aff151b9..a1f1ae4b34 100644 --- a/nsis/Make_mvc.mak +++ b/nsis/Make_mvc.mak @@ -1,10 +1,11 @@ # # Makefile for MS Windows for create self-installing exe of Vim. -# 05/04/2024, Restorer restorer@mail2k.ru +# 2025-10-03, Restorer, restorer@mail2k.ru # -#!INCLUDE .\Make_all.mak +# included common tools +!INCLUDE ..\src\auto\nmake\tools.mak .SUFFIXES : @@ -46,6 +47,10 @@ MKNSISFLAGS = $(MKNSISFLAGS) /DHAVE_MULTI_LANG=$(HAVE_MULTI_LANG) MKNSISFLAGS = $(MKNSISFLAGS) /DWIN64=$(WIN64) !ENDIF +!IFDEF ARM64 +MKNSISFLAGS = $(MKNSISFLAGS) /DARM64=$(ARM64) +!ENDIF + !IFDEF INCLUDE_LIBGCC MKNSISFLAGS = $(MKNSISFLAGS) /DINCLUDE_LIBGCC=$(INCLUDE_LIBGCC) !ENDIF @@ -56,66 +61,23 @@ XX = /X"$(X:;=" /X")" # 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 - -PS = powershell.exe -RM = del /f /q -RD = rmdir /s /q +MKNSIS = $(ProgFiles)\NSIS\makensis.exe MKNSISFLAGS = /INPUTCHARSET UTF8 $(MKNSISFLAGS) -PSFLAGS = -NoLogo -NoProfile -Command - -# Read MAJOR and MINOR from version.h. -!IF ![for /F "tokens=2,3" %G in ( \ - 'findstr /rc:"VIM_VERSION_MINOR[ ^]*[0-9^]" \ - /rc:"VIM_VERSION_MAJOR[ ^]*[0-9^]" ..\src\version.h') do \ - @if "VIM_VERSION_MAJOR"=="%G" (echo MAJOR=%H>>_ver.tmp) \ - else echo MINOR=%H>>_ver.tmp] -! INCLUDE .\_ver.tmp -! IF [$(RM) .\_ver.tmp] -! ENDIF -!ENDIF - -# Read PATCHLEVEL from version.c -!IF ![for /F %G in ( \ - 'findstr /nblc:"static int included_patches[^]" ..\src\version.c \ - ^| (set /p "_t=" ^& set /a _t+=2 ^)') do \ - @cmd /q /c "for /F "skip=%G delims=, " %H in (..\src\version.c) do \ - (echo PATCH=%H>_patchlvl.tmp & exit /b)"] -! INCLUDE .\_patchlvl.tmp -! IF [$(RM) .\_patchlvl.tmp] -! ENDIF -!ENDIF -!IF $(PATCH) < 10 -PATCH = 000$(PATCH) -!ELSEIF $(PATCH) < 100 -PATCH = 00$(PATCH) -!ELSEIF $(PATCH) < 1000 -PATCH = 0$(PATCH) -!ENDIF all : makeinst makeinst : prepare - ^"$(MKNSIS)\makensis.exe" $(MKNSISFLAGS) gvim.nsi $(XX) + ^"$(MKNSIS)" $(MKNSISFLAGS) gvim.nsi $(XX) -prepare : unzipicons gvim_version.nsh license rename +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(\"$**\", \".\") - -gvim_version.nsh : Make_mvc.mak - @ 1> $@ echo:^# Generated from Makefile: define the version numbers - @ 1>> $@ echo:^!ifndef __GVIM_VER__NSH__ - @ 1>> $@ echo:^!define __GVIM_VER__NSH__ - @ 1>> $@ echo:^!define VER_MAJOR $(MAJOR) - @ 1>> $@ echo:^!define VER_MINOR $(MINOR) - @ 1>> $@ echo:^!define PATCHLEVEL $(PATCH) - @ 1>> $@ echo:^!endif + [System.IO.Compression.ZipFile]::ExtractToDirectory('$**', '.') license : ..\lang\LICENSE.*.txt ..\LICENSE !@ $(PS) $(PSFLAGS) \ @@ -126,9 +88,8 @@ rename : @ ..\tools\rename.bat "$(SRC)" "$(DST)" 1> nul clean : - @ if exist .\gvim_version.nsh $(RM) .\gvim_version.nsh @ 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=0 ft=make: +# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=79 ft=make: diff --git a/nsis/Makefile b/nsis/Makefile index fdbc12012f..4b51b2ac71 100644 --- a/nsis/Makefile +++ b/nsis/Makefile @@ -1,6 +1,6 @@ # # Makefile for UNIX-like for create self-installing exe of Vim. -# 15/12/2024, Restorer restorer@mail2k.ru +# 2025-10-03, Restorer, restorer@mail2k.ru # @@ -39,6 +39,10 @@ ifdef WIN64 MKNSISFLAGS := $(MKNSISFLAGS) -DWIN64=$(WIN64) endif +ifdef ARM64 +MKNSISFLAGS := $(MKNSISFLAGS) -DARM64=$(ARM64) +endif + ifdef INCLUDE_LIBGCC MKNSISFLAGS := $(MKNSISFLAGS) -DINCLUDE_LIBGCC=$(INCLUDE_LIBGCC) endif @@ -47,13 +51,6 @@ ifdef X XX := -X"$(X:;=" -X")" endif -MAJOR != grep -E 'VIM_VERSION_MAJOR\s{2,}' ../src/version.h | \ - awk '{ printf "%d",$$3 }' -MINOR != grep -E 'VIM_VERSION_MINOR\s{2,}' ../src/version.h | \ - awk '{ printf "%d",$$3 }' -PATCH != awk '/number below this line/,/,/' ../src/version.c | \ - awk 'NR == 3 { printf "%04d",$$1 }' | sed -e 's/[ ,]//g' - MKNSISFLAGS := -INPUTCHARSET UTF8 $(MKNSISFLAGS) all: makeinst @@ -61,21 +58,12 @@ all: makeinst makeinst: prepare makensis $(MKNSISFLAGS) gvim.nsi $(XX) -prepare: unzipicons gvim_version.nsh license rename +prepare: unzipicons license rename unzipicons: icons.zip if test -d `basename $? .zip` ; then rm -rf `basename $? .zip` ; fi unzip $? -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 "!define PATCHLEVEL $(PATCH)" >> $@ - echo "!endif" >> $@ - license: ../lang/LICENSE.*.txt ../LICENSE for lic in $? ; do \ bn=`basename $$lic .txt` ; \ @@ -87,7 +75,6 @@ rename: ../tools/rename.bat "$(SRC)" "$(DST)" clean: - if test -f gvim_version.nsh ; then rm -f gvim_version.nsh ; fi 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 diff --git a/nsis/README.txt b/nsis/README.txt index 4b4b7a0fbc..c4f3645ab1 100644 --- a/nsis/README.txt +++ b/nsis/README.txt @@ -101,8 +101,12 @@ Variables and their values available for building the installer (not mandatory): "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=" — executes scriptcmd in script. If multiple scriptcmd are specified, they are separated by a semicolon. Example "X=OutFile MyVim.exe;XPMode on" "MKNSIS=" — the directory where the "makensis.exe" program is located. + +Note: for icons used in the installer, see the README.txt in the icons.zip diff --git a/nsis/auxiliary.nsh b/nsis/auxiliary.nsh new file mode 100644 index 0000000000..c350f69e0b --- /dev/null +++ b/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: diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index 878867f68f..5cfc051226 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -1,8 +1,10 @@ +# -*- coding: utf-8 -*- # NSIS file to create a self-installing exe for Vim. # It requires NSIS version 3.0 or later. -# Last Change: 2025 Jan 05 +# Last Change: 2025-09-30 +# -Unicode true +Unicode true ; !include defaults to UTF-8 after Unicode True since 3.0 Alpha 2 # WARNING: if you make changes to this script, look out for $0 to be valid, # because uninstall deletes most files in $0. @@ -53,148 +55,161 @@ Unicode true !define WIN64 0 !endif +# if you want to create the installer for ARM64, use the /DARM64=1 on +# the command line makensis.exe. This property will be set to 1. +!ifndef ARM64 + !define ARM64 0 +!else + !if ${ARM64} > 0 + !if ${WIN64} < 1 + !define /redef WIN64 1 + !endif + !endif +!endif + # if you don't want to include libgcc_s_sjlj-1.dll in the package, use the # switch /DINCLUDE_LIBGCC=0 on the command line makensis.exe. !ifndef INCLUDE_LIBGCC !define INCLUDE_LIBGCC 1 !endif -!include gvim_version.nsh # for version number +# Get version numbers +!getdllversion "${VIMSRC}\gvim_ole.exe" VimVer_ +!echo "Vim version MAJOR=${VimVer_1} MINOR=${VimVer_2} PATCHLEVEL=${VimVer_3}" -# Definition of Patch for Vim. +!ifndef VER_MAJOR + !define VER_MAJOR ${VimVer_1} +!endif +!ifndef VER_MINOR + !define VER_MINOR ${VimVer_2} +!endif !ifndef PATCHLEVEL - !define PATCHLEVEL 0 + !define PATCHLEVEL ${VimVer_3} !endif # ----------- No configurable settings below this line ----------- -!include "Library.nsh" # for DLL install -!include "LogicLib.nsh" -!include "MUI2.nsh" -!include "nsDialogs.nsh" -!include "Sections.nsh" -!include "x64.nsh" -!include "StrFunc.nsh" -${StrRep} - -# 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` - -!define PRODUCT "Vim ${VER_MAJOR}.${VER_MINOR}" -!define UNINST_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall" -!define UNINST_REG_KEY_VIM "${UNINST_REG_KEY}\${PRODUCT}" +########################################################## +# Installer Attributes, Including headers, Plugins and etc. -!if ${WIN64} -Name "${PRODUCT} (x64)" -!else -Name "${PRODUCT}" -!endif -OutFile gvim${VER_MAJOR}${VER_MINOR}.exe CRCCheck force + SetCompressor /SOLID lzma SetCompressorDictSize 64 -ManifestDPIAware true SetDatablockOptimize on -RequestExecutionLevel highest !if ${HAVE_UPX} - !packhdr temp.dat "upx --best --compress-icons=1 temp.dat" + !packhdr temp.dat "upx.exe --best --compress-icons=1 temp.dat" !endif +RequestExecutionLevel highest +ManifestDPIAware true +# https://github.com/NSIS-Dev/nsis/blob/691211035c2aaaebe8fbca48ee02d4de93594a52/Docs/src/attributes.but#L292 +ManifestDPIAwareness "PerMonitorV2,System" +ManifestSupportedOS \ + {35138b9a-5d96-4fbd-8e2d-a2440225f93a} /* WinNT 6.1 */ \ + {4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38} /* WinNT 6.2 */ \ + {1f676c76-80e1-4239-95bb-83d0f6d0da78} /* WinNT 6.3 */ \ + {8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a} /* WinNT 10/11 */ + +!define PRODUCT "Vim ${VER_MAJOR}.${VER_MINOR}" +!define UNINST_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall" +!define UNINST_REG_KEY_VIM "${UNINST_REG_KEY}\${PRODUCT}" + !if ${WIN64} -!define BIT 64 + !define BIT 64 +# This adds '\Vim' to the user choice automagically. The actual value is +# obtained below with CheckOldVim. + !define DEFAULT_INSTDIR "$PROGRAMFILES64\Vim" + !if ${ARM64} + Name "${PRODUCT} (ARM64)" + !else + Name "${PRODUCT} (x64)" + !endif !else -!define BIT 32 + !define BIT 32 + !define DEFAULT_INSTDIR "$PROGRAMFILES\Vim" + Name "${PRODUCT}" !endif +OutFile gvim${VER_MAJOR}${VER_MINOR}.exe +InstallDir ${DEFAULT_INSTDIR} +BrandingText "Vim - the text editor" + +# Types of installs we can perform: +InstType $(str_type_typical) +InstType $(str_type_minimal) +InstType $(str_type_full) + +SilentInstall normal + +########################################################## +# Version resources + +VIFileVersion ${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0 +VIProductVersion ${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0 +VIAddVersionKey /LANG=0 "ProductName" "Vim" +VIAddVersionKey /LANG=0 "CompanyName" "The Vim Project" +VIAddVersionKey /LANG=0 "LegalTrademarks" "Vim" +VIAddVersionKey /LANG=0 "LegalCopyright" "Copyright (C) 1996" +VIAddVersionKey /LANG=0 "FileDescription" \ + "Vi Improved - A Text Editor" +VIAddVersionKey /LANG=0 "ProductVersion" \ + "${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0" +VIAddVersionKey /LANG=0 "FileVersion" \ + "${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0" + +########################################################## +# including headers + +!include "Library.nsh" ; for DLL install +!include "LogicLib.nsh" +!include "MUI2.nsh" ; new user interface +!include "nsDialogs.nsh" +!include "Sections.nsh" ; for section control +!include "x64.nsh" + +!include .\auxiliary.nsh ; helper file + ########################################################## # MUI2 settings !define MUI_ABORTWARNING !define MUI_UNABORTWARNING -!define MUI_ICON "icons\vim_16c.ico" -!define MUI_UNICON "icons\vim_uninst_16c.ico" +!define MUI_ICON "icons\in_vim_32bpp.ico" +!define MUI_UNICON "icons\un_vim_32bpp.ico" # Show all languages, despite user's codepage: !define MUI_LANGDLL_ALLLANGUAGES # Always show dialog choice language #!define MUI_LANGDLL_ALWAYSSHOW -!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" -!define MUI_LANGDLL_REGISTRY_KEY "Software\Vim" +!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" +!define MUI_LANGDLL_REGISTRY_KEY "Software\Vim" !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" -!define MUI_WELCOMEFINISHPAGE_BITMAP "icons\welcome.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "icons\uninstall.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP "icons\in_welcome.bmp" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "icons\un_welcome.bmp" !define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "icons\header.bmp" -!define MUI_HEADERIMAGE_UNBITMAP "icons\un_header.bmp" +!define MUI_HEADERIMAGE_BITMAP "icons\in_header.bmp" +!define MUI_HEADERIMAGE_UNBITMAP "icons\un_header.bmp" -!define MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH "AspectFitHeight" +!define MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH "AspectFitHeight" !define MUI_UNWELCOMEFINISHPAGE_BITMAP_STRETCH "AspectFitHeight" -!define MUI_HEADERIMAGE_BITMAP_STRETCH "AspectFitHeight" -!define MUI_HEADERIMAGE_UNBITMAP_STRETCH "AspectFitHeight" +!define MUI_HEADERIMAGE_BITMAP_STRETCH "AspectFitHeight" +!define MUI_HEADERIMAGE_UNBITMAP_STRETCH "AspectFitHeight" !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_LICENSEPAGE_CHECKBOX !define MUI_FINISHPAGE_SHOWREADME -!define MUI_FINISHPAGE_SHOWREADME_TEXT $(str_show_readme) -!define MUI_FINISHPAGE_SHOWREADME_FUNCTION LaunchApplication - -# This adds '\Vim' to the user choice automagically. The actual value is -# obtained below with CheckOldVim. -!if ${WIN64} - !define DEFAULT_INSTDIR "$PROGRAMFILES64\Vim" -!else - !define DEFAULT_INSTDIR "$PROGRAMFILES\Vim" -!endif -InstallDir ${DEFAULT_INSTDIR} +!define MUI_FINISHPAGE_SHOWREADME_TEXT $(str_show_readme) +!define MUI_FINISHPAGE_SHOWREADME_FUNCTION LaunchApplication -# Types of installs we can perform: -InstType $(str_type_typical) -InstType $(str_type_minimal) -InstType $(str_type_full) - -SilentInstall normal - -# General custom functions for MUI2: -#!define MUI_CUSTOMFUNCTION_ABORT VimOnUserAbort -#!define MUI_CUSTOMFUNCTION_UNABORT un.VimOnUserAbort - -# Installer pages +# Installer pages: !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE $(page_lic_file) !insertmacro MUI_PAGE_COMPONENTS Page custom SetCustom ValidateCustom -#!define MUI_PAGE_CUSTOMFUNCTION_LEAVE VimFinalCheck !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES !define MUI_FINISHPAGE_NOREBOOTSUPPORT @@ -202,7 +217,6 @@ Page custom SetCustom ValidateCustom # Uninstaller pages: !insertmacro MUI_UNPAGE_CONFIRM -#!define MUI_PAGE_CUSTOMFUNCTION_LEAVE un.VimCheckRunning !insertmacro MUI_UNPAGE_COMPONENTS !insertmacro MUI_UNPAGE_INSTFILES !define MUI_FINISHPAGE_NOREBOOTSUPPORT @@ -216,30 +230,21 @@ Page custom SetCustom ValidateCustom # Include support for other languages: !if ${HAVE_MULTI_LANG} - !include "lang\danish.nsi" - !include "lang\dutch.nsi" - !include "lang\german.nsi" - !include "lang\greek.nsi" - !include "lang\italian.nsi" - !include "lang\japanese.nsi" - !include "lang\russian.nsi" - !include "lang\serbian.nsi" - !include "lang\simpchinese.nsi" - !include "lang\tradchinese.nsi" - !include "lang\turkish.nsi" + !include "lang\danish.nsi" + !include "lang\dutch.nsi" + !include "lang\german.nsi" + !include "lang\greek.nsi" + !include "lang\italian.nsi" + !include "lang\japanese.nsi" + !include "lang\portuguesebr.nsi" + !include "lang\russian.nsi" + !include "lang\serbian.nsi" + !include "lang\simpchinese.nsi" + !include "lang\tradchinese.nsi" + !include "lang\turkish.nsi" !endif ########################################################## -# Version resources - -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Vim" -VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The Vim Project" -VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Vim" -VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (C) 1996" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Vi Improved - A Text Editor" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0" -VIProductVersion "${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0" - # Global variables Var vim_dialog Var vim_nsd_compat @@ -248,65 +253,14 @@ Var vim_nsd_mouse Var vim_compat_stat Var vim_keymap_stat Var vim_mouse_stat -!if ${HAVE_NLS} -Var lng_usr -!endif - +########################################################## # Reserve files ReserveFile ${VIMSRC}\installw32.exe ########################################################## # Functions -# 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." - # Check if Vim is already installed. # return: Installed directory. If not found, it will be empty. Function CheckOldVim @@ -320,11 +274,11 @@ Function CheckOldVim ${EndIf} ClearErrors - StrCpy $0 "" # Installed directory - StrCpy $R0 0 # Sub-key index - StrCpy $R1 "" # Sub-key + StrCpy $0 "" ; Installed directory + StrCpy $R0 0 ; Sub-key index + StrCpy $R1 "" ; Sub-key ${Do} - # Eumerate the sub-key: + # Enumerate the sub-key: EnumRegKey $R1 HKLM ${UNINST_REG_KEY} $R0 # Stop if no more sub-key: @@ -359,7 +313,7 @@ Function CheckOldVim Push $R2 call GetParent call GetParent - Pop $0 # Vim directory + Pop $0 ; Vim directory ${ExitDo} ${Loop} @@ -371,450 +325,419 @@ Function CheckOldVim Pop $R2 Pop $R1 Pop $R0 - Exch $0 # put $0 on top of stack, restore $0 to original value + Exch $0 ; put $0 on top of stack, restore $0 to original value FunctionEnd Function LaunchApplication - SetOutPath $0 - ShellExecAsUser::ShellExecAsUser "" "$0\gvim.exe" '-R "$0\$(vim_readme_file)"' + SetOutPath $0 + !if ${HAVE_NLS} + ShellExecAsUser::ShellExecAsUser "" "$0\gvim.exe" \ + '-R "$0\$(vim_readme_file)"' + !else + ShellExecAsUser::ShellExecAsUser "" "$0\gvim.exe" '-R "$0\README.txt"' + !endif FunctionEnd ########################################################## -Section "$(str_section_old_ver)" id_section_old_ver - SectionIn 1 2 3 RO - - # run the install program to check for already installed versions - SetOutPath $TEMP - File /oname=install.exe ${VIMSRC}\installw32.exe - DetailPrint "$(str_msg_uninstalling)" - ${Do} - nsExec::Exec "$TEMP\install.exe -uninstall-check" - Pop $3 - - call CheckOldVim - Pop $3 - ${If} $3 == "" - ${ExitDo} - ${Else} - # It seems that the old version is still remaining. - # TODO: Should we show a warning and run the uninstaller again? - - ${ExitDo} # Just ignore for now. - ${EndIf} - ${Loop} - Delete $TEMP\install.exe - Delete $TEMP\vimini.ini # install.exe creates this, but we don't need it. - - # We may have been put to the background when uninstall did something. - BringToFront -SectionEnd - -########################################################## -Section "$(str_section_exe)" id_section_exe - SectionIn 1 2 3 RO - - # we need also this here if the user changes the instdir - StrCpy $0 "$INSTDIR\vim${VER_MAJOR}${VER_MINOR}" - - SetOutPath $0 - File /oname=gvim.exe ${VIMSRC}\gvim_ole.exe -!if /FileExists "${VIMSRC}\vim${BIT}.dll" - File ${VIMSRC}\vim${BIT}.dll -!endif - File /oname=install.exe ${VIMSRC}\installw32.exe - File /oname=uninstall.exe ${VIMSRC}\uninstallw32.exe - File ${VIMSRC}\vimrun.exe - File /oname=tee.exe ${VIMSRC}\teew32.exe - File /oname=xxd.exe ${VIMSRC}\xxdw32.exe - File ..\vimtutor.bat - File ..\README.txt - File /oname=LICENSE.txt ..\LICENSE - File ..\uninstall.txt - File ${VIMRT}\*.vim - -!if /FileExists "${VIMTOOLS}\diff.exe" - File ${VIMTOOLS}\diff.exe -!endif -!if /FileExists "${VIMTOOLS}\winpty${BIT}.dll" - File ${VIMTOOLS}\winpty${BIT}.dll -!endif -!if /FileExists "${VIMTOOLS}\winpty-agent.exe" - File ${VIMTOOLS}\winpty-agent.exe -!endif -!if /FileExists "${VIMTOOLS}\libsodium.dll" - File ${VIMTOOLS}\libsodium.dll -!endif - - SetOutPath $0\colors - File /r ${VIMRT}\colors\*.* +# Installer Functions and Sections - SetOutPath $0\compiler - File ${VIMRT}\compiler\*.* - - SetOutPath $0\doc - File /x uganda.nsis.txt ${VIMRT}\doc\*.txt - File ${VIMRT}\doc\tags - - SetOutPath $0\ftplugin - File ${VIMRT}\ftplugin\*.* - - SetOutPath $0\indent - File ${VIMRT}\indent\README.txt - File ${VIMRT}\indent\*.vim - - SetOutPath $0\keymap - File ${VIMRT}\keymap\README.txt - File ${VIMRT}\keymap\*.vim - - SetOutPath $0\macros - File /r /x *.info ${VIMRT}\macros\*.* - - SetOutPath $0\pack - File /r ${VIMRT}\pack\*.* - - SetOutPath $0\plugin - File ${VIMRT}\plugin\*.* +Section "$(str_section_old_ver)" id_section_old_ver + SectionIn 1 2 3 RO - SetOutPath $0\autoload - File /r ${VIMRT}\autoload\*.* + # run the install program to check for already installed versions + SetOutPath $TEMP + File /oname=install.exe ${VIMSRC}\installw32.exe + DetailPrint "$(str_msg_uninstalling)" + ${Do} + nsExec::Exec "$TEMP\install.exe -uninstall-check" + Pop $3 - SetOutPath $0\import\dist - File ${VIMRT}\import\dist\*.* + call CheckOldVim + Pop $3 + ${If} $3 == "" + ${ExitDo} + ${Else} + # It seems that the old version is still remaining. + # TODO: Should we show a warning and run the uninstaller again? - SetOutPath $0\bitmaps - File ${VIMSRC}\vim.ico + ${ExitDo} ; Just ignore for now. + ${EndIf} + ${Loop} + Delete $TEMP\install.exe + Delete $TEMP\vimini.ini ; install.exe creates this, but we don't need it. - SetOutPath $0\syntax - File /r /x testdir /x generator /x Makefile ${VIMRT}\syntax\*.* + # We may have been put to the background when uninstall did something. + BringToFront +SectionEnd - SetOutPath $0\spell - File ${VIMRT}\spell\*.txt - File ${VIMRT}\spell\*.vim - File ${VIMRT}\spell\*.spl - File ${VIMRT}\spell\*.sug +########################################################## +Section "$(str_section_exe)" id_section_exe + SectionIn 1 2 3 RO - SetOutPath $0\tools - File ${VIMRT}\tools\*.* + # we need also this here if the user changes the instdir + StrCpy $0 "$INSTDIR\vim${VER_MAJOR}${VER_MINOR}" - SetOutPath $0\tutor - File /x Makefile /x *.info ${VIMRT}\tutor\*.* + SetOutPath $0 + File /oname=gvim.exe ${VIMSRC}\gvim_ole.exe + !if /FileExists "${VIMSRC}\vim${BIT}.dll" + File ${VIMSRC}\vim${BIT}.dll + !endif + File /oname=install.exe ${VIMSRC}\installw32.exe + File /oname=uninstall.exe ${VIMSRC}\uninstallw32.exe + File ${VIMSRC}\vimrun.exe + File /oname=tee.exe ${VIMSRC}\teew32.exe + File /oname=xxd.exe ${VIMSRC}\xxdw32.exe + File ..\vimtutor.bat + File ..\README.txt + File /oname=LICENSE.txt ..\LICENSE + File ..\uninstall.txt + File ${VIMRT}\*.vim + + !if /FileExists "${VIMTOOLS}\diff.exe" + File ${VIMTOOLS}\diff.exe + !endif + !if /FileExists "${VIMTOOLS}\winpty${BIT}.dll" + File ${VIMTOOLS}\winpty${BIT}.dll + !endif + !if /FileExists "${VIMTOOLS}\winpty-agent.exe" + File ${VIMTOOLS}\winpty-agent.exe + !endif + !if /FileExists "${VIMTOOLS}\libsodium.dll" + File ${VIMTOOLS}\libsodium.dll + !endif + + SetOutPath $0\colors + File /r ${VIMRT}\colors\*.* + + SetOutPath $0\compiler + File ${VIMRT}\compiler\*.* + + SetOutPath $0\doc + File /x uganda.nsis.txt ${VIMRT}\doc\*.txt + File ${VIMRT}\doc\tags + + SetOutPath $0\ftplugin + File ${VIMRT}\ftplugin\*.* + + SetOutPath $0\indent + File ${VIMRT}\indent\README.txt + File ${VIMRT}\indent\*.vim + + SetOutPath $0\keymap + File ${VIMRT}\keymap\README.txt + File ${VIMRT}\keymap\*.vim + + SetOutPath $0\macros + File /r /x *.info ${VIMRT}\macros\*.* + + SetOutPath $0\pack + File /r ${VIMRT}\pack\*.* + + SetOutPath $0\plugin + File ${VIMRT}\plugin\*.* + + SetOutPath $0\autoload + File /r ${VIMRT}\autoload\*.* + + SetOutPath $0\import\dist + File ${VIMRT}\import\dist\*.* + + SetOutPath $0\bitmaps + File ${VIMSRC}\vim.ico + + SetOutPath $0\syntax + File /r /x testdir /x generator /x Makefile ${VIMRT}\syntax\*.* + + SetOutPath $0\spell + File ${VIMRT}\spell\*.txt + File ${VIMRT}\spell\*.vim + File ${VIMRT}\spell\*.spl + File ${VIMRT}\spell\*.sug + + SetOutPath $0\tools + File ${VIMRT}\tools\*.* + + SetOutPath $0\tutor + File /r /x *.info ${VIMRT}\tutor\*.* SectionEnd ########################################################## Section "$(str_section_console)" id_section_console - SectionIn 1 3 + SectionIn 1 3 - SetOutPath $0 - File /oname=vim.exe ${VIMSRC}\vimw32.exe - StrCpy $2 "$2 vim view vimdiff" + SetOutPath $0 + File /oname=vim.exe ${VIMSRC}\vimw32.exe + StrCpy $2 "$2 vim view vimdiff" SectionEnd ########################################################## Section "$(str_section_batch)" id_section_batch - SectionIn 3 + SectionIn 3 - StrCpy $1 "$1 -create-batfiles $2" + StrCpy $1 "$1 -create-batfiles $2" SectionEnd ########################################################## SectionGroup $(str_group_icons) id_group_icons - Section "$(str_section_desktop)" id_section_desktop - SectionIn 1 3 + Section "$(str_section_desktop)" id_section_desktop + SectionIn 1 3 - StrCpy $1 "$1 -install-icons" - SectionEnd + StrCpy $1 "$1 -install-icons" + SectionEnd - Section "$(str_section_start_menu)" id_section_startmenu - SectionIn 1 3 + Section "$(str_section_start_menu)" id_section_startmenu + SectionIn 1 3 - StrCpy $1 "$1 -add-start-menu" - SectionEnd + StrCpy $1 "$1 -add-start-menu" + SectionEnd SectionGroupEnd ########################################################## Section "$(str_section_edit_with)" id_section_editwith - SectionIn 1 3 - - SetOutPath $0 - - ${If} ${RunningX64} - # Install 64-bit gvimext.dll into the GvimExt64 directory. - SetOutPath $0\GvimExt64 - ClearErrors - !define LIBRARY_SHELL_EXTENSION - !define LIBRARY_X64 - !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "${VIMSRC}\GvimExt\gvimext64.dll" \ - "$0\GvimExt64\gvimext.dll" "$0" - !undef LIBRARY_X64 - !undef LIBRARY_SHELL_EXTENSION - ${EndIf} - - # Install 32-bit gvimext.dll into the GvimExt32 directory. - SetOutPath $0\GvimExt32 - ClearErrors - !define LIBRARY_SHELL_EXTENSION - !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "${VIMSRC}\GvimExt\gvimext.dll" \ - "$0\GvimExt32\gvimext.dll" "$0" - !undef LIBRARY_SHELL_EXTENSION + SectionIn 1 3 + + SetOutPath $0 + + ${If} ${RunningX64} + # Install 64-bit gvimext.dll into the GvimExt64 directory. + SetOutPath $0\GvimExt64 + ClearErrors + !define LIBRARY_SHELL_EXTENSION + !define LIBRARY_X64 + !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "${VIMSRC}\GvimExt\gvimext64.dll" "$0\GvimExt64\gvimext.dll" "$0" + !undef LIBRARY_X64 + !undef LIBRARY_SHELL_EXTENSION + ${EndIf} - # We don't have a separate entry for the "Open With..." menu, assume - # the user wants either both or none. - StrCpy $1 "$1 -install-popup -install-openwith" + # Install 32-bit gvimext.dll into the GvimExt32 directory. + SetOutPath $0\GvimExt32 + ClearErrors + !define LIBRARY_SHELL_EXTENSION + !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "${VIMSRC}\GvimExt\gvimext.dll" "$0\GvimExt32\gvimext.dll" "$0" + !undef LIBRARY_SHELL_EXTENSION + + # We don't have a separate entry for the "Open With..." menu, assume + # the user wants either both or none. + StrCpy $1 "$1 -install-popup -install-openwith" SectionEnd ########################################################## Section "$(str_section_vim_rc)" id_section_vimrc - SectionIn 1 3 - - StrCpy $1 "$1 -create-vimrc" - - ${If} ${RunningX64} - SetRegView 64 - ${EndIf} - WriteRegStr HKLM "${UNINST_REG_KEY_VIM}" "vim_compat" "$vim_compat_stat" - WriteRegStr HKLM "${UNINST_REG_KEY_VIM}" "vim_keyremap" "$vim_keymap_stat" - WriteRegStr HKLM "${UNINST_REG_KEY_VIM}" "vim_mouse" "$vim_mouse_stat" - ${If} ${RunningX64} - SetRegView lastused - ${EndIf} - - ${If} $vim_compat_stat == "vi" - StrCpy $1 "$1 -vimrc-compat vi" - ${ElseIf} $vim_compat_stat == "vim" - StrCpy $1 "$1 -vimrc-compat vim" - ${ElseIf} $vim_compat_stat == "defaults" - StrCpy $1 "$1 -vimrc-compat defaults" - ${Else} - StrCpy $1 "$1 -vimrc-compat all" - ${EndIf} - - ${If} $vim_keymap_stat == "default" - StrCpy $1 "$1 -vimrc-remap no" - ${Else} - StrCpy $1 "$1 -vimrc-remap win" - ${EndIf} - - ${If} $vim_mouse_stat == "default" - StrCpy $1 "$1 -vimrc-behave default" - ${ElseIf} $vim_mouse_stat == "windows" - StrCpy $1 "$1 -vimrc-behave mswin" - ${Else} - StrCpy $1 "$1 -vimrc-behave unix" - ${EndIf} + SectionIn 1 3 -SectionEnd + StrCpy $1 "$1 -create-vimrc" -########################################################## -SectionGroup $(str_group_plugin) id_group_plugin - Section "$(str_section_plugin_home)" id_section_pluginhome - SectionIn 1 3 + ${If} ${RunningX64} + SetRegView 64 + ${EndIf} + WriteRegStr HKLM "${UNINST_REG_KEY_VIM}" "vim_compat" "$vim_compat_stat" + WriteRegStr HKLM "${UNINST_REG_KEY_VIM}" "vim_keyremap" "$vim_keymap_stat" + WriteRegStr HKLM "${UNINST_REG_KEY_VIM}" "vim_mouse" "$vim_mouse_stat" + ${If} ${RunningX64} + SetRegView lastused + ${EndIf} - # use ShellExecAsUser below instead - # StrCpy $1 "$1 -create-directories home" - SectionEnd + ${If} $vim_compat_stat == "vi" + StrCpy $1 "$1 -vimrc-compat vi" + ${ElseIf} $vim_compat_stat == "vim" + StrCpy $1 "$1 -vimrc-compat vim" + ${ElseIf} $vim_compat_stat == "defaults" + StrCpy $1 "$1 -vimrc-compat defaults" + ${Else} + StrCpy $1 "$1 -vimrc-compat all" + ${EndIf} - Section "$(str_section_plugin_vim)" id_section_pluginvim - SectionIn 3 + ${If} $vim_keymap_stat == "default" + StrCpy $1 "$1 -vimrc-remap no" + ${Else} + StrCpy $1 "$1 -vimrc-remap win" + ${EndIf} - StrCpy $1 "$1 -create-directories vim" - SectionEnd + ${If} $vim_mouse_stat == "default" + StrCpy $1 "$1 -vimrc-behave default" + ${ElseIf} $vim_mouse_stat == "windows" + StrCpy $1 "$1 -vimrc-behave mswin" + ${Else} + StrCpy $1 "$1 -vimrc-behave unix" + ${EndIf} +SectionEnd + +########################################################## +SectionGroup $(str_group_plugin) id_group_plugin + Section "$(str_section_plugin_home)" id_section_pluginhome + SectionIn 1 3 + # use ShellExecAsUser below instead + # StrCpy $1 "$1 -create-directories home" + SectionEnd + + Section "$(str_section_plugin_vim)" id_section_pluginvim + SectionIn 3 + StrCpy $1 "$1 -create-directories vim" + SectionEnd SectionGroupEnd ########################################################## !if ${HAVE_NLS} -Section "$(str_section_nls)" id_section_nls - SectionIn 1 3 - - SetOutPath $INSTDIR -!if /FileExists "..\lang\README.*.txt" - File ..\lang\README.*.txt - CopyFiles /SILENT /FILESONLY $INSTDIR\README.$lng_usr.txt \ - $INSTDIR\vim${VER_MAJOR}${VER_MINOR}\README.$lng_usr.txt - Delete $INSTDIR\README.*.txt -!endif -!if /FileExists "..\lang\LICENSE.??.txt" - File ..\lang\LICENSE.??.txt -!if /FileExists "..\lang\LICENSE.??_??.txt" - File ..\lang\LICENSE.??_??.txt -!endif - CopyFiles /SILENT /FILESONLY $INSTDIR\LICENSE.$lng_usr.txt \ - $INSTDIR\vim${VER_MAJOR}${VER_MINOR}\LICENSE.$lng_usr.txt - Delete $INSTDIR\LICENSE.*.txt -!endif - - SetOutPath $0\lang - File /r /x Makefile ${VIMRT}\lang\*.* - SetOutPath $0 - !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "${GETTEXT}\gettext${BIT}\libintl-8.dll" \ - "$0\libintl-8.dll" "$0" - !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "${GETTEXT}\gettext${BIT}\libiconv-2.dll" \ - "$0\libiconv-2.dll" "$0" -!if ${INCLUDE_LIBGCC} -!if /FileExists "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll" - # Install libgcc_s_sjlj-1.dll only if it is needed. + Section "$(str_section_nls)" id_section_nls + SectionIn 1 3 + + SetOutPath $INSTDIR + !if /FileExists "..\lang\README.*.txt" + File ..\lang\README.*.txt + CopyFiles /SILENT /FILESONLY $INSTDIR\README.$lng_usr.txt \ + $INSTDIR\vim${VER_MAJOR}${VER_MINOR}\README.$lng_usr.txt + Delete $INSTDIR\README.*.txt + !endif + StrCpy $R7 0 + !if /FileExists "..\lang\LICENSE.??.txt" + File ..\lang\LICENSE.??.txt + IntOp $R7 $R7 + 1 + !endif + !if /FileExists "..\lang\LICENSE.??_??.txt" + File ..\lang\LICENSE.??_??.txt + IntOp $R7 $R7 + 1 + !endif + IntCmp $R7 0 notcpy notcpy cpy + cpy: + CopyFiles /SILENT /FILESONLY $INSTDIR\LICENSE.$lng_usr.txt \ + $INSTDIR\vim${VER_MAJOR}${VER_MINOR}\LICENSE.$lng_usr.txt + Delete $INSTDIR\LICENSE.*.txt + notcpy: + + SetOutPath $0\lang + File /r /x Makefile ${VIMRT}\lang\*.* + SetOutPath $0 + !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "${GETTEXT}\gettext${BIT}\libintl-8.dll" "$0\libintl-8.dll" "$0" + !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "${GETTEXT}\gettext${BIT}\libiconv-2.dll" "$0\libiconv-2.dll" "$0" + # Install libgcc_s_sjlj-1.dll only if it is needed. + !if ${INCLUDE_LIBGCC} + !if /FileExists "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll" !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll" \ "$0\libgcc_s_sjlj-1.dll" "$0" -!endif -!endif + !endif + !endif - ${If} ${SectionIsSelected} ${id_section_editwith} - ${If} ${RunningX64} - # Install DLLs for 64-bit gvimext.dll into the GvimExt64 directory. - SetOutPath $0\GvimExt64 - ClearErrors - !define LIBRARY_X64 - !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "${GETTEXT}\gettext64\libintl-8.dll" \ - "$0\GvimExt64\libintl-8.dll" "$0\GvimExt64" + ${If} ${SectionIsSelected} ${id_section_editwith} + ${If} ${RunningX64} + # Install DLLs for 64-bit gvimext.dll into the GvimExt64 directory. + SetOutPath $0\GvimExt64 + ClearErrors + !define LIBRARY_X64 + !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "${GETTEXT}\gettext64\libintl-8.dll" \ + "$0\GvimExt64\libintl-8.dll" "$0\GvimExt64" + !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "${GETTEXT}\gettext64\libiconv-2.dll" \ + "$0\GvimExt64\libiconv-2.dll" "$0\GvimExt64" + !undef LIBRARY_X64 + ${EndIf} + + # Install DLLs for 32-bit gvimext.dll into the GvimExt32 directory. + SetOutPath $0\GvimExt32 + ClearErrors + !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "${GETTEXT}\gettext32\libintl-8.dll" \ + "$0\GvimExt32\libintl-8.dll" "$0\GvimExt32" + !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "${GETTEXT}\gettext32\libiconv-2.dll" \ + "$0\GvimExt32\libiconv-2.dll" "$0\GvimExt32" + # Install libgcc_s_sjlj-1.dll only if it is needed. + !if ${INCLUDE_LIBGCC} + !if /FileExists "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "${GETTEXT}\gettext64\libiconv-2.dll" \ - "$0\GvimExt64\libiconv-2.dll" "$0\GvimExt64" - !undef LIBRARY_X64 - ${EndIf} - - # Install DLLs for 32-bit gvimext.dll into the GvimExt32 directory. - SetOutPath $0\GvimExt32 - ClearErrors - !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "${GETTEXT}\gettext32\libintl-8.dll" \ - "$0\GvimExt32\libintl-8.dll" "$0\GvimExt32" - !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "${GETTEXT}\gettext32\libiconv-2.dll" \ - "$0\GvimExt32\libiconv-2.dll" "$0\GvimExt32" -!if ${INCLUDE_LIBGCC} -!if /FileExists "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" - # Install libgcc_s_sjlj-1.dll only if it is needed. - !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" \ - "$0\GvimExt32\libgcc_s_sjlj-1.dll" "$0\GvimExt32" -!endif -!endif - ${EndIf} -SectionEnd + "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" \ + "$0\GvimExt32\libgcc_s_sjlj-1.dll" "$0\GvimExt32" + !endif + !endif + ${EndIf} + SectionEnd !endif ########################################################## Section -call_install_exe - SetOutPath $0 - DetailPrint "$(str_msg_registering)" - nsExec::Exec "$0\install.exe $1" - Pop $3 - - ${If} ${SectionIsSelected} ${id_section_pluginhome} - ReadEnvStr $3 "COMSPEC" - Call GetHomeDir - Pop $4 - ShellExecAsUser::ShellExecAsUser "" "$3" '/c "cd /d "$4" & mkdir vimfiles & cd vimfiles & mkdir colors compiler doc ftdetect ftplugin indent keymap plugin syntax"' SW_HIDE - ${EndIf} + SetOutPath $0 + DetailPrint "$(str_msg_registering)" + nsExec::Exec "$0\install.exe $1" + Pop $3 + + ${If} ${SectionIsSelected} ${id_section_pluginhome} + ReadEnvStr $3 "COMSPEC" + Call GetHomeDir + Pop $4 + ShellExecAsUser::ShellExecAsUser "" "$3" '/c "cd /d "$4" & mkdir vimfiles \ + & cd vimfiles & mkdir colors compiler doc ftdetect ftplugin indent \ + keymap plugin syntax"' SW_HIDE + ${EndIf} SectionEnd ########################################################## -!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 - Section -post + # Get estimated install size + SectionGetSize ${id_section_exe} $3 + ${If} ${SectionIsSelected} ${id_section_console} + SectionGetSize ${id_section_console} $4 + IntOp $3 $3 + $4 + ${EndIf} + ${If} ${SectionIsSelected} ${id_section_editwith} + SectionGetSize ${id_section_editwith} $4 + IntOp $3 $3 + $4 + ${EndIf} + !if ${HAVE_NLS} + ${If} ${SectionIsSelected} ${id_section_nls} + SectionGetSize ${id_section_nls} $4 + IntOp $3 $3 + $4 + ${EndIf} + !endif - # Get estimated install size - SectionGetSize ${id_section_exe} $3 - ${If} ${SectionIsSelected} ${id_section_console} - SectionGetSize ${id_section_console} $4 - IntOp $3 $3 + $4 - ${EndIf} - ${If} ${SectionIsSelected} ${id_section_editwith} - SectionGetSize ${id_section_editwith} $4 - IntOp $3 $3 + $4 - ${EndIf} -!if ${HAVE_NLS} - ${If} ${SectionIsSelected} ${id_section_nls} - SectionGetSize ${id_section_nls} $4 - IntOp $3 $3 + $4 - ${EndIf} -!endif + # Register EstimatedSize and AllowSilent. + # Other information will be set by the install.exe (dosinst.c). + ${If} ${RunningX64} + SetRegView 64 + ${EndIf} + WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" "EstimatedSize" $3 + WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" "AllowSilent" 1 + ${If} ${RunningX64} + SetRegView lastused + ${EndIf} - # Register EstimatedSize and AllowSilent. - # Other information will be set by the install.exe (dosinst.c). - ${If} ${RunningX64} - SetRegView 64 - ${EndIf} - WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" "EstimatedSize" $3 - WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" "AllowSilent" 1 - ${If} ${RunningX64} - SetRegView lastused - ${EndIf} - - # Store the selections to the registry. - ${If} ${RunningX64} - SetRegView 64 - ${EndIf} - !insertmacro SaveSectionSelection ${id_section_console} "select_console" - !insertmacro SaveSectionSelection ${id_section_batch} "select_batch" - !insertmacro SaveSectionSelection ${id_section_desktop} "select_desktop" - !insertmacro SaveSectionSelection ${id_section_startmenu} "select_startmenu" - !insertmacro SaveSectionSelection ${id_section_editwith} "select_editwith" - !insertmacro SaveSectionSelection ${id_section_vimrc} "select_vimrc" - !insertmacro SaveSectionSelection ${id_section_pluginhome} "select_pluginhome" - !insertmacro SaveSectionSelection ${id_section_pluginvim} "select_pluginvim" -!if ${HAVE_NLS} - !insertmacro SaveSectionSelection ${id_section_nls} "select_nls" -!endif - ${If} ${RunningX64} - SetRegView lastused - ${EndIf} + # Store the selections to the registry. + ${If} ${RunningX64} + SetRegView 64 + ${EndIf} + !insertmacro SaveSectionSelection ${id_section_console} "select_console" + !insertmacro SaveSectionSelection ${id_section_batch} "select_batch" + !insertmacro SaveSectionSelection ${id_section_desktop} "select_desktop" + !insertmacro SaveSectionSelection ${id_section_startmenu} "select_startmenu" + !insertmacro SaveSectionSelection ${id_section_editwith} "select_editwith" + !insertmacro SaveSectionSelection ${id_section_vimrc} "select_vimrc" + !insertmacro SaveSectionSelection ${id_section_pluginhome} \ + "select_pluginhome" + !insertmacro SaveSectionSelection ${id_section_pluginvim} "select_pluginvim" + !if ${HAVE_NLS} + !insertmacro SaveSectionSelection ${id_section_nls} "select_nls" + !endif + ${If} ${RunningX64} + SetRegView lastused + ${EndIf} - BringToFront + BringToFront SectionEnd ########################################################## -!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 - -!macro LoadDefaultVimrc out_var reg_value default_value - ClearErrors - ReadRegStr ${out_var} HKLM "${UNINST_REG_KEY_VIM}" ${reg_value} - ${If} ${Errors} - ${OrIf} ${out_var} == "" - StrCpy ${out_var} ${default_value} - ${EndIf} -!macroend - Function .onInit -!if ${HAVE_MULTI_LANG} - # Select a language (or read from the registry). - !insertmacro MUI_LANGDLL_DISPLAY -!endif + !if ${HAVE_MULTI_LANG} + # Select a language (or read from the registry). + !insertmacro MUI_LANGDLL_DISPLAY + !endif -!if ${HAVE_NLS} - ClearErrors - System::Call 'kernel32::GetUserDefaultLocaleName(t.r19, *i${NSIS_MAX_STRLEN})' - StrCmp $R9 "zh-cn" coincide 0 - StrCmp $R9 "zh-tw" 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: -!endif + !if ${HAVE_NLS} + call GetUserLocale + !endif ${If} $INSTDIR == ${DEFAULT_INSTDIR} # Check $VIM @@ -847,15 +770,16 @@ Function .onInit !insertmacro LoadSectionSelection ${id_section_startmenu} "select_startmenu" !insertmacro LoadSectionSelection ${id_section_editwith} "select_editwith" !insertmacro LoadSectionSelection ${id_section_vimrc} "select_vimrc" - !insertmacro LoadSectionSelection ${id_section_pluginhome} "select_pluginhome" + !insertmacro LoadSectionSelection ${id_section_pluginhome} \ + "select_pluginhome" !insertmacro LoadSectionSelection ${id_section_pluginvim} "select_pluginvim" -!if ${HAVE_NLS} - !insertmacro LoadSectionSelection ${id_section_nls} "select_nls" -!endif + !if ${HAVE_NLS} + !insertmacro LoadSectionSelection ${id_section_nls} "select_nls" + !endif # Load the default _vimrc settings from the registry (if any). - !insertmacro LoadDefaultVimrc $vim_compat_stat "vim_compat" "all" + !insertmacro LoadDefaultVimrc $vim_compat_stat "vim_compat" "all" !insertmacro LoadDefaultVimrc $vim_keymap_stat "vim_keyremap" "default" - !insertmacro LoadDefaultVimrc $vim_mouse_stat "vim_mouse" "default" + !insertmacro LoadDefaultVimrc $vim_mouse_stat "vim_mouse" "default" ${If} ${RunningX64} SetRegView lastused ${EndIf} @@ -881,151 +805,152 @@ FunctionEnd ########################################################## Function SetCustom - # Display the _vimrc setting dialog using nsDialogs. - - # Check if a _vimrc should be created - ${IfNot} ${SectionIsSelected} ${id_section_vimrc} - Abort - ${EndIf} - - !insertmacro MUI_HEADER_TEXT \ - $(str_vimrc_page_title) $(str_vimrc_page_subtitle) - - nsDialogs::Create 1018 - Pop $vim_dialog - - ${If} $vim_dialog == error - Abort - ${EndIf} - - ${If} ${RunningX64} - SetRegView 64 - ${EndIf} - - GetFunctionAddress $3 ValidateCustom - nsDialogs::OnBack $3 - - - # 1st group - Compatibility - ${NSD_CreateGroupBox} 0u 0u 296u 44u $(str_msg_compat_title) - Pop $3 - - ${NSD_CreateLabel} 16u 14u 269u 10u $(str_msg_compat_desc) - Pop $3 - ${NSD_CreateDropList} 42u 26u 237u 13u "" - Pop $vim_nsd_compat - ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_vi) - ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_vim) - ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_defaults) - ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_all) - - ${If} $vim_compat_stat == "defaults" - StrCpy $4 2 - ${ElseIf} $vim_compat_stat == "vim" - StrCpy $4 1 - ${ElseIf} $vim_compat_stat == "vi" - StrCpy $4 0 - ${Else} # default - StrCpy $4 3 - ${EndIf} - ${NSD_CB_SetSelectionIndex} $vim_nsd_compat $4 - - - # 2nd group - Key remapping - ${NSD_CreateGroupBox} 0u 48u 296u 44u $(str_msg_keymap_title) - Pop $3 - - ${NSD_CreateLabel} 16u 62u 269u 10u $(str_msg_keymap_desc) - Pop $3 - ${NSD_CreateDropList} 42u 74u 236u 13u "" - Pop $vim_nsd_keymap - ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_default) - ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_windows) - - ${If} $vim_keymap_stat == "windows" - StrCpy $4 1 - ${Else} # default - StrCpy $4 0 - ${EndIf} - ${NSD_CB_SetSelectionIndex} $vim_nsd_keymap $4 - - - # 3rd group - Mouse behavior - ${NSD_CreateGroupBox} 0u 95u 296u 44u $(str_msg_mouse_title) - Pop $3 - - ${NSD_CreateLabel} 16u 108u 269u 10u $(str_msg_mouse_desc) - Pop $3 - ${NSD_CreateDropList} 42u 121u 237u 13u "" - Pop $vim_nsd_mouse - ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_default) - ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_windows) - ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_unix) - - ${If} $vim_mouse_stat == "xterm" - StrCpy $4 2 - ${ElseIf} $vim_mouse_stat == "windows" - StrCpy $4 1 - ${Else} # default - StrCpy $4 0 - ${EndIf} - ${NSD_CB_SetSelectionIndex} $vim_nsd_mouse $4 - - ${If} ${RunningX64} - SetRegView lastused - ${EndIf} - - nsDialogs::Show + # Display the _vimrc setting dialog using nsDialogs. + + # Check if a _vimrc should be created + ${IfNot} ${SectionIsSelected} ${id_section_vimrc} + Abort + ${EndIf} + + !insertmacro MUI_HEADER_TEXT \ + $(str_vimrc_page_title) $(str_vimrc_page_subtitle) + + nsDialogs::Create 1018 + Pop $vim_dialog + + ${If} $vim_dialog == error + Abort + ${EndIf} + + ${If} ${RunningX64} + SetRegView 64 + ${EndIf} + + GetFunctionAddress $3 ValidateCustom + nsDialogs::OnBack $3 + + # 1st group - Compatibility + ${NSD_CreateGroupBox} 0u 0u 296u 44u $(str_msg_compat_title) + Pop $3 + + ${NSD_CreateLabel} 16u 14u 269u 10u $(str_msg_compat_desc) + Pop $3 + ${NSD_CreateDropList} 42u 26u 237u 13u "" + Pop $vim_nsd_compat + ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_vi) + ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_vim) + ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_defaults) + ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_all) + + ${If} $vim_compat_stat == "defaults" + StrCpy $4 2 + ${ElseIf} $vim_compat_stat == "vim" + StrCpy $4 1 + ${ElseIf} $vim_compat_stat == "vi" + StrCpy $4 0 + ${Else} ; default + StrCpy $4 3 + ${EndIf} + ${NSD_CB_SetSelectionIndex} $vim_nsd_compat $4 + + # 2nd group - Key remapping + ${NSD_CreateGroupBox} 0u 48u 296u 44u $(str_msg_keymap_title) + Pop $3 + + ${NSD_CreateLabel} 16u 62u 269u 10u $(str_msg_keymap_desc) + Pop $3 + ${NSD_CreateDropList} 42u 74u 236u 13u "" + Pop $vim_nsd_keymap + ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_default) + ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_windows) + + ${If} $vim_keymap_stat == "windows" + StrCpy $4 1 + ${Else} ; default + StrCpy $4 0 + ${EndIf} + ${NSD_CB_SetSelectionIndex} $vim_nsd_keymap $4 + + # 3rd group - Mouse behavior + ${NSD_CreateGroupBox} 0u 95u 296u 44u $(str_msg_mouse_title) + Pop $3 + + ${NSD_CreateLabel} 16u 108u 269u 10u $(str_msg_mouse_desc) + Pop $3 + ${NSD_CreateDropList} 42u 121u 237u 13u "" + Pop $vim_nsd_mouse + ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_default) + ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_windows) + ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_unix) + + ${If} $vim_mouse_stat == "xterm" + StrCpy $4 2 + ${ElseIf} $vim_mouse_stat == "windows" + StrCpy $4 1 + ${Else} ; default + StrCpy $4 0 + ${EndIf} + ${NSD_CB_SetSelectionIndex} $vim_nsd_mouse $4 + + ${If} ${RunningX64} + SetRegView lastused + ${EndIf} + + nsDialogs::Show FunctionEnd Function ValidateCustom - ${NSD_CB_GetSelectionIndex} $vim_nsd_compat $3 - ${If} $3 = 0 - StrCpy $vim_compat_stat "vi" - ${ElseIf} $3 = 1 - StrCpy $vim_compat_stat "vim" - ${ElseIf} $3 = 2 - StrCpy $vim_compat_stat "defaults" - ${Else} - StrCpy $vim_compat_stat "all" - ${EndIf} - - ${NSD_CB_GetSelectionIndex} $vim_nsd_keymap $3 - ${If} $3 = 0 - StrCpy $vim_keymap_stat "default" - ${Else} - StrCpy $vim_keymap_stat "windows" - ${EndIf} - - ${NSD_CB_GetSelectionIndex} $vim_nsd_mouse $3 - ${If} $3 = 0 - StrCpy $vim_mouse_stat "default" - ${ElseIf} $3 = 1 - StrCpy $vim_mouse_stat "windows" - ${Else} - StrCpy $vim_mouse_stat "xterm" - ${EndIf} + ${NSD_CB_GetSelectionIndex} $vim_nsd_compat $3 + ${If} $3 = 0 + StrCpy $vim_compat_stat "vi" + ${ElseIf} $3 = 1 + StrCpy $vim_compat_stat "vim" + ${ElseIf} $3 = 2 + StrCpy $vim_compat_stat "defaults" + ${Else} + StrCpy $vim_compat_stat "all" + ${EndIf} + + ${NSD_CB_GetSelectionIndex} $vim_nsd_keymap $3 + ${If} $3 = 0 + StrCpy $vim_keymap_stat "default" + ${Else} + StrCpy $vim_keymap_stat "windows" + ${EndIf} + + ${NSD_CB_GetSelectionIndex} $vim_nsd_mouse $3 + ${If} $3 = 0 + StrCpy $vim_mouse_stat "default" + ${ElseIf} $3 = 1 + StrCpy $vim_mouse_stat "windows" + ${Else} + StrCpy $vim_mouse_stat "xterm" + ${EndIf} FunctionEnd ########################################################## # Description for Installer Sections !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${id_section_old_ver} $(str_desc_old_ver) - !insertmacro MUI_DESCRIPTION_TEXT ${id_section_exe} $(str_desc_exe) - !insertmacro MUI_DESCRIPTION_TEXT ${id_section_console} $(str_desc_console) - !insertmacro MUI_DESCRIPTION_TEXT ${id_section_batch} $(str_desc_batch) - !insertmacro MUI_DESCRIPTION_TEXT ${id_group_icons} $(str_desc_icons) - !insertmacro MUI_DESCRIPTION_TEXT ${id_section_desktop} $(str_desc_desktop) - !insertmacro MUI_DESCRIPTION_TEXT ${id_section_startmenu} $(str_desc_start_menu) - !insertmacro MUI_DESCRIPTION_TEXT ${id_section_editwith} $(str_desc_edit_with) - !insertmacro MUI_DESCRIPTION_TEXT ${id_section_vimrc} $(str_desc_vim_rc) - !insertmacro MUI_DESCRIPTION_TEXT ${id_group_plugin} $(str_desc_plugin) - !insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginhome} $(str_desc_plugin_home) - !insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginvim} $(str_desc_plugin_vim) -!if ${HAVE_NLS} - !insertmacro MUI_DESCRIPTION_TEXT ${id_section_nls} $(str_desc_nls) -!endif + !insertmacro MUI_DESCRIPTION_TEXT ${id_section_old_ver} $(str_desc_old_ver) + !insertmacro MUI_DESCRIPTION_TEXT ${id_section_exe} $(str_desc_exe) + !insertmacro MUI_DESCRIPTION_TEXT ${id_section_console} $(str_desc_console) + !insertmacro MUI_DESCRIPTION_TEXT ${id_section_batch} $(str_desc_batch) + !insertmacro MUI_DESCRIPTION_TEXT ${id_group_icons} $(str_desc_icons) + !insertmacro MUI_DESCRIPTION_TEXT ${id_section_desktop} $(str_desc_desktop) + !insertmacro MUI_DESCRIPTION_TEXT ${id_section_startmenu} \ + $(str_desc_start_menu) + !insertmacro MUI_DESCRIPTION_TEXT ${id_section_editwith} \ + $(str_desc_edit_with) + !insertmacro MUI_DESCRIPTION_TEXT ${id_section_vimrc} $(str_desc_vim_rc) + !insertmacro MUI_DESCRIPTION_TEXT ${id_group_plugin} $(str_desc_plugin) + !insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginhome} \ + $(str_desc_plugin_home) + !insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginvim} \ + $(str_desc_plugin_vim) + !if ${HAVE_NLS} + !insertmacro MUI_DESCRIPTION_TEXT ${id_section_nls} $(str_desc_nls) + !endif !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -1033,192 +958,197 @@ FunctionEnd # Uninstaller Functions and Sections Function un.onInit -!if ${HAVE_MULTI_LANG} - # Get the language from the registry. - !insertmacro MUI_UNGETLANGUAGE -!endif + !if ${HAVE_MULTI_LANG} + # Get the language from the registry. + !insertmacro MUI_UNGETLANGUAGE + !endif FunctionEnd Section "un.$(str_unsection_register)" id_unsection_register - SectionIn RO + SectionIn RO - # Apparently $INSTDIR is set to the directory where the uninstaller is - # created. Thus the "vim91" directory is included in it. - StrCpy $0 "$INSTDIR" + # Apparently $INSTDIR is set to the directory where the uninstaller is + # created. Thus the "vim91" directory is included in it. + StrCpy $0 "$INSTDIR" - # delete the context menu entry and batch files - DetailPrint "$(str_msg_unregistering)" - nsExec::Exec "$0\uninstall.exe -nsis" - Pop $3 + # delete the context menu entry and batch files + DetailPrint "$(str_msg_unregistering)" + nsExec::Exec "$0\uninstall.exe -nsis" + Pop $3 - # We may have been put to the background when uninstall did something. - BringToFront + # We may have been put to the background when uninstall did something. + BringToFront - # Delete the installer language setting. - DeleteRegKey ${MUI_LANGDLL_REGISTRY_ROOT} ${MUI_LANGDLL_REGISTRY_KEY} + # Delete the installer language setting. + DeleteRegKey ${MUI_LANGDLL_REGISTRY_ROOT} ${MUI_LANGDLL_REGISTRY_KEY} SectionEnd Section "un.$(str_unsection_exe)" id_unsection_exe + StrCpy $0 "$INSTDIR" - StrCpy $0 "$INSTDIR" - - # Delete gettext and iconv DLLs - ${If} ${FileExists} "$0\libiconv-2.dll" - !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "$0\libiconv-2.dll" - ${EndIf} - ${If} ${FileExists} "$0\libintl-8.dll" - !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "$0\libintl-8.dll" - ${EndIf} - ${If} ${FileExists} "$0\libgcc_s_sjlj-1.dll" - !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "$0\libgcc_s_sjlj-1.dll" - ${EndIf} - - # Delete other DLLs - Delete /REBOOTOK $0\*.dll - - # Delete 64-bit GvimExt - ${If} ${RunningX64} - !define LIBRARY_X64 - ${If} ${FileExists} "$0\GvimExt64\gvimext.dll" - !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "$0\GvimExt64\gvimext.dll" - ${EndIf} - ${If} ${FileExists} "$0\GvimExt64\libiconv-2.dll" - !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "$0\GvimExt64\libiconv-2.dll" - ${EndIf} - ${If} ${FileExists} "$0\GvimExt64\libintl-8.dll" - !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "$0\GvimExt64\libintl-8.dll" - ${EndIf} - ${If} ${FileExists} "$0\GvimExt64\libwinpthread-1.dll" - !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "$0\GvimExt64\libwinpthread-1.dll" - ${EndIf} - !undef LIBRARY_X64 - RMDir /r $0\GvimExt64 - ${EndIf} - - # Delete 32-bit GvimExt - ${If} ${FileExists} "$0\GvimExt32\gvimext.dll" - !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "$0\GvimExt32\gvimext.dll" - ${EndIf} - ${If} ${FileExists} "$0\GvimExt32\libiconv-2.dll" - !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "$0\GvimExt32\libiconv-2.dll" - ${EndIf} - ${If} ${FileExists} "$0\GvimExt32\libintl-8.dll" - !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "$0\GvimExt32\libintl-8.dll" - ${EndIf} - ${If} ${FileExists} "$0\GvimExt32\libgcc_s_sjlj-1.dll" - !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ - "$0\GvimExt32\libgcc_s_sjlj-1.dll" - ${EndIf} - RMDir /r $0\GvimExt32 + # Delete gettext and iconv DLLs + ${If} ${FileExists} "$0\libiconv-2.dll" + !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "$0\libiconv-2.dll" + ${EndIf} + ${If} ${FileExists} "$0\libintl-8.dll" + !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "$0\libintl-8.dll" + ${EndIf} + ${If} ${FileExists} "$0\libgcc_s_sjlj-1.dll" + !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "$0\libgcc_s_sjlj-1.dll" + ${EndIf} - ClearErrors - # Remove everything but *.dll files. Avoids that - # a lot remains when gvimext.dll cannot be deleted. - RMDir /r $0\autoload - RMDir /r $0\colors - RMDir /r $0\compiler - RMDir /r $0\doc - RMDir /r $0\ftplugin - RMDir /r $0\import - RMDir /r $0\indent - RMDir /r $0\macros - RMDir /r $0\pack - RMDir /r $0\plugin - RMDir /r $0\spell - RMDir /r $0\syntax - RMDir /r $0\tools - RMDir /r $0\tutor - RMDir /r $0\lang - RMDir /r $0\keymap - RMDir /r $0\bitmaps - Delete $0\*.exe - Delete $0\*.bat - Delete $0\*.vim - Delete $0\*.txt - - ${If} ${Errors} - MessageBox MB_OK|MB_ICONEXCLAMATION $(str_msg_rm_exe_fail) /SD IDOK - ${EndIf} - - # No error message if the "vim91" directory can't be removed, the - # gvimext.dll may still be there. - RMDir $0 + # Delete other DLLs + Delete /REBOOTOK $0\*.dll + + # Delete 64-bit GvimExt + ${If} ${RunningX64} + !define LIBRARY_X64 + ${If} ${FileExists} "$0\GvimExt64\gvimext.dll" + !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "$0\GvimExt64\gvimext.dll" + ${EndIf} + ${If} ${FileExists} "$0\GvimExt64\libiconv-2.dll" + !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "$0\GvimExt64\libiconv-2.dll" + ${EndIf} + ${If} ${FileExists} "$0\GvimExt64\libintl-8.dll" + !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "$0\GvimExt64\libintl-8.dll" + ${EndIf} + ${If} ${FileExists} "$0\GvimExt64\libwinpthread-1.dll" + !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "$0\GvimExt64\libwinpthread-1.dll" + ${EndIf} + !undef LIBRARY_X64 + RMDir /r $0\GvimExt64 + ${EndIf} + + # Delete 32-bit GvimExt + ${If} ${FileExists} "$0\GvimExt32\gvimext.dll" + !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "$0\GvimExt32\gvimext.dll" + ${EndIf} + ${If} ${FileExists} "$0\GvimExt32\libiconv-2.dll" + !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "$0\GvimExt32\libiconv-2.dll" + ${EndIf} + ${If} ${FileExists} "$0\GvimExt32\libintl-8.dll" + !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "$0\GvimExt32\libintl-8.dll" + ${EndIf} + ${If} ${FileExists} "$0\GvimExt32\libgcc_s_sjlj-1.dll" + !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "$0\GvimExt32\libgcc_s_sjlj-1.dll" + ${EndIf} + RMDir /r $0\GvimExt32 + + ClearErrors + # Remove everything but *.dll files. Avoids that + # a lot remains when gvimext.dll cannot be deleted. + RMDir /r $0\autoload + RMDir /r $0\colors + RMDir /r $0\compiler + RMDir /r $0\doc + RMDir /r $0\ftplugin + RMDir /r $0\import + RMDir /r $0\indent + RMDir /r $0\macros + RMDir /r $0\pack + RMDir /r $0\plugin + RMDir /r $0\spell + RMDir /r $0\syntax + RMDir /r $0\tools + RMDir /r $0\tutor + RMDir /r $0\lang + RMDir /r $0\keymap + RMDir /r $0\bitmaps + Delete $0\*.exe + Delete $0\*.bat + Delete $0\*.vim + Delete $0\*.txt + + ${If} ${Errors} + MessageBox MB_OK|MB_ICONEXCLAMATION $(str_msg_rm_exe_fail) /SD IDOK + ${EndIf} + + # No error message if the "vim91" directory can't be removed, the + # gvimext.dll may still be there. + RMDir $0 SectionEnd # Remove "vimfiles" directory under the specified directory. !macro RemoveVimfiles dir - ${If} ${FileExists} ${dir}\_viminfo - Delete ${dir}\_viminfo - ${EndIf} - ${If} ${DirExists} ${dir}\vimfiles - RMDir ${dir}\vimfiles\colors - RMDir ${dir}\vimfiles\compiler - RMDir ${dir}\vimfiles\doc - RMDir ${dir}\vimfiles\ftdetect - RMDir ${dir}\vimfiles\ftplugin - RMDir ${dir}\vimfiles\indent - RMDir ${dir}\vimfiles\keymap - RMDir ${dir}\vimfiles\plugin - RMDir ${dir}\vimfiles\syntax - ${If} ${FileExists} ${dir}\vimfiles\.netrwhist* - Delete ${dir}\vimfiles\.netrwhist* - ${EndIf} - RMDir ${dir}\vimfiles - ${EndIf} + ${If} ${FileExists} ${dir}\_viminfo + Delete ${dir}\_viminfo + ${EndIf} + ${If} ${DirExists} ${dir}\vimfiles + RMDir ${dir}\vimfiles\colors + RMDir ${dir}\vimfiles\compiler + RMDir ${dir}\vimfiles\doc + RMDir ${dir}\vimfiles\ftdetect + RMDir ${dir}\vimfiles\ftplugin + RMDir ${dir}\vimfiles\indent + RMDir ${dir}\vimfiles\keymap + RMDir ${dir}\vimfiles\plugin + RMDir ${dir}\vimfiles\syntax + ${If} ${FileExists} ${dir}\vimfiles\.netrwhist* + Delete ${dir}\vimfiles\.netrwhist* + ${EndIf} + RMDir ${dir}\vimfiles + ${EndIf} !macroend SectionGroup "un.$(str_ungroup_plugin)" id_ungroup_plugin - Section /o "un.$(str_unsection_plugin_home)" id_unsection_plugin_home - # get the home dir - Call un.GetHomeDir - Pop $0 - - ${If} $0 != "" - !insertmacro RemoveVimfiles $0 - ${EndIf} - SectionEnd - - Section "un.$(str_unsection_plugin_vim)" id_unsection_plugin_vim - # get the parent dir of the installation - Push $INSTDIR - Call un.GetParent - Pop $0 - - # if a plugin dir was created at installation remove it - !insertmacro RemoveVimfiles $0 - SectionEnd + Section /o "un.$(str_unsection_plugin_home)" id_unsection_plugin_home + # get the home dir + Call un.GetHomeDir + Pop $0 + + ${If} $0 != "" + !insertmacro RemoveVimfiles $0 + ${EndIf} + SectionEnd + + Section "un.$(str_unsection_plugin_vim)" id_unsection_plugin_vim + # get the parent dir of the installation + Push $INSTDIR + Call un.GetParent + Pop $0 + + # if a plugin dir was created at installation remove it + !insertmacro RemoveVimfiles $0 + SectionEnd SectionGroupEnd Section "un.$(str_unsection_rootdir)" id_unsection_rootdir - # get the parent dir of the installation - Push $INSTDIR - Call un.GetParent - Pop $0 - - ${IfNot} ${Silent} - Delete $0\_vimrc - ${Endif} - RMDir $0 +# get the parent dir of the installation + Push $INSTDIR + Call un.GetParent + Pop $0 + + ${IfNot} ${Silent} + Delete $0\_vimrc + ${Endif} + RMDir $0 SectionEnd ########################################################## # Description for Uninstaller Sections !insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_register} $(str_desc_unregister) - !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_exe} $(str_desc_rm_exe) - !insertmacro MUI_DESCRIPTION_TEXT ${id_ungroup_plugin} $(str_desc_rm_plugin) - !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_plugin_home} $(str_desc_rm_plugin_home) - !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_plugin_vim} $(str_desc_rm_plugin_vim) - !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_rootdir} $(str_desc_rm_rootdir) + !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_register} \ + $(str_desc_unregister) + !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_exe} $(str_desc_rm_exe) + !insertmacro MUI_DESCRIPTION_TEXT ${id_ungroup_plugin} $(str_desc_rm_plugin) + !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_plugin_home} \ + $(str_desc_rm_plugin_home) + !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_plugin_vim} \ + $(str_desc_rm_plugin_vim) + !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_rootdir} \ + $(str_desc_rm_rootdir) !insertmacro MUI_UNFUNCTION_DESCRIPTION_END + +# vi:set ts=8 sw=2 sts=2 tw=79 wm=0 ft=nsis: diff --git a/nsis/gvim_version.nsh b/nsis/gvim_version.nsh deleted file mode 100644 index c59366a74c..0000000000 --- a/nsis/gvim_version.nsh +++ /dev/null @@ -1,7 +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 -!define PATCHLEVEL 0 -!endif diff --git a/nsis/icons.zip b/nsis/icons.zip index 5dddbbe65a..c480bcc89e 100644 Binary files a/nsis/icons.zip and b/nsis/icons.zip differ diff --git a/nsis/lang/README.txt b/nsis/lang/README.txt index 07899cbe2d..0340c308b1 100644 --- a/nsis/lang/README.txt +++ b/nsis/lang/README.txt @@ -18,6 +18,13 @@ 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. +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: @@ -32,3 +39,25 @@ variables similarly to what is done in the other translation files. 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. diff --git a/nsis/lang/portuguesebr.nsi b/nsis/lang/portuguesebr.nsi new file mode 100644 index 0000000000..ea92f54e80 --- /dev/null +++ b/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)" diff --git a/runtime/autoload/ccomplete.vim b/runtime/autoload/ccomplete.vim index 355f724d0f..cb4bb2c167 100644 --- a/runtime/autoload/ccomplete.vim +++ b/runtime/autoload/ccomplete.vim @@ -3,7 +3,7 @@ vim9script noclear # Vim completion script # Language: C # Maintainer: The Vim Project -# Last Change: 2024 Jun 06 +# Last Change: 2025 Jul 24 # Rewritten in Vim9 script by github user lacygoill # Former Maintainer: Bram Moolenaar @@ -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): 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 # {{{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> 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> = taglist('^' .. tokens[tidx] .. '$') for tagidx: number in len(diclist)->range() + + if complete_check() + return res + endif + var item: dict = 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> 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') diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index a740305226..6131cf5732 100644 --- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim @@ -3,7 +3,7 @@ vim9script # Vim functions for file type detection # # Maintainer: The Vim Project -# Last Change: 2025 Jan 25 +# Last Change: 2025 Oct 09 # Former Maintainer: Bram Moolenaar # These functions are moved here from runtime/filetype.vim to make startup @@ -30,12 +30,8 @@ export def Check_inp() enddef # This function checks for the kind of assembly that is wanted by the user, or -# can be detected from the first five lines of the file. +# can be detected from the beginning of the file. export def FTasm() - # tiasm uses `* commment` - if join(getline(1, 10), "\n") =~ '\%(\%(^\|\n\)\*\|Texas Instruments Incorporated\)' - setf tiasm - endif # make sure b:asmsyntax exists if !exists("b:asmsyntax") b:asmsyntax = "" @@ -65,9 +61,30 @@ export def FTasmsyntax() var match = matchstr(head, '\sasmsyntax=\zs[a-zA-Z0-9]\+\ze\s') if match != '' b:asmsyntax = match - elseif ((head =~? '\.title') || (head =~? '\.ident') || (head =~? '\.macro') || (head =~? '\.subtitle') || (head =~? '\.library')) - b:asmsyntax = "vmasm" + return endif + # Use heuristics + var is_slash_star_encountered = false + var i = 1 + const n = min([50, line("$")]) + while i <= n + const line = getline(i) + if line =~ '^/\*' + is_slash_star_encountered = true + endif + if line =~# '^; Listing generated by Microsoft' || line =~? '^\%(\%(CONST\|_BSS\|_DATA\|_TEXT\)\s\+SEGMENT\>\)\|\s*\.[2-6]86P\?\>\|\s*\.XMM\>' + b:asmsyntax = "masm" + return + elseif line =~ 'Texas Instruments Incorporated' || (line =~ '^\*' && !is_slash_star_encountered) + # tiasm uses `* commment`, but detection is unreliable if '/*' is seen + b:asmsyntax = "tiasm" + return + elseif ((line =~? '\.title\>\|\.ident\>\|\.macro\>\|\.subtitle\>\|\.library\>')) + b:asmsyntax = "vmasm" + return + endif + i += 1 + endwhile enddef var ft_visual_basic_content = '\c^\s*\%(Attribute\s\+VB_Name\|Begin\s\+\%(VB\.\|{\%(\x\+-\)\+\x\+}\)\)' @@ -184,9 +201,18 @@ enddef export def FTll() if getline(1) =~ ';\|\\|\' setf llvm - else - setf lifelines + return endif + var n = 1 + while n < 100 && n <= line("$") + var line = getline(n) + if line =~ '^\s*%' + setf lex + return + endif + n += 1 + endwhile + setf lifelines enddef export def FTlpc() @@ -203,19 +229,36 @@ export def FTlpc() setf c enddef +# Searches within the first `maxlines` lines of the file for distinctive +# Objective-C or C++ syntax and returns the appropriate filetype. Returns a +# null_string if the search was inconclusive. +def CheckObjCOrCpp(maxlines = 100): string + var n = 1 + while n < maxlines && n <= line('$') + const line = getline(n) + if line =~ '\v^\s*\@%(class|interface|end)>' + return 'objcpp' + elseif line =~ '\v^\s*%(class|namespace|template|using)>' + return 'cpp' + endif + ++n + endwhile + return null_string +enddef + +# Determines whether a *.h file is C, C++, Ch, or Objective-C/Objective-C++. export def FTheader() - if match(getline(1, min([line("$"), 200])), '^@\(interface\|end\|class\)') > -1 - if exists("g:c_syntax_for_h") - setf objc - else - setf objcpp - endif - elseif exists("g:c_syntax_for_h") + if exists('g:filetype_h') + execute $'setf {g:filetype_h}' + elseif exists('g:c_syntax_for_h') setf c - elseif exists("g:ch_syntax_for_h") + elseif exists('g:ch_syntax_for_h') setf ch else - setf cpp + # Search the first 100 lines of the file for distinctive Objective-C or C++ + # syntax and set the filetype accordingly. Otherwise, use C as the default + # filetype. + execute $'setf {CheckObjCOrCpp() ?? 'c'}' endif enddef @@ -398,29 +441,29 @@ export def FTfs() endif enddef -# Recursively search for Hare source files in a directory and any -# subdirectories, up to a given depth. +# Recursively searches for Hare source files within a directory, up to a given +# depth. def IsHareModule(dir: string, depth: number): bool - if depth <= 0 - return !empty(glob(dir .. '/*.ha')) + if depth < 1 + return false + elseif depth == 1 + return !glob(dir .. '/*.ha')->empty() endif - return reduce(sort(glob(dir .. '/*', true, true), - (a, b) => isdirectory(a) - isdirectory(b)), - (acc, n) => acc + # Check all files in the directory before recursing into subdirectories. + return glob(dir .. '/*', true, true) + ->sort((a, b) => isdirectory(a) - isdirectory(b)) + ->reduce((acc, n) => acc || n =~ '\.ha$' - || isdirectory(n) - && IsHareModule(n, depth - 1), + || isdirectory(n) && IsHareModule(n, depth - 1), false) enddef -# Determine if a README file exists within a Hare module and should be given the -# Haredoc filetype. +# Determines whether a README file is inside a Hare module and should receive +# the 'haredoc' filetype. export def FTharedoc() - if exists('g:filetype_haredoc') - if IsHareModule(':h', get(g:, 'haredoc_search_depth', 1)) - setf haredoc - endif + if IsHareModule(':h', get(g:, 'filetype_haredoc', 1)) + setf haredoc endif enddef @@ -556,18 +599,97 @@ export def FTm() endif enddef +# For files ending in *.m4, distinguish: +# – *.html.m4 files +# - *fvwm2rc*.m4 files +# – files in the Autoconf M4 dialect +# – files in POSIX M4 +export def FTm4() + var fname = expand('%:t') + var path = expand('%:p:h') + + if fname =~# 'html\.m4$' + setf htmlm4 + return + endif + + if fname =~# 'fvwm2rc' + setf fvwm2m4 + return + endif + + # Canonical Autoconf file + if fname ==# 'aclocal.m4' + setf config + return + endif + + # Repo heuristic for Autoconf M4 (nearby configure.ac) + if filereadable(path .. '/../configure.ac') || filereadable(path .. '/configure.ac') + setf config + return + endif + + # Content heuristic for Autoconf M4 (scan first ~200 lines) + # Signals: + # - Autoconf macro prefixes: AC_/AM_/AS_/AU_/AT_ + var n = 1 + var max = min([200, line('$')]) + while n <= max + var line = getline(n) + if line =~# '^\s*A[CMSUT]_' + setf config + return + endif + n += 1 + endwhile + + # Default to POSIX M4 + setf m4 +enddef + export def FTmake() - # Check if it is a Microsoft Makefile - unlet! b:make_microsoft + # Check if it is a BSD, GNU, or Microsoft Makefile + unlet! b:make_flavor + + # 1. filename + if expand('%:t') == 'BSDmakefile' + b:make_flavor = 'bsd' + setf make + return + elseif expand('%:t') == 'GNUmakefile' + b:make_flavor = 'gnu' + setf make + return + endif + + # 2. user's setting + if exists('g:make_flavor') + b:make_flavor = g:make_flavor + setf make + return + elseif get(g:, 'make_microsoft') + echom "make_microsoft is deprecated; try g:make_flavor = 'microsoft' instead" + b:make_flavor = 'microsoft' + setf make + return + endif + + # 3. try to detect a flavor from file content var n = 1 while n < 1000 && n <= line('$') var line = getline(n) if line =~? '^\s*!\s*\(ifn\=\(def\)\=\|include\|message\|error\)\>' - b:make_microsoft = 1 + b:make_flavor = 'microsoft' + break + elseif line =~ '^\.\%(export\|error\|for\|if\%(n\=\%(def\|make\)\)\=\|info\|warning\)\>' + b:make_flavor = 'bsd' break - elseif line =~ '^ *ifn\=\(eq\|def\)\>' || line =~ '^ *[-s]\=include\s' + elseif line =~ '^ *\%(ifn\=\%(eq\|def\)\|define\|override\)\>' + b:make_flavor = 'gnu' break - elseif line =~ '^ *\w\+\s*[!?:+]=' + elseif line =~ '\$[({][a-z-]\+\s\+\S\+' # a function call, e.g. $(shell pwd) + b:make_flavor = 'gnu' break endif n += 1 @@ -592,14 +714,19 @@ export def FTmms() setf mmix enddef -# This function checks if one of the first five lines start with a dot. In -# that case it is probably an nroff file: 'filetype' is set and 1 is returned. +# This function checks if one of the first five lines start with a typical +# nroff pattern in man files. In that case it is probably an nroff file: +# 'filetype' is set and 1 is returned. export def FTnroff(): number - if getline(1)[0] .. getline(2)[0] .. getline(3)[0] - .. getline(4)[0] .. getline(5)[0] =~ '\.' - setf nroff - return 1 - endif + var n = 1 + while n <= 5 + var line = getline(n) + if line =~ '^\%([.'']\s*\%(TH\|D[dt]\|S[Hh]\|d[es]1\?\|so\)\s\+\S\|[.'']\s*ig\>\|\%([.'']\s*\)\?\\"\)' + setf nroff + return 1 + endif + n += 1 + endwhile return 0 enddef @@ -701,26 +828,32 @@ export def FTinc() if exists("g:filetype_inc") exe "setf " .. g:filetype_inc else - var lines = getline(1) .. getline(2) .. getline(3) - if lines =~? "perlscript" - setf aspperl - elseif lines =~ "<%" - setf aspvbs - elseif lines =~ "' || lines =~# '[A-Z][A-Za-z0-9_:${}]*\s\+\%(??\|[?:+]\)\?= ' - setf bitbake - else - FTasmsyntax() - if exists("b:asmsyntax") - exe "setf " .. fnameescape(b:asmsyntax) - else - setf pov + for lnum in range(1, min([line("$"), 20])) + var line = getline(lnum) + if line =~? "perlscript" + setf aspperl + return + elseif line =~ "<%" + setf aspvbs + return + elseif line =~ "' || line =~# '[A-Z][A-Za-z0-9_:${}/]*\s\+\%(??\|[?:+.]\)\?=.\? ' + setf bitbake + return endif + endfor + FTasmsyntax() + if exists("b:asmsyntax") + exe "setf " .. fnameescape(b:asmsyntax) + else + setf pov endif endif enddef @@ -875,16 +1008,16 @@ export def SetFileTypeSH(name: string, setft = true): string if setft && expand("") =~ g:ft_ignore_pat return '' endif - if name =~ '\' + if name =~ '^csh$' || name =~ '^#!.\{-2,}\' # Some .sh scripts contain #!/bin/csh. return SetFileTypeShell("csh", setft) - elseif name =~ '\' + elseif name =~ '^tcsh$' || name =~ '^#!.\{-2,}\' # Some .sh scripts contain #!/bin/tcsh. return SetFileTypeShell("tcsh", setft) - elseif name =~ '\' + elseif name =~ '^zsh$' || name =~ '^#!.\{-2,}\' # Some .sh scripts contain #!/bin/zsh. return SetFileTypeShell("zsh", setft) - elseif name =~ '\' + elseif name =~ '^ksh$' || name =~ '^#!.\{-2,}\' b:is_kornshell = 1 if exists("b:is_bash") unlet b:is_bash @@ -892,7 +1025,8 @@ export def SetFileTypeSH(name: string, setft = true): string if exists("b:is_sh") unlet b:is_sh endif - elseif exists("g:bash_is_sh") || name =~ '\' || name =~ '\' + elseif exists("g:bash_is_sh") || name =~ '^bash2\=$' || + \ name =~ '^#!.\{-2,}\' b:is_bash = 1 if exists("b:is_kornshell") unlet b:is_kornshell @@ -900,7 +1034,7 @@ export def SetFileTypeSH(name: string, setft = true): string if exists("b:is_sh") unlet b:is_sh endif - elseif name =~ '\' || name =~ '\' + elseif name =~ '^\%(da\)\=sh$' || name =~ '^#!.\{-2,}\<\%(da\)\=sh\>' # Ubuntu links "sh" to "dash", thus it is expected to work the same way b:is_sh = 1 if exists("b:is_kornshell") @@ -1464,5 +1598,1710 @@ export def Detect_UCI_statements(): bool \ ) enddef +export def DetectFromName() + const amatch = expand("") + const name = fnamemodify(amatch, ':t') + const ft = get(ft_from_name, name, '') + if ft != '' + execute "setf " .. ft + endif +enddef + +export def DetectFromExt() + const amatch = expand("") + var ext = fnamemodify(amatch, ':e') + const name = fnamemodify(amatch, ':t') + if ext == '' && name[0] == '.' + ext = name[1 : ] + endif + const ft = get(ft_from_ext, ext, '') + if ft != '' + execute "setf " .. ft + endif +enddef + +# Key: extension of the file name. without `.` +# Value: filetype +const ft_from_ext = { + # 8th (Firth-derivative) + "8th": "8th", + # A-A-P recipe + "aap": "aap", + # ABAB/4 + "abap": "abap", + # ABC music notation + "abc": "abc", + # ABEL + "abl": "abel", + # ABNF + "abnf": "abnf", + # AceDB + "wrm": "acedb", + # Ada (83, 9X, 95) + "adb": "ada", + "ads": "ada", + "ada": "ada", + # AHDL + "tdf": "ahdl", + # AIDL + "aidl": "aidl", + # AMPL + "run": "ampl", + # ANTLR / PCCTS + "g": "pccts", + # ANTLR 4 + "g4": "antlr4", + # Arduino + "ino": "arduino", + "pde": "arduino", + # Asymptote + "asy": "asy", + # XA65 MOS6510 cross assembler + "a65": "a65", + # Applescript + "scpt": "applescript", + # Applix ELF + "am": "elf", + # Arc Macro Language + "aml": "aml", + # ART*Enterprise (formerly ART-IM) + "art": "art", + # AsciiDoc + "asciidoc": "asciidoc", + "adoc": "asciidoc", + # ASN.1 + "asn": "asn", + "asn1": "asn", + # Assembly - Netwide + "nasm": "nasm", + # Assembly - Microsoft + "masm": "masm", + # Assembly - Macro (VAX) + "mar": "vmasm", + # Astro + "astro": "astro", + # Atlas + "atl": "atlas", + "as": "atlas", + # Atom is based on XML + "atom": "xml", + # Authzed + "zed": "authzed", + # Autoit v3 + "au3": "autoit", + # Autohotkey + "ahk": "autohotkey", + # Autotest .at files are actually Autoconf M4 + "at": "config", + # Avenue + "ave": "ave", + # Awk + "awk": "awk", + "gawk": "awk", + # B + "mch": "b", + "ref": "b", + "imp": "b", + # Bass + "bass": "bass", + # IBasic file (similar to QBasic) + "iba": "ibasic", + "ibi": "ibasic", + # FreeBasic file (similar to QBasic) + "fb": "freebasic", + # Batch file for MSDOS. See dist#ft#FTsys for *.sys + "bat": "dosbatch", + # BC calculator + "bc": "bc", + # BDF font + "bdf": "bdf", + # Beancount + "beancount": "beancount", + # BibTeX bibliography database file + "bib": "bib", + # BibTeX Bibliography Style + "bst": "bst", + # Bicep + "bicep": "bicep", + "bicepparam": "bicep", + # BIND zone + "zone": "bindzone", + # Blank + "bl": "blank", + # Brighterscript + "bs": "brighterscript", + # Brightscript + "brs": "brightscript", + # BSDL + "bsd": "bsdl", + "bsdl": "bsdl", + # C3 + "c3": "c3", + "c3i": "c3", + "c3t": "c3", + # Cairo + "cairo": "cairo", + # Cap'n Proto + "capnp": "capnp", + # C# + "cs": "cs", + "csx": "cs", + "cake": "cs", + # CSDL + "csdl": "csdl", + # Ctags + "ctags": "conf", + # Cabal + "cabal": "cabal", + # Cedar + "cedar": "cedar", + # ChaiScript + "chai": "chaiscript", + # Chatito + "chatito": "chatito", + # Chuck + "ck": "chuck", + # Comshare Dimension Definition Language + "cdl": "cdl", + # Conary Recipe + "recipe": "conaryrecipe", + # Corn config file + "corn": "corn", + # ChainPack Object Notation (CPON) + "cpon": "cpon", + # Controllable Regex Mutilator + "crm": "crm", + # Cyn++ + "cyn": "cynpp", + # Cypher query language + "cypher": "cypher", + # C++ + "cxx": "cpp", + "c++": "cpp", + "hh": "cpp", + "hxx": "cpp", + "hpp": "cpp", + "ipp": "cpp", + "moc": "cpp", + "tcc": "cpp", + "inl": "cpp", + # MS files (ixx: C++ module interface file, Microsoft Project file) + "ixx": "cpp", + "mpp": "cpp", + # C++ 20 modules (clang) + # https://clang.llvm.org/docs/StandardCPlusPlusModules.html#file-name-requirement + "cppm": "cpp", + "ccm": "cpp", + "cxxm": "cpp", + "c++m": "cpp", + # Ch (CHscript) + "chf": "ch", + # TLH files are C++ headers generated by Visual C++'s #import from typelibs + "tlh": "cpp", + # Cascading Style Sheets + "css": "css", + # Century Term Command Scripts (*.cmd too) + "con": "cterm", + # ChordPro + "chopro": "chordpro", + "crd": "chordpro", + "cho": "chordpro", + "crdpro": "chordpro", + "chordpro": "chordpro", + # Clean + "dcl": "clean", + "icl": "clean", + # Clever + "eni": "cl", + # Clojure + "clj": "clojure", + "cljs": "clojure", + "cljx": "clojure", + "cljc": "clojure", + # Cobol + "cbl": "cobol", + "cob": "cobol", + # Coco/R + "atg": "coco", + # Cold Fusion + "cfm": "cf", + "cfi": "cf", + "cfc": "cf", + # Cooklang + "cook": "cook", + # Clinical Quality Language (CQL) + # .cql is also mentioned as the 'XDCC Catcher queue list' file extension. + # If support for XDCC Catcher is needed in the future, the contents of the file + # needs to be inspected. + "cql": "cqlang", + # Crystal + "cr": "crystal", + # CSV Files + "csv": "csv", + # CUDA Compute Unified Device Architecture + "cu": "cuda", + "cuh": "cuda", + # Cue + "cue": "cue", + # DAX + "dax": "dax", + # WildPackets EtherPeek Decoder + "dcd": "dcd", + # Elvish + "elv": "elvish", + # Faust + "lib": "faust", + # Libreoffice config files + "xcu": "xml", + "xlb": "xml", + "xlc": "xml", + "xba": "xml", + # Libtool files + "lo": "sh", + "la": "sh", + "lai": "sh", + # LyRiCs + "lrc": "lyrics", + # MLIR + "mlir": "mlir", + # Quake C + "qc": "c", + # Cucumber + "feature": "cucumber", + # Communicating Sequential Processes + "csp": "csp", + "fdr": "csp", + # CUPL logic description and simulation + "pld": "cupl", + "si": "cuplsim", + # Dafny + "dfy": "dafny", + # Dart + "dart": "dart", + "drt": "dart", + # Dhall + "dhall": "dhall", + # ROCKLinux package description + "desc": "desc", + # Desktop files + "desktop": "desktop", + "directory": "desktop", + # Diff files + "diff": "diff", + "rej": "diff", + # DOT + "dot": "dot", + "gv": "dot", + # Dylan - lid files + "lid": "dylanlid", + # Dylan - intr files (melange) + "intr": "dylanintr", + # Dylan + "dylan": "dylan", + # Dracula + "drac": "dracula", + "drc": "dracula", + "lvs": "dracula", + "lpe": "dracula", + # Datascript + "ds": "datascript", + # DTD (Document Type Definition for XML) + "dtd": "dtd", + # Devicetree (.its for U-Boot Flattened Image Trees, .keymap for ZMK keymap, and + # .overlay for Zephyr overlay) + "dts": "dts", + "dtsi": "dts", + "dtso": "dts", + "its": "dts", + "keymap": "dts", + "overlay": "dts", + # Embedix Component Description + "ecd": "ecd", + # ERicsson LANGuage; Yaws is erlang too + "erl": "erlang", + "hrl": "erlang", + "yaws": "erlang", + # Elm + "elm": "elm", + # Elsa - https://github.com/ucsd-progsys/elsa + "lc": "elsa", + # EdgeDB Schema Definition Language + "esdl": "esdl", + # ESQL-C + "ec": "esqlc", + "EC": "esqlc", + # Esterel + "strl": "esterel", + # Essbase script + "csc": "csc", + # Expect + "exp": "expect", + # Falcon + "fal": "falcon", + # Fantom + "fan": "fan", + "fwt": "fan", + # Factor + "factor": "factor", + # FGA + "fga": "fga", + # FIRRTL - Flexible Internal Representation for RTL + "fir": "firrtl", + # Fish shell + "fish": "fish", + # Flix + "flix": "flix", + # Focus Executable + "fex": "focexec", + "focexec": "focexec", + # Focus Master file (but not for auto.master) + "mas": "master", + "master": "master", + # Forth + "ft": "forth", + "fth": "forth", + "4th": "forth", + # Reva Forth + "frt": "reva", + # Framescript + "fsl": "framescript", + # Func + "fc": "func", + # Fusion + "fusion": "fusion", + # FHIR Shorthand (FSH) + "fsh": "fsh", + # F# + "fsi": "fsharp", + "fsx": "fsharp", + # GDMO + "mo": "gdmo", + "gdmo": "gdmo", + # GDscript + "gd": "gdscript", + # Godot resource + "tscn": "gdresource", + "tres": "gdresource", + # Godot shader + "gdshader": "gdshader", + "shader": "gdshader", + # Gemtext + "gmi": "gemtext", + "gemini": "gemtext", + # Gift (Moodle) + "gift": "gift", + # Gleam + "gleam": "gleam", + # GLSL + # Extensions supported by Khronos reference compiler (with one exception, ".glsl") + # https://github.com/KhronosGroup/glslang + "vert": "glsl", + "tesc": "glsl", + "tese": "glsl", + "glsl": "glsl", + "geom": "glsl", + "frag": "glsl", + "comp": "glsl", + "rgen": "glsl", + "rmiss": "glsl", + "rchit": "glsl", + "rahit": "glsl", + "rint": "glsl", + "rcall": "glsl", + # GN (generate ninja) files + "gn": "gn", + "gni": "gn", + # Glimmer-flavored TypeScript and JavaScript + "gts": "typescript.glimmer", + "gjs": "javascript.glimmer", + # Go (Google) + "go": "go", + # GrADS scripts + "gs": "grads", + # GraphQL + "graphql": "graphql", + "graphqls": "graphql", + "gql": "graphql", + # Gretl + "gretl": "gretl", + # GNU Server Pages + "gsp": "gsp", + # GYP + "gyp": "gyp", + "gypi": "gyp", + # Hack + "hack": "hack", + "hackpartial": "hack", + # Haml + "haml": "haml", + # Hamster Classic | Playground files + "hsm": "hamster", + # Handlebars + "hbs": "handlebars", + # Hare + "ha": "hare", + # Haskell + "hs": "haskell", + "hsc": "haskell", + "hs-boot": "haskell", + "hsig": "haskell", + "lhs": "lhaskell", + "chs": "chaskell", + # Haste + "ht": "haste", + "htpp": "hastepreproc", + # Haxe + "hx": "haxe", + # HCL + "hcl": "hcl", + # Hercules + "vc": "hercules", + "ev": "hercules", + "sum": "hercules", + "errsum": "hercules", + # HEEx + "heex": "heex", + # HEX (Intel) + "hex": "hex", + "ihex": "hex", + "int": "hex", + "ihe": "hex", + "ihx": "hex", + "mcs": "hex", + "h32": "hex", + "h80": "hex", + "h86": "hex", + "a43": "hex", + "a90": "hex", + # Hjson + "hjson": "hjson", + # HLS Playlist (or another form of playlist) + "m3u": "hlsplaylist", + "m3u8": "hlsplaylist", + # Hollywood + "hws": "hollywood", + # Hoon + "hoon": "hoon", + # TI Code Composer Studio General Extension Language + "gel": "gel", + # HTTP request files + "http": "http", + # HTML with Ruby - eRuby + "erb": "eruby", + "rhtml": "eruby", + # Some template. Used to be HTML Cheetah. + "tmpl": "template", + # Hurl + "hurl": "hurl", + # Hyper Builder + "hb": "hb", + # Httest + "htt": "httest", + "htb": "httest", + # Icon + "icn": "icon", + # Microsoft IDL (Interface Description Language) Also *.idl + # MOF = WMI (Windows Management Instrumentation) Managed Object Format + "odl": "msidl", + "mof": "msidl", + # Idris2 + "idr": "idris2", + "lidr": "lidris2", + # Inform + "inf": "inform", + "INF": "inform", + # Ipkg for Idris 2 language + "ipkg": "ipkg", + # Informix 4GL (source - canonical, include file, I4GL+M4 preproc.) + "4gl": "fgl", + "4gh": "fgl", + "m4gl": "fgl", + # .INI file for MSDOS + "ini": "dosini", + "INI": "dosini", + # Inko + "inko": "inko", + # Inno Setup + "iss": "iss", + # J + "ijs": "j", + # JAL + "jal": "jal", + "JAL": "jal", + # Jam + "jpl": "jam", + "jpr": "jam", + # Janet + "janet": "janet", + # Java + "java": "java", + "jav": "java", + "jsh": "java", + # JavaCC + "jj": "javacc", + "jjt": "javacc", + # JavaScript, ECMAScript, ES module script, CommonJS script + "js": "javascript", + "jsm": "javascript", + "javascript": "javascript", + "es": "javascript", + "mjs": "javascript", + "cjs": "javascript", + # JavaScript with React + "jsx": "javascriptreact", + # Java Server Pages + "jsp": "jsp", + # Jess + "clp": "jess", + # Jgraph + "jgr": "jgraph", + # Jinja + "jinja": "jinja", + # Jujutsu + "jjdescription": "jjdescription", + # Jovial + "jov": "jovial", + "j73": "jovial", + "jovial": "jovial", + # Jq + "jq": "jq", + # JSON5 + "json5": "json5", + # JSON Patch (RFC 6902) + "json-patch": "json", + # Geojson is also json + "geojson": "json", + # Jupyter Notebook and jupyterlab config is also json + "ipynb": "json", + "jupyterlab-settings": "json", + # Sublime config + "sublime-project": "json", + "sublime-settings": "json", + "sublime-workspace": "json", + # JSON + "json": "json", + "jsonp": "json", + "webmanifest": "json", + # JSON Lines + "jsonl": "jsonl", + # Jsonnet + "jsonnet": "jsonnet", + "libsonnet": "jsonnet", + # Julia + "jl": "julia", + # KAREL + "kl": "karel", + "KL": "karel", + # KDL + "kdl": "kdl", + # KerML + "kerml": "kerml", + # Kixtart + "kix": "kix", + # Kimwitu[++] + "k": "kwt", + # Kivy + "kv": "kivy", + # Kotlin + "kt": "kotlin", + "ktm": "kotlin", + "kts": "kotlin", + # KDE script + "ks": "kscript", + # Kyaml + "kyaml": "yaml", + "kyml": "yaml", + # Lace (ISE) + "ace": "lace", + "ACE": "lace", + # Latte + "latte": "latte", + "lte": "latte", + # LDAP LDIF + "ldif": "ldif", + # Lean + "lean": "lean", + # Ledger + "ldg": "ledger", + "ledger": "ledger", + "journal": "ledger", + # Leo + "leo": "leo", + # Less + "less": "less", + # Lex + "lex": "lex", + "l": "lex", + "lxx": "lex", + "l++": "lex", + # Lilypond + "ly": "lilypond", + "ily": "lilypond", + # Liquidsoap + "liq": "liquidsoap", + # Liquid + "liquid": "liquid", + # Lite + "lite": "lite", + "lt": "lite", + # Livebook + "livemd": "livebook", + # Logtalk + "lgt": "logtalk", + # LOTOS + "lotos": "lotos", + # Lout (also: *.lt) + "lou": "lout", + "lout": "lout", + # Luau + "luau": "luau", + # Lynx style file (or LotusScript!) + "lss": "lss", + # MaGic Point + "mgp": "mgp", + # MakeIndex + "ist": "ist", + "mst": "ist", + # Mallard + "page": "mallard", + # Manpage + "man": "man", + # Maple V + "mv": "maple", + "mpl": "maple", + "mws": "maple", + # Mason (it used to include *.comp, are those Mason files?) + "mason": "mason", + "mhtml": "mason", + # Mathematica notebook and package files + "nb": "mma", + "wl": "mma", + # Maya Extension Language + "mel": "mel", + # mcmeta + "mcmeta": "json", + # MediaWiki + "mw": "mediawiki", + "wiki": "mediawiki", + # Mermaid + "mmd": "mermaid", + "mmdc": "mermaid", + "mermaid": "mermaid", + # Meson Build system config + "wrap": "dosini", + # Metafont + "mf": "mf", + # MetaPost + "mp": "mp", + # MGL + "mgl": "mgl", + # MIX - Knuth assembly + "mix": "mix", + "mixal": "mix", + # Symbian meta-makefile definition (MMP) + "mmp": "mmp", + # Larch/Modula-3 + "lm3": "modula3", + # Monk + "isc": "monk", + "monk": "monk", + "ssc": "monk", + "tsc": "monk", + # MOO + "moo": "moo", + # Moonscript + "moon": "moonscript", + # Move language + "move": "move", + # MPD is based on XML + "mpd": "xml", + # Motorola S record + "s19": "srec", + "s28": "srec", + "s37": "srec", + "mot": "srec", + "srec": "srec", + # Msql + "msql": "msql", + # MuPAD source + "mu": "mupad", + # Mush + "mush": "mush", + # Mustache + "mustache": "mustache", + # N1QL + "n1ql": "n1ql", + "nql": "n1ql", + # Nim file + "nim": "nim", + "nims": "nim", + "nimble": "nim", + # Ninja file + "ninja": "ninja", + # Nix + "nix": "nix", + # Norg + "norg": "norg", + # Novell netware batch files + "ncf": "ncf", + # Not Quite C + "nqc": "nqc", + # NSE - Nmap Script Engine - uses Lua syntax + "nse": "lua", + # NSIS + "nsi": "nsis", + "nsh": "nsis", + # N-Triples + "nt": "ntriples", + # Nu + "nu": "nu", + # Numbat + "nbt": "numbat", + # Oblivion Language and Oblivion Script Extender + "obl": "obse", + "obse": "obse", + "oblivion": "obse", + "obscript": "obse", + # Objdump + "objdump": "objdump", + "cppobjdump": "objdump", + # Occam + "occ": "occam", + # Odin + "odin": "odin", + # Omnimark + "xom": "omnimark", + "xin": "omnimark", + # OpenROAD + "or": "openroad", + # OpenSCAD + "scad": "openscad", + # Oracle config file + "ora": "ora", + # Org (Emacs' org-mode) + "org": "org", + "org_archive": "org", + # PApp + "papp": "papp", + "pxml": "papp", + "pxsl": "papp", + # Pascal (also *.p, *.pp, *.inc) + "pas": "pascal", + # Delphi + "dpr": "pascal", + # Free Pascal makefile definition file + "fpc": "fpcmake", + # Path of Exile item filter + "filter": "poefilter", + # PDF + "pdf": "pdf", + # PCMK - HAE - crm configure edit + "pcmk": "pcmk", + # PEM (Privacy-Enhanced Mail) + "pem": "pem", + "cer": "pem", + "crt": "pem", + "csr": "pem", + # Perl POD + "pod": "pod", + # Pike and Cmod + "pike": "pike", + "pmod": "pike", + "cmod": "cmod", + # Palm Resource compiler + "rcp": "pilrc", + # Pip requirements + "pip": "requirements", + # PL/1, PL/I + "pli": "pli", + "pl1": "pli", + # PL/M (also: *.inp) + "plm": "plm", + "p36": "plm", + "pac": "plm", + # PL/SQL + "pls": "plsql", + "plsql": "plsql", + # PLP + "plp": "plp", + # PO and PO template (GNU gettext) + "po": "po", + "pot": "po", + # Pony + "pony": "pony", + # PostScript (+ font files, encapsulated PostScript, Adobe Illustrator) + "ps": "postscr", + "pfa": "postscr", + "afm": "postscr", + "eps": "postscr", + "epsf": "postscr", + "epsi": "postscr", + "ai": "postscr", + # PostScript Printer Description + "ppd": "ppd", + # Povray + "pov": "pov", + # Power Query M + "pq": "pq", + # Prisma + "prisma": "prisma", + # PPWizard + "it": "ppwiz", + "ih": "ppwiz", + # Pug + "pug": "pug", + # Embedded Puppet + "epp": "epuppet", + # Obj 3D file format + # TODO: is there a way to avoid MS-Windows Object files? + "obj": "obj", + # Oracle Pro*C/C++ + "pc": "proc", + # Privoxy actions file + "action": "privoxy", + # Software Distributor Product Specification File (POSIX 1387.2-1995) + "psf": "psf", + # Prolog + "pdb": "prolog", + # Promela + "pml": "promela", + # Property Specification Language (PSL) + "psl": "psl", + # Google protocol buffers + "proto": "proto", + "txtpb": "pbtxt", + "textproto": "pbtxt", + "textpb": "pbtxt", + "pbtxt": "pbtxt", + # Poke + "pk": "poke", + # Nvidia PTX (Parallel Thread Execution) + # See https://docs.nvidia.com/cuda/parallel-thread-execution/ + "ptx": "ptx", + # Purescript + "purs": "purescript", + # Pyret + "arr": "pyret", + # Pyrex/Cython + "pyx": "pyrex", + "pyx+": "pyrex", + "pxd": "pyrex", + "pxi": "pyrex", + # QL + "ql": "ql", + "qll": "ql", + # QML + "qml": "qml", + "qbs": "qml", + # Quarto + "qmd": "quarto", + # QuickBms + "bms": "quickbms", + # Racket (formerly detected as "scheme") + "rkt": "racket", + "rktd": "racket", + "rktl": "racket", + # Radiance + "rad": "radiance", + "mat": "radiance", + # Raku (formerly Perl6) + "pm6": "raku", + "p6": "raku", + "t6": "raku", + "pod6": "raku", + "raku": "raku", + "rakumod": "raku", + "rakudoc": "raku", + "rakutest": "raku", + # Renderman Interface Bytestream + "rib": "rib", + # Rego Policy Language + "rego": "rego", + # Rexx + "rex": "rexx", + "orx": "rexx", + "rxo": "rexx", + "rxj": "rexx", + "jrexx": "rexx", + "rexxj": "rexx", + "rexx": "rexx", + "testGroup": "rexx", + "testUnit": "rexx", + # RSS looks like XML + "rss": "xml", + # ReScript + "res": "rescript", + "resi": "rescript", + # Relax NG Compact + "rnc": "rnc", + # Relax NG XML + "rng": "rng", + # ILE RPG + "rpgle": "rpgle", + "rpgleinc": "rpgle", + # RPL/2 + "rpl": "rpl", + # Robot Framework + "robot": "robot", + "resource": "robot", + # Roc + "roc": "roc", + # RON (Rusty Object Notation) + "ron": "ron", + # MikroTik RouterOS script + "rsc": "routeros", + # Rpcgen + "x": "rpcgen", + # reStructuredText Documentation Format + "rst": "rst", + # RTF + "rtf": "rtf", + # Ruby + "rb": "ruby", + "rbw": "ruby", + # RubyGems + "gemspec": "ruby", + # RBS (Ruby Signature) + "rbs": "rbs", + # Rackup + "ru": "ruby", + # Ruby on Rails + "builder": "ruby", + "rxml": "ruby", + "rjs": "ruby", + # Rust + "rs": "rust", + # S-lang + "sl": "slang", + # Sage + "sage": "sage", + # SAS script + "sas": "sas", + # Sass + "sass": "sass", + # Scala + "scala": "scala", + "mill": "scala", + # SBT - Scala Build Tool + "sbt": "sbt", + # Slang Shading Language + "slang": "shaderslang", + # Slint + "slint": "slint", + # Scilab + "sci": "scilab", + "sce": "scilab", + # SCSS + "scss": "scss", + # SD: Streaming Descriptors + "sd": "sd", + # SDL + "sdl": "sdl", + "pr": "sdl", + # sed + "sed": "sed", + # SubRip + "srt": "srt", + # SubStation Alpha + "ass": "ssa", + "ssa": "ssa", + # svelte + "svelte": "svelte", + # Sieve (RFC 3028, 5228) + "siv": "sieve", + "sieve": "sieve", + # TriG + "trig": "trig", + # Zig and Zig Object Notation (ZON) + "zig": "zig", + "zon": "zig", + # Ziggy and Ziggy Schema + "ziggy": "ziggy", + "ziggy-schema": "ziggy_schema", + # Zserio + "zs": "zserio", + # Salt state files + "sls": "salt", + # Sexplib + "sexp": "sexplib", + # Simula + "sim": "simula", + # SINDA + "sin": "sinda", + "s85": "sinda", + # SiSU + "sst": "sisu", + "ssm": "sisu", + "ssi": "sisu", + "-sst": "sisu", + "_sst": "sisu", + # SKILL + "il": "skill", + "ils": "skill", + "cdf": "skill", + # Cadence + "cdc": "cdc", + # Cangjie + "cj": "cangjie", + # SLRN + "score": "slrnsc", + # Smali + "smali": "smali", + # Smalltalk + "st": "st", + # Smarty templates + "tpl": "smarty", + # SMITH + "smt": "smith", + "smith": "smith", + # Smithy + "smithy": "smithy", + # Snobol4 and spitbol + "sno": "snobol4", + "spt": "snobol4", + # SNMP MIB files + "mib": "mib", + "my": "mib", + # Solidity + "sol": "solidity", + # SPARQL queries + "rq": "sparql", + "sparql": "sparql", + # Spec (Linux RPM) + "spec": "spec", + # Speedup (AspenTech plant simulator) + "speedup": "spup", + "spdata": "spup", + "spd": "spup", + # Slice + "ice": "slice", + # Microsoft Visual Studio Solution + "sln": "solution", + "slnf": "json", + "slnx": "xml", + # Spice + "sp": "spice", + "spice": "spice", + # Spyce + "spy": "spyce", + "spi": "spyce", + # SQL for Oracle Designer + "tyb": "sql", + "tyc": "sql", + "pkb": "sql", + "pks": "sql", + # SQLJ + "sqlj": "sqlj", + # PRQL + "prql": "prql", + # SQR + "sqr": "sqr", + "sqi": "sqr", + # Squirrel + "nut": "squirrel", + # Starlark + "ipd": "starlark", + "star": "starlark", + "starlark": "starlark", + # OpenVPN configuration + "ovpn": "openvpn", + # Stata + "ado": "stata", + "do": "stata", + "imata": "stata", + "mata": "stata", + # SMCL + "hlp": "smcl", + "ihlp": "smcl", + "smcl": "smcl", + # Stored Procedures + "stp": "stp", + # Standard ML + "sml": "sml", + # Sratus VOS command macro + "cm": "voscm", + # Sway (programming language) + "sw": "sway", + # Swift + "swift": "swift", + "swiftinterface": "swift", + # Swig + "swg": "swig", + "swig": "swig", + # Synopsys Design Constraints + "sdc": "sdc", + # SVG (Scalable Vector Graphics) + "svg": "svg", + # Surface + "sface": "surface", + # SysML + "sysml": "sysml", + # LLVM TableGen + "td": "tablegen", + # TAK + "tak": "tak", + # Unx Tal + "tal": "tal", + # templ + "templ": "templ", + # Teal + "tl": "teal", + # TealInfo + "tli": "tli", + # Telix Salt + "slt": "tsalt", + # Terminfo + "ti": "terminfo", + # Tera + "tera": "tera", + # Terraform variables + "tfvars": "terraform-vars", + # TeX + "latex": "tex", + "sty": "tex", + "dtx": "tex", + "ltx": "tex", + "bbl": "tex", + # LaTeX files generated by Inkscape + "pdf_tex": "tex", + # ConTeXt + "mkii": "context", + "mkiv": "context", + "mkvi": "context", + "mkxl": "context", + "mklx": "context", + # Texinfo + "texinfo": "texinfo", + "texi": "texinfo", + "txi": "texinfo", + # Thrift (Apache) + "thrift": "thrift", + # TLA+ + "tla": "tla", + # TPP - Text Presentation Program + "tpp": "tpp", + # TRACE32 Script Language + "cmm": "trace32", + "cmmt": "trace32", + "t32": "trace32", + # Treetop + "treetop": "treetop", + # TSS - Geometry + "tssgm": "tssgm", + # TSS - Optics + "tssop": "tssop", + # TSS - Command Line (temporary) + "tsscl": "tsscl", + # TSV Files + "tsv": "tsv", + # Tutor mode + "tutor": "tutor", + # TWIG files + "twig": "twig", + # TypeScript module and common + "mts": "typescript", + "cts": "typescript", + # TypeScript with React + "tsx": "typescriptreact", + # TypeSpec files + "tsp": "typespec", + # Motif UIT/UIL files + "uit": "uil", + "uil": "uil", + # Ungrammar, AKA Un-grammar + "ungram": "ungrammar", + # UnrealScript + "uc": "uc", + # URL shortcut + "url": "urlshortcut", + # V + "vsh": "v", + "vv": "v", + # Vala + "vala": "vala", + # VDF + "vdf": "vdf", + # VDM + "vdmpp": "vdmpp", + "vpp": "vdmpp", + "vdmrt": "vdmrt", + "vdmsl": "vdmsl", + "vdm": "vdmsl", + # Vento + "vto": "vento", + # Vera + "vr": "vera", + "vri": "vera", + "vrh": "vera", + # Verilog-AMS HDL + "va": "verilogams", + "vams": "verilogams", + # SystemVerilog + "sv": "systemverilog", + "svh": "systemverilog", + # VHS tape + # .tape is also used by TapeCalc, which we do not support ATM. If TapeCalc + # support is needed the contents of the file needs to be inspected. + "tape": "vhs", + # VHDL + "hdl": "vhdl", + "vhd": "vhdl", + "vhdl": "vhdl", + "vbe": "vhdl", + "vst": "vhdl", + "vho": "vhdl", + # Visual Basic + # user control, ActiveX document form, active designer, property page + "ctl": "vb", + "dob": "vb", + "dsr": "vb", + "pag": "vb", + # Visual Basic Project + "vbp": "dosini", + # VBScript (close to Visual Basic) + "vbs": "vb", + # Visual Basic .NET (close to Visual Basic) + "vb": "vb", + # Visual Studio Macro + "dsm": "vb", + # SaxBasic (close to Visual Basic) + "sba": "vb", + # VRML V1.0c + "wrl": "vrml", + # Vroom (vim testing and executable documentation) + "vroom": "vroom", + # Vue.js Single File Component + "vue": "vue", + # WebAssembly + "wat": "wat", + "wast": "wat", + # WebAssembly Interface Type (WIT) + "wit": "wit", + # Webmacro + "wm": "webmacro", + # WebGPU Shading Language (WGSL) + "wgsl": "wgsl", + # Website MetaLanguage + "wml": "wml", + # Winbatch + "wbt": "winbatch", + # WSML + "wsml": "wsml", + # WPL + "wpl": "xml", + # XHTML + "xhtml": "xhtml", + "xht": "xhtml", + # Xilinx Vivado/Vitis project files and block design files + "xpr": "xml", + "xpfm": "xml", + "spfm": "xml", + "bxml": "xml", + "mmi": "xml", + "bd": "json", + "bda": "json", + "xci": "json", + "mss": "mss", + # XS Perl extension interface language + "xs": "xs", + # Xmath + "msc": "xmath", + "msf": "xmath", + # XMI (holding UML models) is also XML + "xmi": "xml", + # Unison Language + "u": "unison", + "uu": "unison", + # Qt Linguist translation source and Qt User Interface Files are XML + # However, for .ts TypeScript is more common. + "ui": "xml", + # TPM's are RDF-based descriptions of TeX packages (Nikolai Weibull) + "tpm": "xml", + # Web Services Description Language (WSDL) + "wsdl": "xml", + # Workflow Description Language (WDL) + "wdl": "wdl", + # XLIFF (XML Localisation Interchange File Format) is also XML + "xlf": "xml", + "xliff": "xml", + # XML User Interface Language + "xul": "xml", + # Xquery + "xq": "xquery", + "xql": "xquery", + "xqm": "xquery", + "xquery": "xquery", + "xqy": "xquery", + # XSD + "xsd": "xsd", + # Xslt + "xsl": "xslt", + "xslt": "xslt", + # Yacc + "yy": "yacc", + "yxx": "yacc", + "y++": "yacc", + # Yaml + "yaml": "yaml", + "yml": "yaml", + "eyaml": "yaml", + # Raml + "raml": "raml", + # YANG + "yang": "yang", + # Yuck + "yuck": "yuck", + # Zimbu + "zu": "zimbu", + # Zimbu Templates + "zut": "zimbutempl", + # Z80 assembler asz80 + "z8a": "z8a", + # Stylus + "styl": "stylus", + "stylus": "stylus", + # Universal Scene Description + "usda": "usd", + "usd": "usd", + # Rofi stylesheet + "rasi": "rasi", + # Zsh module + # mdd: https://github.com/zsh-users/zsh/blob/57248b88830ce56adc243a40c7773fb3825cab34/Etc/zsh-development-guide#L285-L288 + # mdh, pro: https://github.com/zsh-users/zsh/blob/57248b88830ce56adc243a40c7773fb3825cab34/Etc/zsh-development-guide#L268-L271 + # *.mdd will generate *.mdh, *.pro and *.epro. + # module's *.c will #include *.mdh containing module dependency information and + # *.pro containing all static declarations of *.c + # *.epro contains all external declarations of *.c + "mdh": "c", + "epro": "c", + "mdd": "sh", + # Blueprint markup files + "blp": "blueprint", + # Blueprint build system file + "bp": "bp", +} +# Key: file name (the final path component, excluding the drive and root) +# Value: filetype +const ft_from_name = { + # Ant + "build.xml": "ant", + # Ash of busybox + ".ash_history": "sh", + # Automake (must be before the *.am pattern) + "makefile.am": "automake", + "Makefile.am": "automake", + "GNUmakefile.am": "automake", + # APT config file + "apt.conf": "aptconf", + # BIND zone + "named.root": "bindzone", + # Busted (Lua unit testing framework - configuration files) + ".busted": "lua", + # Bun history + ".bun_repl_history": "javascript", + # Calendar + "calendar": "calendar", + # Cgdb config file + "cgdbrc": "cgdbrc", + # Cfengine + "cfengine.conf": "cfengine", + # Chktex + ".chktexrc": "conf", + # Codeowners + "CODEOWNERS": "codeowners", + # Clangd + ".clangd": "yaml", + # Conda configuration file + ".condarc": "yaml", + "condarc": "yaml", + # Cling + ".cling_history": "cpp", + # CmakeCache + "CMakeCache.txt": "cmakecache", + # Configure scripts + "configure.in": "config", + "configure.ac": "config", + # Debian devscripts + "devscripts.conf": "sh", + ".devscripts": "sh", + # Fontconfig config files + "fonts.conf": "xml", + # Libreoffice config files + "psprint.conf": "dosini", + "sofficerc": "dosini", + # Lynx config files + "lynx.cfg": "lynx", + # Mamba configuration file + ".mambarc": "yaml", + "mambarc": "yaml", + # XDG mimeapps.list + "mimeapps.list": "dosini", + # Many tools written in Python use dosini as their config + # like setuptools, pudb, coverage, pypi, gitlint, oelint-adv, pylint, bpython, mypy + # (must be before *.cfg) + "pip.conf": "dosini", + "setup.cfg": "dosini", + "pudb.cfg": "dosini", + ".coveragerc": "dosini", + ".pypirc": "dosini", + ".gitlint": "dosini", + ".oelint.cfg": "dosini", + # Many tools written in Python use toml as their config, like black + ".black": "toml", + # Wakatime config + ".wakatime.cfg": "dosini", + # Deno history + "deno_history.txt": "javascript", + # Deny hosts + "denyhosts.conf": "denyhosts", + # Dict config + "dict.conf": "dictconf", + ".dictrc": "dictconf", + # Earthfile + "Earthfile": "earthfile", + # EditorConfig + ".editorconfig": "editorconfig", + # Elinks configuration + "elinks.conf": "elinks", + # Exim + "exim.conf": "exim", + # Exports + "exports": "exports", + # Fetchmail RC file + ".fetchmailrc": "fetchmail", + # Focus Master file (but not for auto.master) + "auto.master": "conf", + # FStab + "fstab": "fstab", + "mtab": "fstab", + # Git + "COMMIT_EDITMSG": "gitcommit", + "MERGE_MSG": "gitcommit", + "TAG_EDITMSG": "gitcommit", + "NOTES_EDITMSG": "gitcommit", + "EDIT_DESCRIPTION": "gitcommit", + # gnash(1) configuration files + "gnashrc": "gnash", + ".gnashrc": "gnash", + "gnashpluginrc": "gnash", + ".gnashpluginrc": "gnash", + # Gitolite + "gitolite.conf": "gitolite", + # Go (Google) + "Gopkg.lock": "toml", + "go.work": "gowork", + # GoAccess configuration + "goaccess.conf": "goaccess", + # GTK RC + ".gtkrc": "gtkrc", + "gtkrc": "gtkrc", + # Haskell + "cabal.project": "cabalproject", + # Go checksum file (must be before *.sum Hercules) + "go.sum": "gosum", + "go.work.sum": "gosum", + # Indent profile (must come before IDL *.pro!) + ".indent.pro": "indent", + # Indent RC + "indentrc": "indent", + # Ipfilter + "ipf.conf": "ipfilter", + "ipf6.conf": "ipfilter", + "ipf.rules": "ipfilter", + # SysV Inittab + "inittab": "inittab", + # JavaScript, ECMAScript, ES module script, CommonJS script + ".node_repl_history": "javascript", + # Other files that look like json + ".prettierrc": "json", + ".firebaserc": "json", + ".stylelintrc": "json", + ".lintstagedrc": "json", + "flake.lock": "json", + "deno.lock": "json", + ".swcrc": "json", + "composer.lock": "json", + "symfony.lock": "json", + # Kconfig + "Kconfig": "kconfig", + "Kconfig.debug": "kconfig", + "Config.in": "kconfig", + # Latexmkrc + ".latexmkrc": "perl", + "latexmkrc": "perl", + # LDAP configuration + "ldaprc": "ldapconf", + ".ldaprc": "ldapconf", + "ldap.conf": "ldapconf", + # Luadoc, Ldoc (must be before *.ld) + "config.ld": "lua", + # lf configuration (lfrc) + "lfrc": "lf", + # Lilo: Linux loader + "lilo.conf": "lilo", + # SBCL implementation of Common Lisp + "sbclrc": "lisp", + ".sbclrc": "lisp", + # Luau config + ".luaurc": "jsonc", + # Luacheck + ".luacheckrc": "lua", + # Mailcap configuration file + ".mailcap": "mailcap", + "mailcap": "mailcap", + # Meson Build system config + "meson.build": "meson", + "meson.options": "meson", + "meson_options.txt": "meson", + # msmtp + ".msmtprc": "msmtp", + # Mrxvtrc + "mrxvtrc": "mrxvtrc", + ".mrxvtrc": "mrxvtrc", + # Noemutt setup file + "Neomuttrc": "neomuttrc", + # Netrc + ".netrc": "netrc", + # NPM RC file + "npmrc": "dosini", + ".npmrc": "dosini", + # ondir + ".ondirrc": "ondir", + # OpenAL Soft config files + ".alsoftrc": "dosini", + "alsoft.conf": "dosini", + "alsoft.ini": "dosini", + "alsoftrc.sample": "dosini", + # Packet filter conf + "pf.conf": "pf", + # ini style config files, using # comments + "pacman.conf": "confini", + "mpv.conf": "confini", + # Pam environment + "pam_env.conf": "pamenv", + ".pam_environment": "pamenv", + # Perl Reply + ".replyrc": "dosini", + # Pine config + ".pinerc": "pine", + "pinerc": "pine", + ".pinercex": "pine", + "pinercex": "pine", + # Pip requirements + "requirements.txt": "requirements", + # Pipenv Pipfiles + "Pipfile": "toml", + "Pipfile.lock": "json", + # Pixi lock + "pixi.lock": "yaml", + # Postfix main config + "main.cf": "pfmain", + "main.cf.proto": "pfmain", + # Povray configuration + ".povrayrc": "povini", + # Puppet + "Puppetfile": "ruby", + # Procmail + ".procmail": "procmail", + ".procmailrc": "procmail", + # PyPA manifest files + "MANIFEST.in": "pymanifest", + # QMLdir + "qmldir": "qmldir", + # Ratpoison config/command files + ".ratpoisonrc": "ratpoison", + "ratpoisonrc": "ratpoison", + # Readline + ".inputrc": "readline", + "inputrc": "readline", + # R profile file + ".Rhistory": "r", + ".Rprofile": "r", + "Rprofile": "r", + "Rprofile.site": "r", + # Resolv.conf + "resolv.conf": "resolv", + # Robots.txt + "robots.txt": "robots", + # Interactive Ruby shell + ".irbrc": "ruby", + "irbrc": "ruby", + ".irb_history": "ruby", + "irb_history": "ruby", + # Bundler + "Gemfile": "ruby", + # Samba config + "smb.conf": "samba", + # Sendmail + "sendmail.cf": "sm", + # SGML catalog file + "catalog": "catalog", + # Alpine Linux APKBUILDs are actually POSIX sh scripts with special treatment. + "APKBUILD": "apkbuild", + # Screen RC + ".screenrc": "screen", + "screenrc": "screen", + # SLRN + ".slrnrc": "slrnrc", + # Squid + "squid.conf": "squid", + # OpenSSH server configuration + "sshd_config": "sshdconfig", + # Tags + "tags": "tags", + # Xilinx's xsct and xsdb use tcl + ".xsctcmdhistory": "tcl", + ".xsdbcmdhistory": "tcl", + # TeX configuration + "texmf.cnf": "texmf", + # Tidy config + ".tidyrc": "tidy", + "tidyrc": "tidy", + "tidy.conf": "tidy", + # TF (TinyFugue) mud client + ".tfrc": "tf", + "tfrc": "tf", + # Trustees + "trustees.conf": "trustees", + # Vagrant (uses Ruby syntax) + "Vagrantfile": "ruby", + # Viminfo file + ".viminfo": "viminfo", + "_viminfo": "viminfo", + # Vgrindefs file + "vgrindefs": "vgrindefs", + # Wget config + ".wgetrc": "wget", + "wgetrc": "wget", + # Wget2 config + ".wget2rc": "wget2", + "wget2rc": "wget2", + # WvDial + "wvdial.conf": "wvdial", + ".wvdialrc": "wvdial", + # CVS RC file + ".cvsrc": "cvsrc", + # X11vnc + ".x11vncrc": "conf", + # Xprofile + ".xprofile": "sh", + # X compose file + ".XCompose": "xcompose", + "Compose": "xcompose", + # MSBUILD configuration files are also XML + "Directory.Packages.props": "xml", + "Directory.Build.targets": "xml", + "Directory.Build.props": "xml", + # ATI graphics driver configuration + "fglrxrc": "xml", + # Nfs + "nfs.conf": "dosini", + "nfsmount.conf": "dosini", + # Yarn lock + "yarn.lock": "yaml", + # Zathurarc + "zathurarc": "zathurarc", +} + # Uncomment this line to check for compilation errors early # defcompile diff --git a/runtime/autoload/dist/man.vim b/runtime/autoload/dist/man.vim index d9dbaf47d4..32bf80c765 100644 --- a/runtime/autoload/dist/man.vim +++ b/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 diff --git a/runtime/autoload/dist/script.vim b/runtime/autoload/dist/script.vim index 859126f0f6..5fb45ccc51 100644 --- a/runtime/autoload/dist/script.vim +++ b/runtime/autoload/dist/script.vim @@ -4,7 +4,7 @@ vim9script # Invoked from "scripts.vim" in 'runtimepath' # # Maintainer: The Vim Project -# Last Change: 2025 Jan 20 +# Last Change: 2025 Aug 09 # Former Maintainer: Bram Moolenaar 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*\$' setl ft=mail # Mason @@ -285,6 +287,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). @@ -293,7 +296,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 =~ '^--- ') @@ -452,6 +455,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("$") diff --git a/runtime/autoload/dist/vim.vim b/runtime/autoload/dist/vim.vim index bb858c5732..1632aed2b6 100644 --- a/runtime/autoload/dist/vim.vim +++ b/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 -" Last Change: 2023 Nov 04 +" Last Change: 2025 Apr 27 " enable the zip and gzip plugin by default, if not set diff --git a/runtime/autoload/dist/vim9.vim b/runtime/autoload/dist/vim9.vim index 6d4079ea36..fa14bdaf04 100644 --- a/runtime/autoload/dist/vim9.vim +++ b/runtime/autoload/dist/vim9.vim @@ -3,7 +3,7 @@ vim9script # Vim runtime support library # # Maintainer: The Vim Project -# Last Change: 2025 Jan 29 +# Last Change: 2025 Aug 15 export def IsSafeExecutable(filetype: string, executable: string): bool if empty(exepath(executable)) @@ -121,6 +121,11 @@ def Viewer(): string 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 Launch($"{Viewer()} {shellescape(file, 1)}") enddef diff --git a/runtime/autoload/dist/vimindent.vim b/runtime/autoload/dist/vimindent.vim index 0681496ae9..ec14823558 100644 --- a/runtime/autoload/dist/vimindent.vim +++ b/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 = { 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 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 {'\'}.*,$ {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 @@ -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, block: dict): 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, pat: string): bool # {{{3 var pos: list = 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 diff --git a/runtime/autoload/getscript.vim b/runtime/autoload/getscript.vim index 39060508bf..1e3b5b39d6 100644 --- a/runtime/autoload/getscript.vim +++ b/runtime/autoload/getscript.vim @@ -12,6 +12,8 @@ " 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) " }}} " " GetLatestVimScripts: 642 1 :AutoInstall: getscript.vim @@ -100,6 +102,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 +148,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 +161,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 +181,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 +212,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 +238,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 +249,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 +262,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 +281,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 +291,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\" 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 +334,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 +342,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 +367,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 +393,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\" 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 +420,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 +448,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 +458,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 +471,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*\([^<]\+\)<.*$' 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 +497,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 +569,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 +599,42 @@ fun! s:GetOneScript(...) " update the data in the 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 -" call Dredir("BUFFER TEST (GetOneScript)","ls!") -" call Dret("GetOneScript") + 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 + + 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 " --------------------------------------------------------------------- diff --git a/runtime/autoload/hare.vim b/runtime/autoload/hare.vim index c4581fccf9..479b0f6812 100644 --- a/runtime/autoload/hare.vim +++ b/runtime/autoload/hare.vim @@ -1,26 +1,82 @@ -" Vim autoload file. -" Language: Hare -" Maintainer: Amelia Clarke -" Last Updated: 2024-05-10 -" Upstream: https://git.sr.ht/~sircmpwn/hare.vim - -" 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) +vim9script + +# Helper functions for Hare. +# Language: Hare +# Maintainer: Amelia Clarke +# Last Updated: 2025 Sep 06 +# Upstream: https://git.sr.ht/~sircmpwn/hare.vim + +# Returns the value of HAREPATH, if it exists. Otherwise, returns a safe +# default. +export def GetPath(): string + var path: list + 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 mapnew(path, (_, n) => escape(n, ' ,;'))->join(',') +enddef + +# 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 dir -endfunction -" 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' + 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('') =~ '^l' + GetList = function('getloclist', [0]) + SetList = function('setloclist', [0]) + else + GetList = function('getqflist') + SetList = function('setqflist') endif - return substitute($HAREPATH, ':', ',', 'g') -endfunction -" vim: et sts=2 sw=2 ts=8 + 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 + 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 diff --git a/runtime/autoload/hcl.vim b/runtime/autoload/hcl.vim index 2215fc8f27..e45a4e31ba 100644 --- a/runtime/autoload/hcl.vim +++ b/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 +" +" 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 diff --git a/runtime/autoload/htmlfold.vim b/runtime/autoload/htmlfold.vim new file mode 100644 index 0000000000..76ccaefaf4 --- /dev/null +++ b/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 + 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 "", 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 + # 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 = [] + var pairs: list> = [] + var ends: list = [] + const pos: list = 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 "", etc. + cursor(lnum, (cnum + 3)) + [lnum, cnum] = searchpos(tag, 'cnW') + endwhile + finally + setpos('.', pos) + endtry + + if empty(ends) + return {} + endif + + var folds: dict = {} + 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 diff --git a/runtime/autoload/python.vim b/runtime/autoload/python.vim index d5f4862363..cf01198d73 100644 --- a/runtime/autoload/python.vim +++ b/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. diff --git a/runtime/autoload/rustfmt.vim b/runtime/autoload/rustfmt.vim index 8fd3858178..847b698b79 100644 --- a/runtime/autoload/rustfmt.vim +++ b/runtime/autoload/rustfmt.vim @@ -1,5 +1,8 @@ " Author: Stephen Sugden " Last Modified: 2023-09-11 +" Last Change: +" 2025 Mar 31 by Vim project (rename s:RustfmtConfigOptions()) +" 2025 Jul 14 by Vim project (don't parse rustfmt version automatically #17745) " " 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 @@ -61,7 +68,13 @@ function! s:RustfmtWriteMode() endif endfunction -function! s:RustfmtConfigOptions() +function! rustfmt#RustfmtConfigOptions() + let default = '--edition 2018' + + if !get(g:, 'rustfmt_find_toml', 0) + return default + endif + let l:rustfmt_toml = findfile('rustfmt.toml', expand('%:p:h') . ';') if l:rustfmt_toml !=# '' return '--config-path '.shellescape(fnamemodify(l:rustfmt_toml, ":p")) @@ -73,7 +86,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) @@ -84,7 +97,7 @@ function! s:RustfmtCommandRange(filename, line1, line2) let l:arg = {"file": shellescape(a:filename), "range": [a:line1, a:line2]} let l:write_mode = s:RustfmtWriteMode() - let l:rustfmt_config = s:RustfmtConfigOptions() + let l:rustfmt_config = rustfmt#RustfmtConfigOptions() " FIXME: When --file-lines gets to be stable, add version range checking " accordingly. @@ -99,7 +112,7 @@ endfunction function! s:RustfmtCommand() let write_mode = g:rustfmt_emit_files ? '--emit=stdout' : '--write-mode=display' - let config = s:RustfmtConfigOptions() + let config = rustfmt#RustfmtConfigOptions() return join([g:rustfmt_command, write_mode, config, g:rustfmt_options]) endfunction diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim index 5c4499fa6b..74a5b38f78 100644 --- a/runtime/autoload/tar.vim +++ b/runtime/autoload/tar.vim @@ -1,9 +1,23 @@ " tar.vim: Handles browsing tarfiles - AUTOLOAD PORTION -" Date: Feb 06, 2025 +" 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 " @@ -22,9 +36,9 @@ 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 @@ -34,10 +48,10 @@ set cpo&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" @@ -46,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") @@ -94,10 +109,26 @@ if !exists("g:tar_shq") endif 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) @@ -106,16 +137,14 @@ fun! tar#Browse(tarfile) " sanity checks if !executable(g:tar_cmd) - redraw! - 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 return endif if !filereadable(a:tarfile) if a:tarfile !~# '^\a\+://' " if it's an url, don't complain, let url-handlers such as vim do its thing - redraw! - 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 return @@ -136,7 +165,7 @@ fun! tar#Browse(tarfile) 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 $ @@ -153,21 +182,19 @@ fun! tar#Browse(tarfile) elseif tarfile =~# '\.\(tgz\)$' || tarfile =~# '\.\(tbz\)$' || tarfile =~# '\.\(txz\)$' || \ tarfile =~# '\.\(tzst\)$' || tarfile =~# '\.\(tlz4\)$' - if has("unix") && executable("file") - let filekind= system("file ".shellescape(tarfile,1)) - else - let filekind= "" - endif + 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." - " - elseif filekind =~ "LZ4" + elseif header =~? 'lz4' exe "sil! r! lz4 --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - " - else + elseif header =~? 'gzip' exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - " endif @@ -175,6 +202,8 @@ fun! tar#Browse(tarfile) exe "sil! r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - " elseif tarfile =~# '\.\(bz2\|tbz\|tb2\)$' 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\)$' exe "sil! r! lzma -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - " elseif tarfile =~# '\.\(xz\|txz\)$' @@ -191,28 +220,18 @@ fun! tar#Browse(tarfile) 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 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 @@ -231,12 +250,7 @@ fun! s:TarBrowseSelect() let repkeep= &report set report=10 let fname= getline(".") - - if !exists("g:tar_secure") && fname =~ '^\s*-\|\s\+-' - redraw! - echohl WarningMsg | echo '***warning*** (tar#BrowseSelect) rejecting tarfile member<'.fname.'> because of embedded "-"' - return - endif + let ls= get(b:, 'leading_slash', 0) " sanity check if fname =~ '^"' @@ -258,7 +272,8 @@ 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(,"'.fnameescape(fname).'")' @@ -268,24 +283,18 @@ endfun " --------------------------------------------------------------------- " tar#Read: {{{2 -fun! tar#Read(fname,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 @@ -293,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 @@ -306,7 +314,7 @@ fun! tar#Read(fname,mode) call s:Rmdir("_ZIPVIM_") endif call mkdir("_ZIPVIM_") - cd _ZIPVIM_ + lcd _ZIPVIM_ if has("win32unix") && executable("cygpath") " assuming cygwin @@ -316,7 +324,10 @@ fun! tar#Read(fname,mode) 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") @@ -334,71 +345,71 @@ fun! tar#Read(fname,mode) 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." - ".tar_secure.shellescape(fname,1).decmp - exe "read ".fname + 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 - 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 @@ -407,45 +418,63 @@ 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 + exe "lcd ".fnameescape(curdir) + silent exe "file tarfile::". fname->fnameescape() endfun " --------------------------------------------------------------------- " tar#Write: {{{2 fun! tar#Write(fname) + 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 "-"' - return - endif - " sanity checks if !executable(g:tar_cmd) redraw! let &report= repkeep 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 + + 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) + 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') @@ -472,10 +501,10 @@ fun! tar#Write(fname) let tarfile = substitute(tarfile,'\.lzma','','e') let compress= "lzma -- ".shellescape(tarfile,0) endif + " Note: no support for name.tar.tbz/.txz/.tgz/.tlz4/.tzst if v:shell_error != 0 - redraw! - 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 if fname =~ '/' @@ -493,28 +522,22 @@ fun! tar#Write(fname) let tarfile = substitute(tarfile, '-', './-', '') endif - 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 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! - 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 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! - 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 system(compress) if exists("tgz") @@ -540,9 +563,9 @@ 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 @@ -555,6 +578,7 @@ fun! tar#Diff(userfname,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 @@ -578,12 +602,6 @@ fun! tar#Extract() set report=10 let fname= getline(".") - if !exists("g:tar_secure") && fname =~ '^\s*-\|\s\+-' - redraw! - echohl WarningMsg | echo '***warning*** (tar#BrowseSelect) rejecting tarfile member<'.fname.'> because of embedded "-"' - return - endif - " sanity check if fname =~ '^"' let &report= repkeep @@ -593,20 +611,20 @@ fun! tar#Extract() let tarball = expand("%") let tarbase = substitute(tarball,'\..*$','','') - let extractcmd= netrw#WinPath(g:tar_extractcmd) + let extractcmd= s:WinPath(g:tar_extractcmd) if filereadable(tarbase.".tar") 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 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 system(extractcmd." ".shellescape(tarbase).".tgz ".shellescape(fname)) if v:shell_error != 0 - echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tgz ".fname.": failed!" | echohl NONE + call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tgz {fname}: failed!") else echo "***note*** successfully extracted ".fname endif @@ -615,7 +633,7 @@ fun! tar#Extract() let extractcmd= substitute(extractcmd,"-","-z","") 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 s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar.gz {fname}: failed!") else echo "***note*** successfully extracted ".fname endif @@ -624,7 +642,7 @@ fun! tar#Extract() let extractcmd= substitute(extractcmd,"-","-j","") 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 s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tbz {fname}: failed!") else echo "***note*** successfully extracted ".fname endif @@ -633,7 +651,16 @@ fun! tar#Extract() let extractcmd= substitute(extractcmd,"-","-j","") 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 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 @@ -642,7 +669,7 @@ fun! tar#Extract() let extractcmd= substitute(extractcmd,"-","-J","") 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 s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.txz {fname}: failed!") else echo "***note*** successfully extracted ".fname endif @@ -651,7 +678,7 @@ fun! tar#Extract() let extractcmd= substitute(extractcmd,"-","-J","") 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 s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar.xz {fname}: failed!") else echo "***note*** successfully extracted ".fname endif @@ -660,7 +687,7 @@ fun! tar#Extract() let extractcmd= substitute(extractcmd,"-","--zstd","") 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 s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tzst {fname}: failed!") else echo "***note*** successfully extracted ".fname endif @@ -669,7 +696,7 @@ fun! tar#Extract() let extractcmd= substitute(extractcmd,"-","--zstd","") 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 s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar.zst {fname}: failed!") else echo "***note*** successfully extracted ".fname endif @@ -678,7 +705,7 @@ fun! tar#Extract() let extractcmd= substitute(extractcmd,"-","-I lz4","") call system(extractcmd." ".shellescape(tarbase).".tlz4 ".shellescape(fname)) if v:shell_error != 0 - echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tlz4 ".fname.": failed!" | echohl NONE + call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tlz4 {fname}: failed!") else echo "***note*** successfully extracted ".fname endif @@ -687,7 +714,7 @@ fun! tar#Extract() let extractcmd= substitute(extractcmd,"-","-I lz4","") call system(extractcmd." ".shellescape(tarbase).".tar.lz4".shellescape(fname)) if v:shell_error != 0 - echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tar.lz4 ".fname.": failed!" | echohl NONE + call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar.lz4 {fname}: failed!") else echo "***note*** successfully extracted ".fname endif @@ -700,15 +727,49 @@ endfun " --------------------------------------------------------------------- " s:Rmdir: {{{2 fun! s:Rmdir(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 + return "unknown" +endfun + +" --------------------------------------------------------------------- +" s:WinPath: {{{2 +fun! s:WinPath(path) + if (!g:netrw_cygwin || &shell !~ '\%(\\|\\)\%(\.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 " --------------------------------------------------------------------- @@ -732,8 +793,8 @@ fun! tar#Vimuntar(...) if simplify(curdir) != simplify(vimhome) " copy (possibly compressed) tarball to .vim/vimfiles - call system(netrw#WinPath(g:tar_copycmd)." ".shellescape(tartail)." ".shellescape(vimhome)) - exe "cd ".fnameescape(vimhome) + call system(s:WinPath(g:tar_copycmd)." ".shellescape(tartail)." ".shellescape(vimhome)) + exe "lcd ".fnameescape(vimhome) endif " if necessary, decompress the tarball; then, extract it @@ -747,14 +808,14 @@ fun! tar#Vimuntar(...) if simplify(curdir) != simplify(tarhome) " remove decompressed tarball, restore directory call delete(tartail.".tar") - exe "cd ".fnameescape(curdir) + exe "lcd ".fnameescape(curdir) endif return endif else call vimball#Decompress(tartail,0) endif - let extractcmd= netrw#WinPath(g:tar_extractcmd) + let extractcmd= s:WinPath(g:tar_extractcmd) call system(extractcmd." ".shellescape(tarbase.".tar")) " set up help @@ -765,7 +826,7 @@ fun! tar#Vimuntar(...) if simplify(tarhome) != simplify(vimhome) " remove decompressed tarball, restore directory call delete(vimhome."/".tarbase.".tar") - exe "cd ".fnameescape(curdir) + exe "lcd ".fnameescape(curdir) endif endfun diff --git a/runtime/autoload/tutor.vim b/runtime/autoload/tutor.vim index 3265fdde36..b21e20f814 100644 --- a/runtime/autoload/tutor.vim +++ b/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" @@ -210,10 +212,32 @@ function! tutor#TutorCmd(tutor_name) call tutor#SetupVim() exe "edit ".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=nofile + setlocal concealcursor+=inv + setlocal conceallevel=2 + call tutor#ApplyMarks() + augroup tutor_interactive + autocmd! TextChanged,TextChangedI call tutor#ApplyMarksOnChanged() + augroup END + else + setlocal buftype< + setlocal concealcursor< + setlocal conceallevel< + if exists('#tutor_interactive') + autocmd! tutor_interactive * + endif + endif +endfunction diff --git a/runtime/autoload/typst.vim b/runtime/autoload/typst.vim index 362da3f45e..7debd60423 100644 --- a/runtime/autoload/typst.vim +++ b/runtime/autoload/typst.vim @@ -1,7 +1,7 @@ " Language: Typst -" Previous Maintainer: Gregory Anders -" Maintainer: Luca Saccarola -" Last Change: 2024 Dec 09 +" Previous Maintainer: Luca Saccarola +" 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 diff --git a/runtime/autoload/vimball.vim b/runtime/autoload/vimball.vim index 774b798a83..6456984411 100644 --- a/runtime/autoload/vimball.vim +++ b/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) diff --git a/runtime/autoload/vimcomplete.vim b/runtime/autoload/vimcomplete.vim new file mode 100644 index 0000000000..d75dfe634d --- /dev/null +++ b/runtime/autoload/vimcomplete.vim @@ -0,0 +1,86 @@ +vim9script + +# Vim completion script +# Language: Vim script +# Maintainer: Maxim Kim +# Last Change: 2025-08-27 +# +# Usage: +# setlocal omnifunc=vimcomplete#Complete +# +# Simple complete function for Vim script + +var trigger: string = "" +var prefix: string = "" + + +def GetTrigger(line: string): list + var result = "" + var result_len = 0 + + if line =~ '->\k*$' + result = 'function' + elseif line =~ '\v%(^|\s+)\&\k*$' + result = 'option' + elseif line =~ '[\[(]\s*$' + result = 'expression' + elseif line =~ '[lvgsb]:\k*$' + result = 'var' + result_len = 2 + else + result = getcompletiontype(line) ?? 'cmdline' + endif + return [result, result_len] +enddef + +export def Complete(findstart: number, base: string): any + if findstart > 0 + 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 == '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 + items = getcompletion(prefix, 'cmdline') + ->mapnew((_, v) => ({word: v->matchstr('\k\+'), kind: 'v', dup: 0})) + 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 diff --git a/runtime/autoload/vimgoto.vim b/runtime/autoload/vimgoto.vim new file mode 100644 index 0000000000..421732ce89 --- /dev/null +++ b/runtime/autoload/vimgoto.vim @@ -0,0 +1,236 @@ +vim9script + +# Language: Vim9 script +# Contributers: @lacygoill +# Shane-XB-Qian +# Andrew Radev +# Last Change: 2025 Sep 21 +# +# 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 #. +# +# 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('')) + 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 = 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 = 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', + "\F": 'split', + "\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' + 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' + && target->len() > 1 + var arglist: list = 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('') + finally + &iskeyword = saved_iskeyword + endtry + + return curfunc +enddef + +# vim: sw=4 et diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index 4a53fc5f28..49e4e81981 100644 --- a/runtime/autoload/zip.vim +++ b/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,9 @@ " 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 " 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 +79,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 +215,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 +250,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 +323,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 +333,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,82 +354,104 @@ 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 + return endif " place temporary files under .../_ZIPVIM_/ if isdirectory("_ZIPVIM_") - call delete("_ZIPVIM_", "rf") + call delete("_ZIPVIM_", "rf") endif call mkdir("_ZIPVIM_") cd _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 @@ -319,7 +460,6 @@ fun! zip#Write(fname) call s:ChgDir(curdir,s:WARNING,"(zip#Write) unable to return to ".curdir."!") call delete(tmpdir, "rf") setlocal nomod - endfun " --------------------------------------------------------------------- @@ -332,17 +472,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 '-d/tmp' to extract the whole archive + let target = target->substitute('^-', '[&]', '') if &shell =~ 'cmd' && has("win32") let target = target \ ->substitute('[?*]', '[&]', 'g') @@ -355,15 +503,18 @@ fun! zip#Extract() endif " extract the file mentioned under the cursor - call system($"{g:zip_extractcmd} -o {shellescape(b:zipfile)} {target}") + 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) - call s:Mess('Error', "***error*** attempted to extract ".fname." but it doesn't appear to be present!") + 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 + echomsg "***note*** successfully extracted ".fname endif - endfun " --------------------------------------------------------------------- diff --git a/runtime/bitmaps/vim.ico b/runtime/bitmaps/vim.ico index 6e998b7e2b..7eb2648937 100644 Binary files a/runtime/bitmaps/vim.ico and b/runtime/bitmaps/vim.ico differ diff --git a/runtime/colors/blue.vim b/runtime/colors/blue.vim index 5b40feb725..bae46cec0b 100644 --- a/runtime/colors/blue.vim +++ b/runtime/colors/blue.vim @@ -2,107 +2,30 @@ " Description: Colorscheme with a blue background " Author: Original author Steven Vertigan " Maintainer: Original maintainer Steven Vertigan -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = '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 PopupSelected PmenuSel -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 @@ -110,181 +33,166 @@ 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 PopupSelected PmenuSel - 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 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 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 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 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 @@ -292,114 +200,67 @@ 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 PopupSelected PmenuSel - 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 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 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 @@ -407,192 +268,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 PopupSelected PmenuSel - 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 diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim index de56d8be78..5b6c834e3f 100644 --- a/runtime/colors/darkblue.vim +++ b/runtime/colors/darkblue.vim @@ -1,256 +1,161 @@ " Name: darkblue " Description: For those who prefer dark background " Author: Original author Bohdan Vlasyuk -" Maintainer: Original author Bohdan Vlasyuk -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = '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 PopupSelected PmenuSel -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 PopupSelected PmenuSel - 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 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 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 @@ -258,23 +163,35 @@ 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 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 PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE - hi PmenuMatch ctermfg=magenta ctermbg=blue cterm=NONE - hi PmenuMatchSel ctermfg=darkmagenta 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 @@ -282,40 +199,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 @@ -323,158 +229,60 @@ 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 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 PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE - hi PmenuMatch ctermfg=grey ctermbg=blue cterm=bold - hi PmenuMatchSel ctermfg=blue ctermbg=grey cterm=bold + 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 CurSearch term=reverse + hi CursorIM term=NONE + hi CursorLineFold term=underline + hi CursorLineSign term=underline 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 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 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 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 diff --git a/runtime/colors/delek.vim b/runtime/colors/delek.vim index 6edd128c86..541b63ec0e 100644 --- a/runtime/colors/delek.vim +++ b/runtime/colors/delek.vim @@ -2,421 +2,261 @@ " Description: Light background colorscheme. " Author: Original author David Schweikert " Maintainer: Original maintainer David Schweikert -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 PopupSelected PmenuSel -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 PopupSelected PmenuSel - 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 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 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 ColorColumn ctermfg=black ctermbg=grey cterm=NONE + hi Comment ctermfg=darkred 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 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 QuickFixLine ctermfg=white ctermbg=darkcyan cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Underlined ctermfg=blue 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=bold + hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE 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 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 PmenuMatch ctermfg=darkmagenta ctermbg=grey cterm=NONE + hi PmenuMatchSel ctermfg=magenta ctermbg=darkblue cterm=NONE + 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 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 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 CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + 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 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 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 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 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 PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold + hi PmenuMatchSel ctermfg=black ctermbg=darkyellow 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 QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE + hi Search ctermfg=black ctermbg=darkmagenta 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 VertSplit ctermfg=darkblue ctermbg=darkyellow cterm=reverse - 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 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 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 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 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 Question ctermfg=darkgreen ctermbg=NONE cterm=bold - hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE - hi MatchParen ctermfg=black ctermbg=darkmagenta cterm=bold - 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 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 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 diff --git a/runtime/colors/desert.vim b/runtime/colors/desert.vim index a3efbd8fa7..8ce22ea80a 100644 --- a/runtime/colors/desert.vim +++ b/runtime/colors/desert.vim @@ -2,409 +2,262 @@ " Description: Light background colorscheme. " Author: Original author Hans Fugal " Maintainer: Original maintainer Hans Fugal -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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! link PopupSelected PmenuSel -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! link PopupSelected PmenuSel - 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 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 LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE 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 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 Todo ctermfg=red ctermbg=darkmagenta cterm=NONE - hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE hi Search ctermfg=black ctermbg=darkgreen 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 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 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 LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE 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 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 Todo ctermfg=darkred ctermbg=darkmagenta cterm=NONE - hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE hi Search ctermfg=black ctermbg=darkgreen 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 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 CurSearch term=reverse 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 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 diff --git a/runtime/colors/elflord.vim b/runtime/colors/elflord.vim index 9dc5a1111b..1a8e224658 100644 --- a/runtime/colors/elflord.vim +++ b/runtime/colors/elflord.vim @@ -1,23 +1,28 @@ " Name: elflord " Author: original author Ron Aaron " Maintainer: original maintainer Ron Aaron -" 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 diff --git a/runtime/colors/evening.vim b/runtime/colors/evening.vim index e7c640f7da..62a0a8620a 100644 --- a/runtime/colors/evening.vim +++ b/runtime/colors/evening.vim @@ -2,49 +2,32 @@ " Description: This color scheme uses a dark grey background. " Author: Original author Bram Moolenaar " Maintainer: Original maintainer Steven Vertigan -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 PopupSelected PmenuSel -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 @@ -53,490 +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 PopupSelected PmenuSel - 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 PopupSelected PmenuSel - 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 ToolbarButton ctermfg=NONE ctermbg=darkgray cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - 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 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 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 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 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 ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - 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 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 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 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 finish endif if s:t_Co >= 0 - hi Normal term=NONE - hi ColorColumn term=reverse - hi Conceal term=NONE - hi Cursor term=reverse + hi CurSearch 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 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 diff --git a/runtime/colors/habamax.vim b/runtime/colors/habamax.vim index b840c3d64b..f09d49628e 100644 --- a/runtime/colors/habamax.vim +++ b/runtime/colors/habamax.vim @@ -1,477 +1,338 @@ " Name: habamax " Description: Hubba hubba hubba. " Author: Maxim Kim -" Maintainer: Maxim Kim -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = '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 Todo 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 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! link rubyDefine Statement -hi! link vimVar Normal +hi! link rubyMacro Statement +hi! link sqlKeyword Statement +hi! link sqlSpecial Constant +hi! link vimCommentString Comment hi! link vimOper Normal -hi! link vimSep Normal hi! link vimParenSep Normal -hi! link vimCommentString Comment -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 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 PopupSelected PmenuSel - 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 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 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 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 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 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 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 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=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 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 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 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 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 PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse + hi PreProc ctermfg=darkyellow 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 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 PreProc ctermfg=darkyellow 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 Title ctermfg=NONE ctermbg=NONE cterm=bold + 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 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 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 diff --git a/runtime/colors/industry.vim b/runtime/colors/industry.vim index 29a4c4012e..5093293ae6 100644 --- a/runtime/colors/industry.vim +++ b/runtime/colors/industry.vim @@ -2,422 +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: 2025 Jan 07 +" 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 PopupSelected PmenuSel -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 PopupSelected PmenuSel - 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 ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE + 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 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 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 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 LineNr ctermfg=yellow ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=black ctermbg=darkyellow 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 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 Todo ctermfg=blue ctermbg=yellow cterm=NONE - hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE hi Search ctermfg=black ctermbg=yellow 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 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 PopupSelected PmenuSel - 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 ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + 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 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 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 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 LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=black ctermbg=darkyellow 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 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 Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE - hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE hi Search ctermfg=black ctermbg=darkyellow cterm=NONE - hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE - hi WildMenu 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 diff --git a/runtime/colors/koehler.vim b/runtime/colors/koehler.vim index f2883fbe9a..8268f4e54c 100644 --- a/runtime/colors/koehler.vim +++ b/runtime/colors/koehler.vim @@ -1,39 +1,45 @@ " Name: koehler " Author: original author Ron Aaron " Maintainer: original maintainer Ron Aaron -" 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 = 'koehler' -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 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 hi! link Float Number hi! link Function Identifier -hi! link Include PreProc hi! link IncSearch Visual +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 PopupSelected PmenuSel +hi! link PopupNotification Todo hi! link PreCondit PreProc hi! link Repeat Statement hi! link SpecialChar Special @@ -43,392 +49,227 @@ 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 Terminal Normal 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=#ffffff guibg=#000000 gui=NONE cterm=NONE -hi ColorColumn guifg=NONE guibg=#8b0000 gui=NONE cterm=NONE -hi CursorColumn guifg=NONE guibg=#555555 gui=NONE cterm=NONE -hi CursorLine guifg=NONE guibg=#555555 gui=NONE cterm=NONE -hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold -hi Folded guifg=#00cdcd guibg=#666666 gui=NONE cterm=NONE -hi QuickFixLine guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE -hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE -hi Directory guifg=#cc8000 guibg=NONE gui=NONE cterm=NONE -hi EndOfBuffer guifg=#cd0000 guibg=NONE gui=bold cterm=bold -hi ErrorMsg guifg=#cd0000 guibg=#ffffff gui=reverse cterm=reverse -hi FoldColumn guifg=#00cdcd guibg=NONE gui=NONE cterm=NONE -hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE -hi MatchParen guifg=NONE guibg=#0000ff gui=NONE cterm=NONE -hi ModeMsg guifg=#ffffff guibg=#0000ff gui=bold cterm=bold -hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold -hi NonText guifg=#cd0000 guibg=NONE gui=bold cterm=bold -hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE -hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=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=NONE cterm=NONE -hi PmenuMatchSel guifg=#ff0000 guibg=#00cdcd gui=NONE cterm=NONE -hi Question guifg=#5c5cff guibg=NONE gui=bold cterm=bold -hi Search guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE -hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi SpecialKey guifg=#cd0000 guibg=NONE gui=NONE cterm=NONE -hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline -hi SpellCap guifg=#60ff60 guibg=NONE guisp=#60ff60 gui=undercurl cterm=underline -hi SpellLocal guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline -hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline -hi StatusLine guifg=#0000ff guibg=#ffffff gui=bold cterm=bold -hi StatusLineNC guifg=#0000ff guibg=#e5e5e5 gui=NONE cterm=NONE -hi TabLine guifg=#0000ff guibg=#ffffff gui=bold cterm=bold -hi TabLineFill guifg=#0000ff guibg=#ffffff gui=bold cterm=bold -hi TabLineSel guifg=#ffffff guibg=#0000ff gui=bold cterm=bold -hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold -hi VertSplit guifg=#0000ff guibg=#e5e5e5 gui=NONE cterm=NONE -hi Visual guifg=NONE guibg=#666666 gui=reverse cterm=reverse -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=#ffa0a0 guibg=NONE gui=NONE cterm=NONE -hi Error guifg=#cd0000 guibg=#ffffff gui=reverse cterm=reverse -hi Identifier guifg=#40ffff guibg=NONE gui=NONE cterm=NONE -hi Ignore guifg=#000000 guibg=#000000 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=#0000ff guibg=#ffff00 gui=NONE cterm=NONE -hi Type guifg=#60ff60 guibg=NONE gui=bold cterm=bold -hi Underlined guifg=#add8e6 guibg=NONE gui=bold,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 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=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 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=59 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 CursorColumn guifg=NONE guibg=#555555 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 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=#555555 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 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=#cc8000 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE +hi EndOfBuffer guifg=#cd0000 guibg=NONE guisp=NONE gui=bold ctermfg=160 ctermbg=NONE cterm=bold term=NONE +hi Error guifg=#cd0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=160 ctermbg=231 cterm=reverse term=bold,reverse +hi ErrorMsg guifg=#cd0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=160 ctermbg=231 cterm=reverse term=bold,reverse +hi FoldColumn guifg=#00cdcd guibg=NONE guisp=NONE gui=NONE ctermfg=44 ctermbg=NONE cterm=NONE term=NONE +hi Folded guifg=#00cdcd guibg=#666666 guisp=NONE gui=NONE ctermfg=44 ctermbg=59 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 LineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE +hi MatchParen guifg=NONE guibg=#0000ff guisp=NONE gui=NONE ctermfg=NONE ctermbg=21 cterm=NONE term=bold,underline +hi ModeMsg guifg=#ffffff guibg=#0000ff guisp=NONE gui=bold ctermfg=231 ctermbg=21 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=#cd0000 guibg=NONE guisp=NONE gui=bold ctermfg=160 ctermbg=NONE cterm=bold 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=NONE ctermfg=201 ctermbg=238 cterm=NONE term=NONE +hi PmenuMatchSel guifg=#ff0000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=196 ctermbg=44 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=#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=#5c5cff guibg=NONE guisp=NONE gui=bold ctermfg=63 ctermbg=NONE cterm=bold term=standout +hi QuickFixLine guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=NONE +hi Search guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 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=#ffa500 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=NONE +hi SpecialKey guifg=#cd0000 guibg=NONE guisp=NONE gui=NONE ctermfg=160 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=#60ff60 guibg=NONE guisp=#60ff60 gui=undercurl ctermfg=83 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=#ff00ff guibg=NONE guisp=#ff00ff 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=#0000ff guibg=#ffffff guisp=NONE gui=bold ctermfg=21 ctermbg=231 cterm=bold term=bold,reverse +hi StatusLineNC guifg=#0000ff guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=21 ctermbg=254 cterm=NONE term=bold,underline +hi TabLine guifg=#0000ff guibg=#ffffff guisp=NONE gui=bold ctermfg=21 ctermbg=231 cterm=bold term=bold,underline +hi TabLineFill guifg=#0000ff guibg=#ffffff guisp=NONE gui=bold ctermfg=21 ctermbg=231 cterm=bold term=NONE +hi TabLineSel guifg=#ffffff guibg=#0000ff guisp=NONE gui=bold ctermfg=231 ctermbg=21 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=#ffffff guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=231 ctermbg=237 cterm=NONE term=NONE +hi TitleBarNC guifg=#e5e5e5 guibg=#2c2c2c guisp=NONE gui=NONE ctermfg=254 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=#add8e6 guibg=NONE guisp=NONE gui=bold,underline ctermfg=153 ctermbg=NONE cterm=underline term=underline +hi VertSplit guifg=#0000ff guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=21 ctermbg=254 cterm=NONE term=NONE +hi Visual guifg=NONE guibg=#666666 guisp=NONE gui=reverse ctermfg=NONE ctermbg=59 cterm=reverse 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=231 ctermbg=16 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=88 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=240 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=240 cterm=NONE - hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold - hi Folded ctermfg=44 ctermbg=59 cterm=NONE - hi QuickFixLine ctermfg=16 ctermbg=226 cterm=NONE - hi Conceal ctermfg=59 ctermbg=NONE cterm=NONE - hi Cursor ctermfg=16 ctermbg=46 cterm=NONE - hi Directory ctermfg=172 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=160 ctermbg=NONE cterm=bold - hi ErrorMsg ctermfg=160 ctermbg=231 cterm=reverse - hi FoldColumn ctermfg=44 ctermbg=NONE cterm=NONE - hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=NONE ctermbg=21 cterm=NONE - hi ModeMsg ctermfg=231 ctermbg=21 cterm=bold - hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold - hi NonText ctermfg=160 ctermbg=NONE cterm=bold - hi Pmenu ctermfg=231 ctermbg=238 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE 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=NONE - hi PmenuMatchSel ctermfg=196 ctermbg=44 cterm=NONE - hi Question ctermfg=63 ctermbg=NONE cterm=bold - hi Search ctermfg=231 ctermbg=196 cterm=NONE - hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=160 ctermbg=NONE cterm=NONE - hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=83 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=51 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline - hi StatusLine ctermfg=21 ctermbg=231 cterm=bold - hi StatusLineNC ctermfg=21 ctermbg=254 cterm=NONE - hi TabLine ctermfg=21 ctermbg=231 cterm=bold - hi TabLineFill ctermfg=21 ctermbg=231 cterm=bold - hi TabLineSel ctermfg=231 ctermbg=21 cterm=bold - hi Title ctermfg=201 ctermbg=NONE cterm=bold - hi VertSplit ctermfg=21 ctermbg=254 cterm=NONE - hi Visual ctermfg=NONE ctermbg=59 cterm=reverse - 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=217 ctermbg=NONE cterm=NONE - hi Error ctermfg=160 ctermbg=231 cterm=reverse - hi Identifier ctermfg=87 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=16 ctermbg=16 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=bold - hi Todo ctermfg=21 ctermbg=226 cterm=NONE - hi Type ctermfg=83 ctermbg=NONE cterm=bold - hi Underlined ctermfg=153 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 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=white ctermbg=black cterm=NONE hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE - hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline - hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE + hi Comment ctermfg=blue ctermbg=NONE cterm=NONE hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE hi Cursor ctermfg=black ctermbg=green 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 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=darkyellow ctermbg=NONE cterm=NONE hi EndOfBuffer ctermfg=darkred ctermbg=NONE cterm=bold + hi Error ctermfg=darkred ctermbg=white cterm=reverse hi ErrorMsg ctermfg=darkred ctermbg=white cterm=reverse hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=black ctermbg=black cterm=NONE hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=darkblue cterm=NONE hi ModeMsg ctermfg=white ctermbg=darkblue cterm=bold hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold hi NonText ctermfg=darkred ctermbg=NONE cterm=bold hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE + hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold + hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE - hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold + hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE hi Question ctermfg=blue ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE hi Search ctermfg=white ctermbg=red cterm=NONE hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE + hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=darkred 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=magenta ctermbg=NONE cterm=underline + hi Statement ctermfg=yellow ctermbg=NONE cterm=bold hi StatusLine ctermfg=darkblue ctermbg=white cterm=bold hi StatusLineNC ctermfg=darkblue ctermbg=grey cterm=NONE hi TabLine ctermfg=darkblue ctermbg=white cterm=bold hi TabLineFill ctermfg=darkblue ctermbg=white cterm=bold hi TabLineSel ctermfg=white ctermbg=darkblue cterm=bold hi Title ctermfg=magenta ctermbg=NONE cterm=bold + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=grey ctermbg=black cterm=NONE + hi Todo ctermfg=darkblue 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=darkblue ctermbg=grey cterm=NONE hi Visual ctermfg=NONE ctermbg=darkgrey cterm=reverse 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=darkred ctermbg=NONE cterm=NONE - hi Error ctermfg=darkred ctermbg=white cterm=reverse - hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE - hi Ignore ctermfg=black ctermbg=black 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=bold - hi Todo ctermfg=darkblue 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 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 ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE - hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=underline + hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE + hi Cursor ctermfg=black ctermbg=green 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 Folded ctermfg=darkblue ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE - hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE + hi CursorLineNr ctermfg=darkyellow 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=darkyellow ctermbg=NONE cterm=NONE hi EndOfBuffer ctermfg=darkred ctermbg=NONE cterm=bold + hi Error ctermfg=darkred ctermbg=grey cterm=reverse hi ErrorMsg ctermfg=darkred ctermbg=grey cterm=bold,reverse hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=black ctermbg=black cterm=NONE hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=darkblue cterm=NONE hi ModeMsg ctermfg=white ctermbg=darkblue cterm=bold hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold hi NonText ctermfg=darkred ctermbg=NONE cterm=bold hi Pmenu ctermfg=grey ctermbg=darkgrey cterm=NONE + hi PmenuMatch ctermfg=grey ctermbg=darkgrey cterm=bold + hi PmenuMatchSel ctermfg=black 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=darkcyan cterm=NONE - hi PmenuMatch ctermfg=grey ctermbg=darkgrey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold + hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE hi Question ctermfg=darkblue ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE hi Search ctermfg=grey ctermbg=darkred cterm=NONE hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=darkred 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=grey ctermbg=darkblue cterm=bold,reverse hi StatusLineNC ctermfg=grey ctermbg=darkblue cterm=reverse hi TabLine ctermfg=grey ctermbg=darkblue cterm=bold,reverse hi TabLineFill ctermfg=darkblue ctermbg=grey cterm=bold hi TabLineSel ctermfg=grey ctermbg=darkblue cterm=bold hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold + 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=NONE cterm=NONE + hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline hi VertSplit ctermfg=darkblue ctermbg=grey cterm=NONE hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=black 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=darkred ctermbg=NONE cterm=NONE - hi Error ctermfg=darkred ctermbg=grey cterm=reverse - hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Ignore ctermfg=black ctermbg=black cterm=NONE - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold - hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE - hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse - 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 IncSearch term=bold,reverse,underline + hi Number term=NONE + hi StatusLineTerm term=bold,reverse + hi StatusLineTermNC term=bold,underline + hi Terminal term=NONE 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: rgbGrey40 #666666 59 darkgrey -" Color: rgbDarkGrey #a9a9a9 145 grey -" Color: rgbDarkBlue #00008b 20 darkblue -" Color: rgbDarkMagenta #8b008b 90 darkmagenta -" Color: rgbBlue #0000ff 21 darkblue -" Color: rgbDarkCyan #008b8b 44 darkcyan -" Color: rgbSeaGreen #2e8b57 29 darkgreen -" Color: rgbGrey #bebebe 250 grey -" Color: StatusLineTerm #90ee90 120 darkgreen -" Color: ToolbarLine #7f7f7f 244 darkgrey -" Color: Comment #80a0ff 111 blue -" Color: Constant #ffa0a0 217 darkred -" Color: Special #ffa500 214 darkyellow -" Color: Identifier #40ffff 87 cyan -" Color: Statement #ffff60 227 yellow -" Color: PreProc #ff80ff 213 magenta -" Color: Type #60ff60 83 green -" Color: koeDirectory #cc8000 172 darkyellow -" Color: koeCursorLine #555555 240 black -" Color: koeLightBlue #ADD8E6 153 blue -" Color: koeDarkRed #8b0000 88 darkred -" 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 diff --git a/runtime/colors/lunaperche.vim b/runtime/colors/lunaperche.vim index a6536da8f7..61cab9a4f2 100644 --- a/runtime/colors/lunaperche.vim +++ b/runtime/colors/lunaperche.vim @@ -1,1006 +1,682 @@ " Name: Perchè il sole a Milano? Portofino? Dimmi la luna perchè? " Description: White(perchè il sole)/Black(la luna perchè?) background colorscheme. " Author: Maxim Kim -" Maintainer: Maxim Kim -" Website: https://www.github.com/vim/colorschemes -" License: Vim License (see `:help license`) -" Last Change: 2025 Jan 07 +" URL: https://www.github.com/vim/colorschemes +" Last Change: 2025 Oct 08 -" Generated by Colortemplate v2.2.3 +" Generated by Colortemplate v3.0.0-beta10 hi clear let g:colors_name = 'lunaperche' -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 -hi! link helpVim Title -hi! link helpHeader Title -hi! link helpHyperTextJump Underlined -hi! link fugitiveSymbolicRef PreProc +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 Todo +hi! link PreInsert NonText +hi! link StatusLineTerm Statusline +hi! link StatusLineTermNC StatuslineNC +hi! link TabPanel Normal +hi! link TabPanelFill Normal +hi! link Terminal Normal +hi! link colortemplateKey Statement +hi! link csAccessModifier Statement +hi! link csAsyncModifier Statement +hi! link csClass Statement +hi! link csClassType Normal +hi! link csLogicSymbols Normal +hi! link csModifier Statement +hi! link csStorage Statement +hi! link csType Statement +hi! link diffFile PreProc +hi! link fugitiveHash Constant hi! link fugitiveHeading Statement hi! link fugitiveStagedHeading Statement -hi! link fugitiveUnstagedHeading Statement -hi! link fugitiveUntrackedHeading Statement hi! link fugitiveStagedModifier PreProc +hi! link fugitiveSymbolicRef PreProc +hi! link fugitiveUnstagedHeading Statement hi! link fugitiveUnstagedModifier PreProc -hi! link fugitiveHash Constant -hi! link diffFile PreProc +hi! link fugitiveUntrackedHeading Statement +hi! link helpHeader Title +hi! link helpHyperTextJump Underlined +hi! link helpVim Title +hi! link javaClassDecl Statement +hi! link javaDocParam PreProc +hi! link javaExternal Statement +hi! link javaScopeDecl Statement +hi! link javaScriptFunction Statement +hi! link javaScriptIdentifier Statement +hi! link javaStorageClass Statement +hi! link javaType Statement hi! link markdownHeadingDelimiter Special -hi! link rstSectionDelimiter Statement +hi! link markdownUrl String +hi! link phpComparison Normal +hi! link phpDefine Statement +hi! link phpDocCustomTags phpDocTags +hi! link phpInclude Statement +hi! link phpMemberSelector Special +hi! link phpOperator Normal +hi! link phpParent Normal +hi! link phpSpecialFunction Normal +hi! link phpStorageClass Statement +hi! link phpStructure Statement +hi! link phpVarSelector Special +hi! link pythonInclude Statement +hi! link rstCodeBlock Normal +hi! link rstDelimiter Special hi! link rstDirective PreProc -hi! link rstHyperlinkReference Special hi! link rstFieldName Constant -hi! link rstDelimiter Special +hi! link rstHyperlinkReference Special hi! link rstInterpretedText Special -hi! link rstCodeBlock Normal hi! link rstLiteralBlock rstCodeBlock -hi! link markdownUrl String -hi! link colortemplateKey Statement -hi! link xmlTagName Statement -hi! link javaScriptFunction Statement -hi! link javaScriptIdentifier Statement -hi! link sqlKeyword Statement -hi! link yamlBlockMappingKey Statement -hi! link rubyMacro Statement +hi! link rstSectionDelimiter Statement hi! link rubyDefine Statement -hi! link vimGroup Normal -hi! link vimVar Normal -hi! link vimOper Normal -hi! link vimSep Normal -hi! link vimParenSep Normal -hi! link vimOption Normal -hi! link vimCommentString Comment -hi! link pythonInclude Statement -hi! link shQuote Constant +hi! link rubyMacro Statement +hi! link shCommandSub Normal +hi! link shDerefOp Special +hi! link shDerefPattern shQuote hi! link shNoQuote Normal -hi! link shTestOpr Normal hi! link shOperator Normal -hi! link shSetOption Normal hi! link shOption Normal -hi! link shCommandSub Normal -hi! link shDerefPattern shQuote -hi! link shDerefOp Special -hi! link phpStorageClass Statement -hi! link phpStructure Statement -hi! link phpInclude Statement -hi! link phpDefine Statement -hi! link phpSpecialFunction Normal -hi! link phpParent Normal -hi! link phpComparison Normal -hi! link phpOperator Normal -hi! link phpVarSelector Special -hi! link phpMemberSelector Special -hi! link phpDocCustomTags phpDocTags -hi! link javaExternal Statement -hi! link javaType Statement -hi! link javaScopeDecl Statement -hi! link javaClassDecl Statement -hi! link javaStorageClass Statement -hi! link javaDocParam PreProc -hi! link csStorage Statement -hi! link csAccessModifier Statement -hi! link csClass Statement -hi! link csModifier Statement -hi! link csAsyncModifier Statement -hi! link csLogicSymbols Normal -hi! link csClassType Normal -hi! link csType Statement -hi! link Terminal Normal -hi! link StatuslineTerm Statusline -hi! link StatuslineTermNC StatuslineNC -hi! link LineNrAbove LineNr -hi! link LineNrBelow LineNr -hi! link MessageWindow PMenu -hi! link PopupNotification Todo -hi! link PopupSelected PmenuSel -if &background ==# 'dark' - if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#000000', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#d787d7', '#5fafaf', '#c6c6c6', '#767676', '#ff5f5f', '#5fd75f', '#ffd787', '#5fafff', '#ff87ff', '#5fd7d7', '#ffffff'] - endif - hi Normal guifg=#c6c6c6 guibg=#000000 gui=NONE cterm=NONE - hi Statusline guifg=#c6c6c6 guibg=#000000 gui=bold,reverse cterm=bold,reverse - hi StatuslineNC guifg=#767676 guibg=#000000 gui=reverse cterm=reverse - hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE - hi TabLine guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE - hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE - hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold - hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE - hi QuickFixLine guifg=#000000 guibg=#5fafff gui=NONE cterm=NONE - hi CursorLineNr guifg=#ffffff guibg=NONE gui=bold cterm=bold - hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE - hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE - hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE - hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE - hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE - hi Pmenu guifg=NONE guibg=#303030 gui=NONE cterm=NONE - hi PmenuSel guifg=NONE guibg=#4e4e4e gui=NONE cterm=NONE - hi PmenuThumb guifg=NONE guibg=#c6c6c6 gui=NONE cterm=NONE - hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuKind guifg=#ff5f5f guibg=#303030 gui=NONE cterm=NONE - hi PmenuKindSel guifg=#ff5f5f guibg=#4e4e4e gui=NONE cterm=NONE - hi PmenuExtra guifg=#767676 guibg=#303030 gui=NONE cterm=NONE - hi PmenuExtraSel guifg=#767676 guibg=#4e4e4e gui=NONE cterm=NONE - hi PmenuMatch guifg=#d787d7 guibg=#303030 gui=NONE cterm=NONE - hi PmenuMatchSel guifg=#d787d7 guibg=#4e4e4e gui=NONE cterm=NONE - hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE - hi ErrorMsg guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE - hi ModeMsg guifg=#ffd787 guibg=NONE gui=reverse cterm=reverse - hi MoreMsg guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE - hi Question guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE - hi WarningMsg guifg=#ff5f5f guibg=NONE gui=NONE cterm=NONE - hi Todo guifg=#5fd7d7 guibg=#000000 gui=reverse cterm=reverse - hi Search guifg=#000000 guibg=#ffd787 gui=NONE cterm=NONE - hi IncSearch guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE - hi CurSearch guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE - hi WildMenu guifg=#000000 guibg=#ffd787 gui=bold cterm=bold - hi debugPC guifg=#5f87af guibg=NONE gui=reverse cterm=reverse - hi debugBreakpoint guifg=#5fafaf guibg=NONE gui=reverse cterm=reverse - hi Cursor guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE - hi lCursor guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse - hi Visual guifg=#ffffff guibg=#005f87 gui=NONE cterm=NONE - hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold - hi VisualNOS guifg=#000000 guibg=#5fafaf gui=NONE cterm=NONE - hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE - hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE - hi Folded guifg=#767676 guibg=#303030 gui=NONE cterm=NONE - hi ColorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE - hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellCap guifg=NONE guibg=NONE guisp=#5fafaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellLocal guifg=NONE guibg=NONE guisp=#5faf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellRare guifg=NONE guibg=NONE guisp=#ff87ff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi Comment guifg=#5fafff guibg=NONE gui=NONE cterm=NONE - hi Constant guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE - hi String guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE - hi Identifier guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi Statement guifg=#e4e4e4 guibg=NONE gui=bold cterm=bold - hi Type guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE - hi PreProc guifg=#5fd7d7 guibg=NONE gui=NONE cterm=NONE - hi Special guifg=#5fafaf 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=#5fafff 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 DiffAdd guifg=#c6c6c6 guibg=#875f87 gui=NONE cterm=NONE - hi DiffChange guifg=#c6c6c6 guibg=#5f5f5f gui=NONE cterm=NONE - hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE - hi DiffDelete guifg=#d78787 guibg=NONE gui=NONE cterm=NONE - hi Added guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE - hi Changed guifg=#5fafff guibg=NONE gui=NONE cterm=NONE - hi Removed guifg=#d78787 guibg=NONE gui=NONE cterm=NONE - hi diffSubname guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE - hi dirType guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE - hi dirPermissionUser guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE - hi dirPermissionGroup guifg=#af875f guibg=NONE gui=NONE cterm=NONE - hi dirPermissionOther guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE - hi dirOwner guifg=#767676 guibg=NONE gui=NONE cterm=NONE - hi dirGroup guifg=#767676 guibg=NONE gui=NONE cterm=NONE - hi dirTime guifg=#767676 guibg=NONE gui=NONE cterm=NONE - hi dirSize guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE - hi dirSizeMod guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE - hi FilterMenuDirectorySubtle guifg=#878787 guibg=NONE gui=NONE cterm=NONE - hi dirFilterMenuBookmarkPath guifg=#878787 guibg=NONE gui=NONE cterm=NONE - hi dirFilterMenuHistoryPath guifg=#878787 guibg=NONE gui=NONE cterm=NONE - hi FilterMenuLineNr guifg=#878787 guibg=NONE gui=NONE cterm=NONE - hi CocSearch guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE -else - " Light background - if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#000000', '#af0000', '#008700', '#af5f00', '#005fd7', '#af00af', '#005f5f', '#808080', '#767676', '#d70000', '#87d787', '#ffd787', '#0087d7', '#ff00ff', '#008787', '#ffffff'] - endif - hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE - hi Statusline guifg=#ffffff guibg=#000000 gui=bold cterm=bold - hi StatuslineNC guifg=#ffffff guibg=#767676 gui=NONE cterm=NONE - hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE - hi TabLine guifg=#000000 guibg=#bcbcbc gui=NONE cterm=NONE - hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE - hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold,reverse cterm=bold,reverse - hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE - hi QuickFixLine guifg=#ffffff guibg=#0087d7 gui=NONE cterm=NONE - hi CursorLineNr guifg=#000000 guibg=NONE gui=bold cterm=bold - hi LineNr guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE - hi NonText guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE - hi FoldColumn guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE - hi EndOfBuffer guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE - hi SpecialKey guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE - hi Pmenu guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE - hi PmenuSel guifg=NONE guibg=#c6c6c6 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 PmenuKind guifg=#af0000 guibg=#e4e4e4 gui=NONE cterm=NONE - hi PmenuKindSel guifg=#af0000 guibg=#c6c6c6 gui=NONE cterm=NONE - hi PmenuExtra guifg=#767676 guibg=#e4e4e4 gui=NONE cterm=NONE - hi PmenuExtraSel guifg=#767676 guibg=#c6c6c6 gui=NONE cterm=NONE - hi PmenuMatch guifg=#af00af guibg=#e4e4e4 gui=NONE cterm=NONE - hi PmenuMatchSel guifg=#af00af guibg=#c6c6c6 gui=NONE cterm=NONE - hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE - hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE - hi ModeMsg guifg=#ffd787 guibg=#000000 gui=reverse cterm=reverse - hi MoreMsg guifg=#008700 guibg=NONE gui=bold cterm=bold - hi Question guifg=#af00af guibg=NONE gui=bold cterm=bold - hi WarningMsg guifg=#d70000 guibg=NONE gui=bold cterm=bold - hi Todo guifg=#008787 guibg=#ffffff gui=reverse cterm=reverse - hi Search guifg=#000000 guibg=#ffd787 gui=NONE cterm=NONE - hi IncSearch guifg=#000000 guibg=#87d787 gui=NONE cterm=NONE - hi CurSearch guifg=#000000 guibg=#87d787 gui=NONE cterm=NONE - hi WildMenu guifg=#000000 guibg=#ffd787 gui=bold cterm=bold - hi debugPC guifg=#005fd7 guibg=NONE gui=reverse cterm=reverse - hi debugBreakpoint guifg=#005f5f guibg=NONE gui=reverse cterm=reverse - hi Cursor guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE - hi lCursor guifg=#ff00ff guibg=#000000 gui=reverse cterm=reverse - hi Visual guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE - hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold - hi VisualNOS guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE - hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE - hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE - hi Folded guifg=#767676 guibg=#e4e4e4 gui=NONE cterm=NONE - hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE - hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellCap guifg=NONE guibg=NONE guisp=#005f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellRare guifg=NONE guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi Comment guifg=#005fd7 guibg=NONE gui=NONE cterm=NONE - hi Constant guifg=#af00af guibg=NONE gui=NONE cterm=NONE - hi String guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE - hi Identifier guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi Statement guifg=#000000 guibg=NONE gui=bold cterm=bold - hi Type guifg=#008700 guibg=NONE gui=NONE cterm=NONE - hi PreProc guifg=#005f5f guibg=NONE gui=NONE cterm=NONE - hi Special guifg=#008787 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=#005fd7 guibg=NONE gui=bold cterm=bold - hi Conceal guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE - hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd guifg=#000000 guibg=#d7afd7 gui=NONE cterm=NONE - hi DiffChange guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE - hi DiffText guifg=#000000 guibg=#5fd7d7 gui=NONE cterm=NONE - hi DiffDelete guifg=#870000 guibg=NONE gui=NONE cterm=NONE - hi Added guifg=#008700 guibg=NONE gui=NONE cterm=NONE - hi Changed guifg=#005fd7 guibg=NONE gui=NONE cterm=NONE - hi Removed guifg=#d70000 guibg=NONE gui=NONE cterm=NONE - hi diffSubname guifg=#af00af guibg=NONE gui=NONE cterm=NONE - hi dirType guifg=#005f5f guibg=NONE gui=NONE cterm=NONE - hi dirPermissionUser guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE - hi dirPermissionGroup guifg=#008700 guibg=NONE gui=NONE cterm=NONE - hi dirPermissionOther guifg=#af00af guibg=NONE gui=NONE cterm=NONE - hi dirOwner guifg=#808080 guibg=NONE gui=NONE cterm=NONE - hi dirGroup guifg=#808080 guibg=NONE gui=NONE cterm=NONE - hi dirTime guifg=#808080 guibg=NONE gui=NONE cterm=NONE - hi dirSize guifg=#af0000 guibg=NONE gui=NONE cterm=NONE - hi dirSizeMod guifg=#005f5f guibg=NONE gui=NONE cterm=NONE - hi dirLink guifg=#008700 guibg=NONE gui=bold cterm=bold - hi dirFilterMenuBookmarkPath guifg=#626262 guibg=NONE gui=NONE cterm=NONE - hi dirFilterMenuHistoryPath guifg=#626262 guibg=NONE gui=NONE cterm=NONE - hi FilterMenuDirectorySubtle guifg=#626262 guibg=NONE gui=NONE cterm=NONE - hi FilterMenuLineNr guifg=#626262 guibg=NONE gui=NONE cterm=NONE - hi CocSearch guifg=#af0000 guibg=NONE gui=NONE cterm=NONE -endif +hi! link shQuote Constant +hi! link shSetOption Normal +hi! link shTestOpr Normal +hi! link sqlKeyword Statement +hi! link vimCommentString Comment +hi! link vimGroup Normal +hi! link vimOper Normal +hi! link vimOption Normal +hi! link vimParenSep Normal +hi! link vimSep Normal +hi! link vimVar Normal +hi! link xmlTagName Statement +hi! link yamlBlockMappingKey Statement -if s:t_Co >= 256 - hi! link helpVim Title - hi! link helpHeader Title - hi! link helpHyperTextJump Underlined - hi! link fugitiveSymbolicRef PreProc - hi! link fugitiveHeading Statement - hi! link fugitiveStagedHeading Statement - hi! link fugitiveUnstagedHeading Statement - hi! link fugitiveUntrackedHeading Statement - hi! link fugitiveStagedModifier PreProc - hi! link fugitiveUnstagedModifier PreProc - hi! link fugitiveHash Constant - hi! link diffFile PreProc - hi! link markdownHeadingDelimiter Special - hi! link rstSectionDelimiter Statement - hi! link rstDirective PreProc - hi! link rstHyperlinkReference Special - hi! link rstFieldName Constant - hi! link rstDelimiter Special - hi! link rstInterpretedText Special - hi! link rstCodeBlock Normal - hi! link rstLiteralBlock rstCodeBlock - hi! link markdownUrl String - hi! link colortemplateKey Statement - hi! link xmlTagName 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 vimGroup Normal - hi! link vimVar Normal - hi! link vimOper Normal - hi! link vimSep Normal - hi! link vimParenSep Normal - hi! link vimOption Normal - hi! link vimCommentString Comment - hi! link pythonInclude Statement - hi! link shQuote Constant - hi! link shNoQuote Normal - hi! link shTestOpr Normal - hi! link shOperator Normal - hi! link shSetOption Normal - hi! link shOption Normal - hi! link shCommandSub Normal - hi! link shDerefPattern shQuote - hi! link shDerefOp Special - hi! link phpStorageClass Statement - hi! link phpStructure Statement - hi! link phpInclude Statement - hi! link phpDefine Statement - hi! link phpSpecialFunction Normal - hi! link phpParent Normal - hi! link phpComparison Normal - hi! link phpOperator Normal - hi! link phpVarSelector Special - hi! link phpMemberSelector Special - hi! link phpDocCustomTags phpDocTags - hi! link javaExternal Statement - hi! link javaType Statement - hi! link javaScopeDecl Statement - hi! link javaClassDecl Statement - hi! link javaStorageClass Statement - hi! link javaDocParam PreProc - hi! link csStorage Statement - hi! link csAccessModifier Statement - hi! link csClass Statement - hi! link csModifier Statement - hi! link csAsyncModifier Statement - hi! link csLogicSymbols Normal - hi! link csClassType Normal - hi! link csType Statement - hi! link Terminal Normal - hi! link StatuslineTerm Statusline - hi! link StatuslineTermNC StatuslineNC - hi! link LineNrAbove LineNr - hi! link LineNrBelow LineNr - hi! link MessageWindow PMenu - hi! link PopupNotification Todo - hi! link PopupSelected PmenuSel - if &background ==# 'dark' - hi Normal ctermfg=251 ctermbg=16 cterm=NONE - hi Statusline ctermfg=251 ctermbg=16 cterm=bold,reverse - hi StatuslineNC ctermfg=243 ctermbg=16 cterm=reverse - hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE - hi TabLine ctermfg=16 ctermbg=251 cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE - hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=16 ctermbg=231 cterm=NONE - hi QuickFixLine ctermfg=16 ctermbg=75 cterm=NONE - hi CursorLineNr ctermfg=231 ctermbg=NONE cterm=bold - hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE - hi NonText ctermfg=240 ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=NONE ctermbg=236 cterm=NONE - hi PmenuSel ctermfg=NONE ctermbg=239 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=251 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuKind ctermfg=203 ctermbg=236 cterm=NONE - hi PmenuKindSel ctermfg=203 ctermbg=239 cterm=NONE - hi PmenuExtra ctermfg=243 ctermbg=236 cterm=NONE - hi PmenuExtraSel ctermfg=243 ctermbg=239 cterm=NONE - hi PmenuMatch ctermfg=176 ctermbg=236 cterm=NONE - hi PmenuMatchSel ctermfg=176 ctermbg=239 cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=231 ctermbg=203 cterm=NONE - hi ErrorMsg ctermfg=231 ctermbg=203 cterm=NONE - hi ModeMsg ctermfg=222 ctermbg=NONE cterm=reverse - hi MoreMsg ctermfg=77 ctermbg=NONE cterm=NONE - hi Question ctermfg=213 ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=203 ctermbg=NONE cterm=NONE - hi Todo ctermfg=116 ctermbg=16 cterm=reverse - hi Search ctermfg=16 ctermbg=222 cterm=NONE - hi IncSearch ctermfg=16 ctermbg=77 cterm=NONE - hi CurSearch ctermfg=16 ctermbg=77 cterm=NONE - hi WildMenu ctermfg=16 ctermbg=222 cterm=bold - hi debugPC ctermfg=67 ctermbg=NONE cterm=reverse - hi debugBreakpoint ctermfg=73 ctermbg=NONE cterm=reverse - hi Visual ctermfg=231 ctermbg=24 cterm=NONE - hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold - hi VisualNOS ctermfg=16 ctermbg=73 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=235 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=235 cterm=NONE - hi Folded ctermfg=243 ctermbg=236 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=236 cterm=NONE - hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=73 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=213 ctermbg=NONE cterm=underline - hi Comment ctermfg=75 ctermbg=NONE cterm=NONE - hi Constant ctermfg=213 ctermbg=NONE cterm=NONE - hi String ctermfg=222 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE - hi Statement ctermfg=254 ctermbg=NONE cterm=bold - hi Type ctermfg=77 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=116 ctermbg=NONE cterm=NONE - hi Special ctermfg=73 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Title ctermfg=NONE ctermbg=NONE cterm=bold - hi Directory ctermfg=75 ctermbg=NONE cterm=bold - hi Conceal ctermfg=240 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=251 ctermbg=96 cterm=NONE - hi DiffChange ctermfg=251 ctermbg=59 cterm=NONE - hi DiffText ctermfg=159 ctermbg=66 cterm=NONE - hi DiffDelete ctermfg=174 ctermbg=NONE cterm=NONE - hi Added ctermfg=77 ctermbg=NONE cterm=NONE - hi Changed ctermfg=75 ctermbg=NONE cterm=NONE - hi Removed ctermfg=174 ctermbg=NONE cterm=NONE - hi diffSubname ctermfg=213 ctermbg=NONE cterm=NONE - hi dirType ctermfg=176 ctermbg=NONE cterm=NONE - hi dirPermissionUser ctermfg=71 ctermbg=NONE cterm=NONE - hi dirPermissionGroup ctermfg=137 ctermbg=NONE cterm=NONE - hi dirPermissionOther ctermfg=73 ctermbg=NONE cterm=NONE - hi dirOwner ctermfg=243 ctermbg=NONE cterm=NONE - hi dirGroup ctermfg=243 ctermbg=NONE cterm=NONE - hi dirTime ctermfg=243 ctermbg=NONE cterm=NONE - hi dirSize ctermfg=222 ctermbg=NONE cterm=NONE - hi dirSizeMod ctermfg=176 ctermbg=NONE cterm=NONE - hi FilterMenuDirectorySubtle ctermfg=102 ctermbg=NONE cterm=NONE - hi dirFilterMenuBookmarkPath ctermfg=102 ctermbg=NONE cterm=NONE - hi dirFilterMenuHistoryPath ctermfg=102 ctermbg=NONE cterm=NONE - hi FilterMenuLineNr ctermfg=102 ctermbg=NONE cterm=NONE - hi CocSearch ctermfg=222 ctermbg=NONE cterm=NONE - else - " Light background - hi Normal ctermfg=16 ctermbg=231 cterm=NONE - hi Statusline ctermfg=231 ctermbg=16 cterm=bold - hi StatuslineNC ctermfg=231 ctermbg=243 cterm=NONE - hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE - hi TabLine ctermfg=16 ctermbg=250 cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE - hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold,reverse - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=231 ctermbg=16 cterm=NONE - hi QuickFixLine ctermfg=231 ctermbg=32 cterm=NONE - hi CursorLineNr ctermfg=16 ctermbg=NONE cterm=bold - hi LineNr ctermfg=247 ctermbg=NONE cterm=NONE - hi NonText ctermfg=247 ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=247 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=247 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=247 ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=NONE ctermbg=254 cterm=NONE - hi PmenuSel ctermfg=NONE ctermbg=251 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuKind ctermfg=124 ctermbg=254 cterm=NONE - hi PmenuKindSel ctermfg=124 ctermbg=251 cterm=NONE - hi PmenuExtra ctermfg=243 ctermbg=254 cterm=NONE - hi PmenuExtraSel ctermfg=243 ctermbg=251 cterm=NONE - hi PmenuMatch ctermfg=127 ctermbg=254 cterm=NONE - hi PmenuMatchSel ctermfg=127 ctermbg=251 cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=231 ctermbg=160 cterm=NONE - hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE - hi ModeMsg ctermfg=222 ctermbg=16 cterm=reverse - hi MoreMsg ctermfg=28 ctermbg=NONE cterm=bold - hi Question ctermfg=127 ctermbg=NONE cterm=bold - hi WarningMsg ctermfg=160 ctermbg=NONE cterm=bold - hi Todo ctermfg=30 ctermbg=231 cterm=reverse - hi Search ctermfg=16 ctermbg=222 cterm=NONE - hi IncSearch ctermfg=16 ctermbg=114 cterm=NONE - hi CurSearch ctermfg=16 ctermbg=114 cterm=NONE - hi WildMenu ctermfg=16 ctermbg=222 cterm=bold - hi debugPC ctermfg=26 ctermbg=NONE cterm=reverse - hi debugBreakpoint ctermfg=23 ctermbg=NONE cterm=reverse - hi Visual ctermfg=231 ctermbg=67 cterm=NONE - hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold - hi VisualNOS ctermfg=231 ctermbg=30 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE - hi Folded ctermfg=243 ctermbg=254 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE - hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=28 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=133 ctermbg=NONE cterm=underline - hi Comment ctermfg=26 ctermbg=NONE cterm=NONE - hi Constant ctermfg=127 ctermbg=NONE cterm=NONE - hi String ctermfg=130 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE - hi Statement ctermfg=16 ctermbg=NONE cterm=bold - hi Type ctermfg=28 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=23 ctermbg=NONE cterm=NONE - hi Special ctermfg=30 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Title ctermfg=NONE ctermbg=NONE cterm=bold - hi Directory ctermfg=26 ctermbg=NONE cterm=bold - hi Conceal ctermfg=247 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=16 ctermbg=182 cterm=NONE - hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE - hi DiffText ctermfg=16 ctermbg=80 cterm=NONE - hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE - hi Added ctermfg=28 ctermbg=NONE cterm=NONE - hi Changed ctermfg=26 ctermbg=NONE cterm=NONE - hi Removed ctermfg=160 ctermbg=NONE cterm=NONE - hi diffSubname ctermfg=127 ctermbg=NONE cterm=NONE - hi dirType ctermfg=23 ctermbg=NONE cterm=NONE - hi dirPermissionUser ctermfg=130 ctermbg=NONE cterm=NONE - hi dirPermissionGroup ctermfg=28 ctermbg=NONE cterm=NONE - hi dirPermissionOther ctermfg=127 ctermbg=NONE cterm=NONE - hi dirOwner ctermfg=244 ctermbg=NONE cterm=NONE - hi dirGroup ctermfg=244 ctermbg=NONE cterm=NONE - hi dirTime ctermfg=244 ctermbg=NONE cterm=NONE - hi dirSize ctermfg=124 ctermbg=NONE cterm=NONE - hi dirSizeMod ctermfg=23 ctermbg=NONE cterm=NONE - hi dirLink ctermfg=28 ctermbg=NONE cterm=bold - hi dirFilterMenuBookmarkPath ctermfg=241 ctermbg=NONE cterm=NONE - hi dirFilterMenuHistoryPath ctermfg=241 ctermbg=NONE cterm=NONE - hi FilterMenuDirectorySubtle ctermfg=241 ctermbg=NONE cterm=NONE - hi FilterMenuLineNr ctermfg=241 ctermbg=NONE cterm=NONE - hi CocSearch ctermfg=124 ctermbg=NONE cterm=NONE +if &background == 'dark' + let g:terminal_ansi_colors = ['#000000', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#d787d7', '#5fafaf', '#c6c6c6', '#767676', '#ff5f5f', '#5fd75f', '#ffd787', '#5fafff', '#ff87ff', '#5fd7d7', '#ffffff'] + + hi Normal guifg=#c6c6c6 guibg=#000000 guisp=NONE gui=NONE ctermfg=251 ctermbg=16 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=#5fafff guibg=NONE guisp=NONE gui=NONE ctermfg=75 ctermbg=NONE cterm=NONE term=NONE + hi ColorColumn guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=reverse + hi Comment guifg=#5fafff guibg=NONE guisp=NONE gui=NONE ctermfg=75 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=#ff87ff guibg=NONE guisp=NONE gui=NONE ctermfg=213 ctermbg=NONE cterm=NONE term=NONE + hi CursorColumn guifg=NONE guibg=#262626 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=NONE + hi CursorLine guifg=NONE guibg=#262626 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=underline + hi CursorLineNr guifg=#ffffff guibg=NONE guisp=NONE gui=bold ctermfg=231 ctermbg=NONE cterm=bold term=bold + hi DiffAdd guifg=NONE guibg=#273923 guisp=NONE gui=NONE ctermfg=251 ctermbg=22 cterm=NONE term=reverse + hi DiffChange guifg=NONE guibg=#37352f guisp=NONE gui=NONE ctermfg=251 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=251 ctermbg=23 cterm=NONE term=reverse + hi Directory guifg=#5fafff guibg=NONE guisp=NONE gui=bold ctermfg=75 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=#ff5f5f guibg=#ffffff guisp=NONE gui=reverse ctermfg=203 ctermbg=231 cterm=reverse term=bold,reverse + hi ErrorMsg guifg=#ff5f5f guibg=#ffffff guisp=NONE gui=reverse ctermfg=203 ctermbg=231 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=#767676 guibg=#303030 guisp=NONE gui=NONE ctermfg=243 ctermbg=236 cterm=NONE term=NONE + hi Identifier guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE 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=#5f431f guisp=NONE gui=NONE ctermfg=16 ctermbg=77 cterm=NONE 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=#ffd787 guibg=NONE guisp=NONE gui=reverse ctermfg=222 ctermbg=NONE cterm=reverse term=bold + hi MoreMsg guifg=#5fd75f guibg=NONE guisp=NONE gui=NONE ctermfg=77 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=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=reverse + hi PmenuBorder guifg=#767676 guibg=#303030 guisp=NONE gui=NONE ctermfg=243 ctermbg=236 cterm=NONE term=NONE + hi PmenuExtra guifg=#767676 guibg=#303030 guisp=NONE gui=NONE ctermfg=243 ctermbg=236 cterm=NONE term=NONE + hi PmenuExtraSel guifg=#767676 guibg=#4e4e4e guisp=NONE gui=NONE ctermfg=243 ctermbg=239 cterm=NONE term=NONE + hi PmenuKind guifg=#ff5f5f guibg=#303030 guisp=NONE gui=NONE ctermfg=203 ctermbg=236 cterm=NONE term=NONE + hi PmenuKindSel guifg=#ff5f5f guibg=#4e4e4e guisp=NONE gui=NONE ctermfg=203 ctermbg=239 cterm=NONE term=NONE + hi PmenuMatch guifg=#d787d7 guibg=#303030 guisp=NONE gui=NONE ctermfg=176 ctermbg=236 cterm=NONE term=NONE + hi PmenuMatchSel guifg=#d787d7 guibg=#4e4e4e guisp=NONE gui=NONE ctermfg=176 ctermbg=239 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=#4e4e4e guisp=NONE gui=NONE ctermfg=NONE ctermbg=239 cterm=NONE term=bold + hi PmenuThumb guifg=NONE guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=NONE ctermbg=251 cterm=NONE term=NONE + hi PreProc guifg=#5fd7d7 guibg=NONE guisp=NONE gui=NONE ctermfg=116 ctermbg=NONE cterm=NONE term=NONE + hi Question guifg=#ff87ff guibg=NONE guisp=NONE gui=NONE ctermfg=213 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=#ff5f5f guibg=NONE guisp=NONE gui=NONE ctermfg=203 ctermbg=NONE cterm=NONE term=NONE + hi Search guifg=NONE guibg=#3a4a3a guisp=NONE gui=NONE ctermfg=16 ctermbg=222 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=#5fafaf guibg=NONE guisp=NONE gui=NONE ctermfg=73 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=#ff5f5f gui=undercurl ctermfg=203 ctermbg=NONE cterm=underline term=underline + hi SpellCap guifg=NONE guibg=NONE guisp=#5fafaf gui=undercurl ctermfg=73 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=#ff87ff gui=undercurl ctermfg=213 ctermbg=NONE cterm=underline term=underline + hi Statement guifg=#e4e4e4 guibg=NONE guisp=NONE gui=bold ctermfg=254 ctermbg=NONE cterm=bold term=NONE + hi StatusLine guifg=#c6c6c6 guibg=#000000 guisp=NONE gui=bold,reverse ctermfg=251 ctermbg=16 cterm=bold,reverse term=bold,reverse + hi StatusLineNC guifg=#767676 guibg=#000000 guisp=NONE gui=reverse ctermfg=243 ctermbg=16 cterm=reverse term=bold,underline + hi String guifg=#ffd787 guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE + hi TabLine guifg=#000000 guibg=#767676 guisp=NONE gui=NONE ctermfg=16 ctermbg=243 cterm=NONE term=bold,underline + hi TabLineFill guifg=#000000 guibg=#767676 guisp=NONE gui=NONE ctermfg=16 ctermbg=243 cterm=NONE term=NONE + hi TabLineSel guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=bold ctermfg=16 ctermbg=251 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=#ffffff guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=231 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=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold,reverse + hi ToolbarButton guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 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=#5fd75f guibg=NONE guisp=NONE gui=NONE ctermfg=77 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=#104070 guisp=NONE gui=NONE ctermfg=32 ctermbg=16 cterm=reverse term=reverse + hi VisualNOS guifg=#000000 guibg=#5fafaf guisp=NONE gui=NONE ctermfg=16 ctermbg=73 cterm=NONE term=NONE + hi WarningMsg guifg=#ff5f5f guibg=NONE guisp=NONE gui=NONE ctermfg=203 ctermbg=NONE cterm=NONE term=standout + hi WildMenu guifg=#000000 guibg=#ffd787 guisp=NONE gui=bold ctermfg=16 ctermbg=222 cterm=bold term=bold + hi debugBreakpoint guifg=#5fafaf guibg=NONE guisp=NONE gui=reverse ctermfg=73 ctermbg=NONE cterm=reverse term=reverse + hi debugPC guifg=#5f87af guibg=NONE guisp=NONE gui=reverse ctermfg=67 ctermbg=NONE cterm=reverse term=reverse + hi dirGroup guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE + hi dirOwner guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE + hi dirPermissionGroup guifg=#af875f guibg=NONE guisp=NONE gui=NONE ctermfg=137 ctermbg=NONE cterm=NONE term=NONE + hi dirPermissionOther guifg=#5fafaf guibg=NONE guisp=NONE gui=NONE ctermfg=73 ctermbg=NONE cterm=NONE term=NONE + hi dirPermissionUser guifg=#5faf5f guibg=NONE guisp=NONE gui=NONE ctermfg=71 ctermbg=NONE cterm=NONE term=NONE + hi dirSize guifg=#ffd787 guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE + hi dirSizeMod guifg=#d787d7 guibg=NONE guisp=NONE gui=NONE ctermfg=176 ctermbg=NONE cterm=NONE term=NONE + hi dirTime guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE + hi dirType guifg=#d787d7 guibg=NONE guisp=NONE gui=NONE ctermfg=176 ctermbg=NONE cterm=NONE term=NONE + + if s:tgc || s:t_Co >= 256 + if s:tgc + hi IncSearch cterm=NONE + hi QuickFixLine cterm=NONE + hi Search cterm=NONE + hi Visual cterm=NONE + endif + finish endif - unlet s:t_Co - finish -endif -if s:t_Co >= 16 - if &background ==# 'dark' + if s:t_Co >= 16 hi Normal ctermfg=grey ctermbg=black cterm=NONE - hi Statusline ctermfg=grey ctermbg=black cterm=bold,reverse - hi StatuslineNC ctermfg=darkgrey ctermbg=black cterm=reverse - hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE - hi TabLine ctermfg=black ctermbg=grey cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE - hi TabLineSel ctermfg=white ctermbg=black cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=black ctermbg=white cterm=NONE - hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE + hi Added ctermfg=green ctermbg=NONE cterm=NONE + hi Changed ctermfg=blue ctermbg=NONE cterm=NONE + hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi Comment ctermfg=blue ctermbg=NONE cterm=NONE + hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE + hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE + hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=white 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=darkcyan ctermbg=black cterm=reverse + hi Directory ctermfg=blue ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Error ctermfg=red ctermbg=white cterm=reverse + hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse + hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE + hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=black ctermbg=green cterm=NONE hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline + hi ModeMsg ctermfg=yellow ctermbg=NONE cterm=reverse + hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE hi NonText ctermfg=grey ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Pmenu ctermfg=black ctermbg=grey cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE - hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE - hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE + hi PmenuBorder ctermfg=NONE ctermbg=grey cterm=NONE hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE + hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE + hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=white ctermbg=red cterm=NONE - hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE - hi ModeMsg ctermfg=yellow ctermbg=NONE cterm=reverse - hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse + hi PreProc ctermfg=cyan ctermbg=NONE cterm=NONE hi Question ctermfg=magenta ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE - hi Todo ctermfg=cyan ctermbg=black cterm=reverse + hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE + hi Removed ctermfg=red ctermbg=NONE cterm=NONE hi Search ctermfg=black ctermbg=yellow cterm=NONE - hi IncSearch ctermfg=black ctermbg=green cterm=NONE - hi CurSearch ctermfg=black ctermbg=green cterm=NONE - hi WildMenu ctermfg=black ctermbg=yellow cterm=bold - hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse - hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline - hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE - hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE - hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE hi SpellBad ctermfg=red ctermbg=NONE cterm=underline hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline hi SpellLocal ctermfg=green ctermbg=NONE cterm=underline hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline - hi Comment ctermfg=blue ctermbg=NONE cterm=NONE - hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE - hi String ctermfg=yellow ctermbg=NONE cterm=NONE - hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE hi Statement ctermfg=grey ctermbg=NONE cterm=bold + hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse + hi StatusLineNC ctermfg=darkgrey ctermbg=black cterm=reverse + hi String ctermfg=yellow ctermbg=NONE cterm=NONE + hi TabLine ctermfg=black ctermbg=darkgrey cterm=NONE + hi TabLineFill ctermfg=black ctermbg=darkgrey cterm=NONE + hi TabLineSel ctermfg=black ctermbg=grey cterm=bold + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold + hi ToolbarButton ctermfg=black ctermbg=white cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE hi Type ctermfg=green ctermbg=NONE cterm=NONE - hi PreProc ctermfg=cyan 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=blue ctermbg=NONE cterm=bold - hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE - hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE - hi DiffText ctermfg=black ctermbg=cyan cterm=NONE - hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE + hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE + hi Visual ctermfg=darkblue 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=darkcyan ctermbg=NONE cterm=reverse + hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse + hi dirGroup ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi dirOwner ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi dirPermissionGroup ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi dirPermissionOther ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi dirPermissionUser ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi dirSize ctermfg=yellow ctermbg=NONE cterm=NONE + hi dirSizeMod ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi dirTime ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi dirType ctermfg=darkmagenta ctermbg=NONE cterm=NONE + finish + endif + + if s:t_Co >= 8 + hi Normal ctermfg=grey ctermbg=black cterm=NONE hi Added ctermfg=green ctermbg=NONE cterm=NONE hi Changed ctermfg=blue ctermbg=NONE cterm=NONE - hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE - hi diffSubname ctermfg=magenta ctermbg=NONE cterm=NONE - hi dirType ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi dirPermissionUser ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE 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 DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE + hi DiffChange ctermfg=black ctermbg=darkyellow cterm=NONE + hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE + hi DiffText ctermfg=black ctermbg=darkmagenta cterm=NONE + hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE + hi Error ctermfg=grey ctermbg=darkred cterm=NONE + hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE + hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE + hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse + hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold + hi ModeMsg ctermfg=darkyellow ctermbg=black cterm=reverse + hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi NonText ctermfg=grey ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuBorder ctermfg=darkgrey ctermbg=darkgrey cterm=NONE + 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=darkred cterm=reverse + hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold + hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse + hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE + hi Removed ctermfg=red ctermbg=NONE cterm=NONE + hi Search ctermfg=NONE ctermbg=NONE cterm=reverse + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse,underline + hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse,underline + hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse,underline + hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse,underline + hi Statement ctermfg=grey ctermbg=NONE cterm=bold + hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse + hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE + hi String ctermfg=yellow ctermbg=NONE cterm=NONE + hi TabLine ctermfg=black ctermbg=grey cterm=NONE + hi TabLineFill ctermfg=grey ctermbg=grey cterm=NONE + hi TabLineSel ctermfg=grey ctermbg=black cterm=bold,reverse + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold + hi ToolbarButton ctermfg=grey ctermbg=black 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=grey cterm=NONE + hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse + hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE + hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE + hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold + hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse + hi dirGroup ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi dirOwner ctermfg=darkgrey ctermbg=NONE cterm=NONE hi dirPermissionGroup ctermfg=darkyellow ctermbg=NONE cterm=NONE hi dirPermissionOther ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi dirOwner ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi dirGroup ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi dirTime ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi dirPermissionUser ctermfg=darkgreen ctermbg=NONE cterm=NONE hi dirSize ctermfg=yellow ctermbg=NONE cterm=NONE hi dirSizeMod ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi FilterMenuDirectorySubtle ctermfg=grey ctermbg=NONE cterm=NONE - hi dirFilterMenuBookmarkPath ctermfg=grey ctermbg=NONE cterm=NONE - hi dirFilterMenuHistoryPath ctermfg=grey ctermbg=NONE cterm=NONE - hi FilterMenuLineNr ctermfg=grey ctermbg=NONE cterm=NONE - hi CocSearch ctermfg=yellow ctermbg=NONE cterm=NONE - else - " Light background + hi dirTime ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi dirType ctermfg=darkmagenta ctermbg=NONE cterm=NONE + finish + endif + + if s:t_Co >= 0 + hi CurSearch term=reverse + hi CursorIM term=NONE + hi CursorLineFold term=underline + hi CursorLineSign term=underline + 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 + + finish +endif + +if &background == 'light' + let g:terminal_ansi_colors = ['#000000', '#af0000', '#008700', '#af5f00', '#005fd7', '#af00af', '#005f5f', '#808080', '#767676', '#d70000', '#87d787', '#ffd787', '#0087d7', '#ff00ff', '#008787', '#ffffff'] + + hi Normal guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE + hi Added guifg=#008700 guibg=NONE guisp=NONE gui=NONE ctermfg=28 ctermbg=NONE cterm=NONE term=NONE + hi Changed guifg=#005fd7 guibg=NONE guisp=NONE gui=NONE ctermfg=26 ctermbg=NONE cterm=NONE term=NONE + hi ColorColumn guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=reverse + hi Comment guifg=#005fd7 guibg=NONE guisp=NONE gui=NONE ctermfg=26 ctermbg=NONE cterm=NONE term=bold + hi Conceal guifg=#9e9e9e guibg=NONE guisp=NONE gui=NONE ctermfg=247 ctermbg=NONE cterm=NONE term=NONE + hi Constant guifg=#af00af guibg=NONE guisp=NONE gui=NONE ctermfg=127 ctermbg=NONE cterm=NONE term=NONE + hi CursorColumn guifg=NONE guibg=#eeeeee guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=NONE + hi CursorLine guifg=NONE guibg=#eeeeee guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=underline + hi CursorLineNr guifg=#000000 guibg=NONE guisp=NONE gui=bold ctermfg=16 ctermbg=NONE cterm=bold term=bold + hi DiffAdd guifg=NONE guibg=#c7d7c7 guisp=NONE gui=NONE ctermfg=16 ctermbg=108 cterm=NONE term=reverse + hi DiffChange guifg=NONE guibg=#d7d7c7 guisp=NONE gui=NONE ctermfg=16 ctermbg=253 cterm=NONE term=NONE + hi DiffDelete guifg=#767676 guibg=#d7b7b7 guisp=NONE gui=NONE ctermfg=16 ctermbg=131 cterm=NONE term=reverse + hi DiffText guifg=NONE guibg=#a7cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=109 cterm=NONE term=reverse + hi Directory guifg=#005fd7 guibg=NONE guisp=NONE gui=bold ctermfg=26 ctermbg=NONE cterm=bold term=NONE + hi EndOfBuffer guifg=#9e9e9e guibg=NONE guisp=NONE gui=NONE ctermfg=247 ctermbg=NONE cterm=NONE term=NONE + hi Error guifg=#ffffff guibg=#d70000 guisp=NONE gui=NONE ctermfg=231 ctermbg=160 cterm=NONE 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=#9e9e9e guibg=NONE guisp=NONE gui=NONE ctermfg=247 ctermbg=NONE cterm=NONE term=NONE + hi Folded guifg=#767676 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=243 ctermbg=254 cterm=NONE term=NONE + hi Identifier guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE 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=#fff0cf guisp=NONE gui=NONE ctermfg=16 ctermbg=114 cterm=NONE term=bold,reverse,underline + hi LineNr guifg=#9e9e9e guibg=NONE guisp=NONE gui=NONE ctermfg=247 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=#ffd787 guibg=#000000 guisp=NONE gui=reverse ctermfg=222 ctermbg=16 cterm=reverse term=bold + hi MoreMsg guifg=#008700 guibg=NONE guisp=NONE gui=bold ctermfg=28 ctermbg=NONE cterm=bold term=NONE + hi NonText guifg=#9e9e9e guibg=NONE guisp=NONE gui=NONE ctermfg=247 ctermbg=NONE cterm=NONE term=NONE + hi Pmenu guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=reverse + hi PmenuBorder guifg=#767676 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=243 ctermbg=254 cterm=NONE term=NONE + hi PmenuExtra guifg=#767676 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=243 ctermbg=254 cterm=NONE term=NONE + hi PmenuExtraSel guifg=#767676 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=243 ctermbg=251 cterm=NONE term=NONE + hi PmenuKind guifg=#af0000 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=124 ctermbg=254 cterm=NONE term=NONE + hi PmenuKindSel guifg=#af0000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=124 ctermbg=251 cterm=NONE term=NONE + hi PmenuMatch guifg=#af00af guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=127 ctermbg=254 cterm=NONE term=NONE + hi PmenuMatchSel guifg=#af00af guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=127 ctermbg=251 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=#c6c6c6 guisp=NONE gui=NONE ctermfg=NONE ctermbg=251 cterm=NONE term=bold + hi PmenuThumb guifg=NONE guibg=#767676 guisp=NONE gui=NONE ctermfg=NONE ctermbg=243 cterm=NONE term=NONE + hi PreProc guifg=#005f5f guibg=NONE guisp=NONE gui=NONE ctermfg=23 ctermbg=NONE cterm=NONE term=NONE + hi Question guifg=#af00af guibg=NONE guisp=NONE gui=bold ctermfg=127 ctermbg=NONE cterm=bold term=standout + hi QuickFixLine guifg=NONE guibg=#e7cfe7 guisp=NONE gui=NONE ctermfg=16 ctermbg=182 cterm=NONE term=NONE + hi Removed guifg=#d70000 guibg=NONE guisp=NONE gui=NONE ctermfg=160 ctermbg=NONE cterm=NONE term=NONE + hi Search guifg=NONE guibg=#e7f3e7 guisp=NONE gui=NONE ctermfg=16 ctermbg=222 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=#008787 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE + hi SpecialKey guifg=#9e9e9e guibg=NONE guisp=NONE gui=NONE ctermfg=247 ctermbg=NONE cterm=NONE term=bold + hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=124 ctermbg=NONE cterm=underline term=underline + hi SpellCap guifg=NONE guibg=NONE guisp=#005f5f gui=undercurl ctermfg=23 ctermbg=NONE cterm=underline term=underline + hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=28 ctermbg=NONE cterm=underline term=underline + hi SpellRare guifg=NONE guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=133 ctermbg=NONE cterm=underline term=underline + hi Statement guifg=#000000 guibg=NONE guisp=NONE gui=bold ctermfg=16 ctermbg=NONE cterm=bold term=NONE + hi StatusLine guifg=#ffffff guibg=#000000 guisp=NONE gui=bold ctermfg=231 ctermbg=16 cterm=bold term=bold,reverse + hi StatusLineNC guifg=#ffffff guibg=#767676 guisp=NONE gui=NONE ctermfg=231 ctermbg=243 cterm=NONE term=bold,underline + hi String guifg=#af5f00 guibg=NONE guisp=NONE gui=NONE ctermfg=130 ctermbg=NONE cterm=NONE term=NONE + hi TabLine guifg=#000000 guibg=#bcbcbc guisp=NONE gui=NONE ctermfg=16 ctermbg=250 cterm=NONE term=bold,underline + hi TabLineFill guifg=#bcbcbc guibg=#bcbcbc guisp=NONE gui=NONE ctermfg=250 ctermbg=250 cterm=NONE term=NONE + hi TabLineSel guifg=#000000 guibg=#ffffff guisp=NONE gui=bold,reverse ctermfg=16 ctermbg=231 cterm=bold,reverse term=bold,reverse + hi Title guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE 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=#767676 guibg=#f5f5f5 guisp=NONE gui=NONE ctermfg=243 ctermbg=255 cterm=NONE term=NONE + hi Todo guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold,reverse + hi ToolbarButton guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 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=#008700 guibg=NONE guisp=NONE gui=NONE ctermfg=28 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=#bfdfff guisp=NONE gui=NONE ctermfg=67 ctermbg=231 cterm=reverse term=reverse + hi VisualNOS guifg=#ffffff guibg=#008787 guisp=NONE gui=NONE ctermfg=231 ctermbg=30 cterm=NONE term=NONE + hi WarningMsg guifg=#d70000 guibg=NONE guisp=NONE gui=bold ctermfg=160 ctermbg=NONE cterm=bold term=standout + hi WildMenu guifg=#000000 guibg=#ffd787 guisp=NONE gui=bold ctermfg=16 ctermbg=222 cterm=bold term=bold + hi debugBreakpoint guifg=#005f5f guibg=NONE guisp=NONE gui=reverse ctermfg=23 ctermbg=NONE cterm=reverse term=reverse + hi debugPC guifg=#005fd7 guibg=NONE guisp=NONE gui=reverse ctermfg=26 ctermbg=NONE cterm=reverse term=reverse + hi dirFilterMenuBookmarkPath guifg=#626262 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE + hi dirFilterMenuHistoryPath guifg=#626262 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE + hi dirGroup guifg=#808080 guibg=NONE guisp=NONE gui=NONE ctermfg=244 ctermbg=NONE cterm=NONE term=NONE + hi dirLink guifg=#008700 guibg=NONE guisp=NONE gui=bold ctermfg=28 ctermbg=NONE cterm=bold term=bold + hi dirOwner guifg=#808080 guibg=NONE guisp=NONE gui=NONE ctermfg=244 ctermbg=NONE cterm=NONE term=NONE + hi dirPermissionGroup guifg=#008700 guibg=NONE guisp=NONE gui=NONE ctermfg=28 ctermbg=NONE cterm=NONE term=NONE + hi dirPermissionOther guifg=#af00af guibg=NONE guisp=NONE gui=NONE ctermfg=127 ctermbg=NONE cterm=NONE term=NONE + hi dirPermissionUser guifg=#af5f00 guibg=NONE guisp=NONE gui=NONE ctermfg=130 ctermbg=NONE cterm=NONE term=NONE + hi dirSize guifg=#af0000 guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE + hi dirSizeMod guifg=#005f5f guibg=NONE guisp=NONE gui=NONE ctermfg=23 ctermbg=NONE cterm=NONE term=NONE + hi dirTime guifg=#808080 guibg=NONE guisp=NONE gui=NONE ctermfg=244 ctermbg=NONE cterm=NONE term=NONE + hi dirType guifg=#005f5f guibg=NONE guisp=NONE gui=NONE ctermfg=23 ctermbg=NONE cterm=NONE term=NONE + + if s:tgc || s:t_Co >= 256 + if s:tgc + hi IncSearch cterm=NONE + hi QuickFixLine cterm=NONE + hi Search cterm=NONE + hi Visual cterm=NONE + endif + finish + endif + + if s:t_Co >= 16 hi Normal ctermfg=black ctermbg=white cterm=NONE - hi Statusline ctermfg=white ctermbg=black cterm=bold - hi StatuslineNC ctermfg=white ctermbg=darkgrey cterm=NONE - hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE - hi TabLine ctermfg=black ctermbg=lightgrey cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE - hi TabLineSel ctermfg=white ctermbg=black cterm=bold,reverse - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=white ctermbg=black cterm=NONE - hi QuickFixLine ctermfg=white ctermbg=blue cterm=NONE + hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE + hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold - hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=black ctermbg=green cterm=NONE + hi DiffChange ctermfg=black ctermbg=yellow cterm=NONE + hi DiffDelete ctermfg=black ctermbg=red cterm=NONE + hi DiffText ctermfg=black ctermbg=cyan cterm=NONE + hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=black ctermbg=grey cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE - hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE - hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE - hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE - hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi Error ctermfg=white ctermbg=red cterm=NONE hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE + hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=black ctermbg=green cterm=NONE + hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline hi ModeMsg ctermfg=yellow ctermbg=black cterm=reverse hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold + hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=black ctermbg=grey cterm=NONE + hi PmenuBorder ctermfg=NONE ctermbg=grey cterm=NONE + hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE + hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE + hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE + hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE + hi PmenuMatch ctermfg=darkmagenta ctermbg=grey cterm=NONE + hi PmenuMatchSel ctermfg=darkmagenta ctermbg=darkcyan cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse + hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Question ctermfg=darkmagenta ctermbg=NONE cterm=bold - hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold - hi Todo ctermfg=cyan ctermbg=white cterm=reverse + hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE + hi Removed ctermfg=red ctermbg=NONE cterm=NONE hi Search ctermfg=black ctermbg=yellow cterm=NONE - hi IncSearch ctermfg=black ctermbg=green cterm=NONE - hi CurSearch ctermfg=black ctermbg=green cterm=NONE - hi WildMenu ctermfg=black ctermbg=yellow cterm=bold - hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse - hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi Visual ctermfg=white ctermbg=darkblue cterm=NONE - hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline - hi VisualNOS ctermfg=black ctermbg=cyan cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE - hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE - hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=cyan ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline - hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE hi Statement ctermfg=black ctermbg=NONE cterm=bold + hi StatusLine ctermfg=white ctermbg=black cterm=bold + hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=NONE + hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi TabLine ctermfg=black ctermbg=lightgrey cterm=NONE + hi TabLineFill ctermfg=lightgrey ctermbg=lightgrey cterm=NONE + hi TabLineSel ctermfg=black ctermbg=white cterm=bold,reverse + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi TitleBar ctermfg=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=white cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold + hi ToolbarButton ctermfg=white ctermbg=black cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Special ctermfg=cyan ctermbg=NONE cterm=NONE hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Title ctermfg=NONE ctermbg=NONE cterm=bold - hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold - hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE - hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE - hi DiffText ctermfg=black ctermbg=cyan cterm=NONE - hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE - hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Removed ctermfg=red ctermbg=NONE cterm=NONE - hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi dirType ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi dirPermissionUser ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE + hi Visual ctermfg=white ctermbg=darkblue cterm=NONE + hi VisualNOS ctermfg=black ctermbg=cyan cterm=NONE + hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold + hi WildMenu ctermfg=black ctermbg=yellow cterm=bold + hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse + hi dirFilterMenuBookmarkPath ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi dirFilterMenuHistoryPath ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi dirGroup ctermfg=grey ctermbg=NONE cterm=NONE + hi dirLink ctermfg=darkgreen ctermbg=NONE cterm=bold + hi dirOwner ctermfg=grey ctermbg=NONE cterm=NONE hi dirPermissionGroup ctermfg=darkgreen ctermbg=NONE cterm=NONE hi dirPermissionOther ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi dirOwner ctermfg=grey ctermbg=NONE cterm=NONE - hi dirGroup ctermfg=grey ctermbg=NONE cterm=NONE - hi dirTime ctermfg=grey ctermbg=NONE cterm=NONE + hi dirPermissionUser ctermfg=darkyellow ctermbg=NONE cterm=NONE hi dirSize ctermfg=darkred ctermbg=NONE cterm=NONE hi dirSizeMod ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi dirLink ctermfg=darkgreen ctermbg=NONE cterm=bold - hi dirFilterMenuBookmarkPath ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi dirFilterMenuHistoryPath ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi FilterMenuDirectorySubtle ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi FilterMenuLineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi CocSearch ctermfg=darkred ctermbg=NONE cterm=NONE + hi dirTime ctermfg=grey ctermbg=NONE cterm=NONE + hi dirType ctermfg=darkcyan ctermbg=NONE cterm=NONE + finish endif - unlet s:t_Co - finish -endif -if s:t_Co >= 8 - if &background ==# 'dark' - hi Normal ctermfg=grey ctermbg=black cterm=NONE - hi Statusline ctermfg=grey ctermbg=black cterm=bold,reverse - hi StatuslineNC ctermfg=black ctermbg=grey cterm=NONE - hi VertSplit ctermfg=grey ctermbg=grey cterm=NONE - hi TabLine ctermfg=grey ctermbg=black cterm=reverse - 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 QuickFixLine ctermfg=grey ctermbg=darkblue cterm=bold - hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold - hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi NonText ctermfg=grey ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=black ctermbg=grey cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE - hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE - hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE - hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE - hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE - hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=grey ctermbg=darkred cterm=NONE - hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE - hi ModeMsg ctermfg=darkyellow ctermbg=black cterm=reverse - hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE - hi Todo ctermfg=darkcyan ctermbg=black cterm=reverse - hi Search ctermfg=darkyellow ctermbg=black cterm=reverse - hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse - hi CurSearch ctermfg=darkgreen ctermbg=black cterm=reverse - hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold - hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse - hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse - hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold - hi VisualNOS 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 + if s:t_Co >= 8 + hi Normal ctermfg=black ctermbg=grey cterm=NONE + hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE - hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse,underline - hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse,underline - hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse,underline - hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse,underline hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE - hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE - hi Statement ctermfg=grey ctermbg=NONE cterm=bold - hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkcyan 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=darkblue ctermbg=NONE cterm=bold hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE - hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE - hi DiffText ctermfg=black ctermbg=grey cterm=NONE - hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE - else - " Light background - hi Normal ctermfg=black ctermbg=grey cterm=NONE - hi Statusline ctermfg=grey ctermbg=black cterm=bold - hi StatuslineNC ctermfg=grey ctermbg=darkgrey cterm=NONE - hi VertSplit ctermfg=black ctermbg=black cterm=NONE - hi TabLine ctermfg=black ctermbg=grey cterm=reverse - hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE - hi TabLineSel ctermfg=black ctermbg=grey cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold - hi QuickFixLine ctermfg=grey ctermbg=darkblue cterm=bold + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE + hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold - hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi NonText ctermfg=black ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE + hi DiffChange ctermfg=black ctermbg=darkyellow cterm=NONE + hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE + hi DiffText ctermfg=black ctermbg=darkmagenta cterm=NONE + hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=grey ctermbg=black cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=NONE ctermbg=darkcyan cterm=NONE - hi PmenuKind ctermfg=darkred ctermbg=black cterm=NONE - hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE - hi PmenuExtra ctermfg=grey ctermbg=black cterm=NONE - hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi Error ctermfg=grey ctermbg=darkred cterm=NONE hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE + hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE + hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=black ctermbg=darkgreen cterm=reverse + hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold hi ModeMsg ctermfg=darkyellow ctermbg=black cterm=reverse hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi NonText ctermfg=black ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuBorder ctermfg=darkgrey ctermbg=grey cterm=NONE + 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=darkred cterm=reverse + hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold + hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse + hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE - hi Todo ctermfg=darkcyan ctermbg=black cterm=reverse - hi Search ctermfg=black ctermbg=darkyellow cterm=NONE - hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE - hi CurSearch ctermfg=black ctermbg=darkgreen cterm=NONE - hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold - hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse - hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse - hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold - hi VisualNOS 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 QuickFixLine ctermfg=grey ctermbg=darkmagenta cterm=bold + hi Removed ctermfg=red ctermbg=NONE cterm=NONE + hi Search ctermfg=black ctermbg=darkyellow cterm=reverse + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse,underline hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse,underline hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse,underline hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse,underline - hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE - hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE hi Statement ctermfg=black ctermbg=NONE cterm=bold + hi StatusLine ctermfg=grey ctermbg=black cterm=bold + hi StatusLineNC ctermfg=grey ctermbg=darkgrey cterm=NONE + hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi TabLine ctermfg=grey ctermbg=black cterm=NONE + hi TabLineFill ctermfg=black ctermbg=black cterm=NONE + hi TabLineSel ctermfg=black ctermbg=grey cterm=bold,reverse + hi Title ctermfg=black ctermbg=NONE cterm=bold + hi TitleBar ctermfg=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=white cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold + hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Title ctermfg=black ctermbg=NONE cterm=bold - hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold - hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE - hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE - hi DiffText ctermfg=grey ctermbg=black cterm=NONE - hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE + hi VertSplit ctermfg=black ctermbg=black cterm=NONE + hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse + hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE + hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE + hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold + hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse + hi dirFilterMenuBookmarkPath ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi dirFilterMenuHistoryPath ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi dirGroup ctermfg=grey ctermbg=NONE cterm=NONE + hi dirLink ctermfg=darkgreen ctermbg=NONE cterm=bold + hi dirOwner ctermfg=grey ctermbg=NONE cterm=NONE + hi dirPermissionGroup ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi dirPermissionOther ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi dirPermissionUser ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi dirSize ctermfg=darkred ctermbg=NONE cterm=NONE + hi dirSizeMod ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi dirTime ctermfg=grey ctermbg=NONE cterm=NONE + hi dirType ctermfg=darkcyan ctermbg=NONE cterm=NONE + finish + endif + + if s:t_Co >= 0 + hi CurSearch term=reverse + hi CursorIM term=NONE + hi CursorLineFold term=underline + hi CursorLineSign term=underline + 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 - 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 - finish endif -" Background: any -" Background: dark -" Color: color00 #000000 16 black -" Color: color08 #767676 243 darkgrey -" Color: color01 #AF5F5F 131 darkred -" Color: color09 #FF5F5F 203 red -" Color: color02 #5FAF5F 71 darkgreen -" Color: color10 #5FD75F 77 green -" Color: color03 #AF875F 137 darkyellow -" Color: color11 #FFD787 222 yellow -" Color: color04 #5F87AF 67 darkblue -" Color: color12 #5FAFFF 75 blue -" Color: color05 #D787D7 176 darkmagenta -" Color: color13 #FF87FF 213 magenta -" Color: color06 #5FAFAF 73 darkcyan -" Color: color14 #5FD7D7 116 cyan -" Color: color07 #C6C6C6 251 grey -" Color: color15 #FFFFFF 231 white -" Color: colorDimWhite #E4E4E4 254 grey -" Color: colorLine #262626 235 darkgrey -" Color: colorB #303030 236 darkgrey -" Color: colorNonT #585858 240 grey -" Color: colorTab #585858 240 grey -" Color: colorC #FFFFFF 231 white -" Color: colorlC #FF5FFF 207 magenta -" Color: colorV #005F87 24 darkblue -" Color: colorMP #ff00af 199 magenta -" Color: colorPMenuSel #4e4e4e 239 darkcyan -" Color: colorDim #878787 102 grey -" Color: diffAdd #875f87 96 darkmagenta -" Color: diffDelete #D78787 174 darkred -" Color: diffChange #5f5f5f 59 darkgreen -" Color: diffText #5f8787 66 cyan -" Color: fgDiffText #afffff 159 black -" Color: fgDiff #C6C6C6 251 white -" Term colors: color00 color01 color02 color03 color04 color05 color06 color07 -" Term colors: color08 color09 color10 color11 color12 color13 color14 color15 -" Background: light -" Color: color00 #000000 16 black -" Color: color08 #767676 243 darkgrey -" Color: color01 #AF0000 124 darkred -" Color: color09 #D70000 160 red -" Color: color02 #008700 28 darkgreen -" Color: color10 #87D787 114 green -" Color: color03 #AF5F00 130 darkyellow -" Color: color11 #FFD787 222 yellow -" Color: color04 #005FD7 26 darkblue -" Color: color12 #0087D7 32 blue -" Color: color05 #AF00AF 127 darkmagenta -" Color: color13 #FF00FF 133 magenta -" Color: color06 #005F5F 23 darkcyan -" Color: color14 #008787 30 cyan -" Color: color07 #808080 244 grey -" Color: color15 #FFFFFF 231 white -" Color: colorLine #EEEEEE 255 grey -" Color: colorB #E4E4E4 254 grey -" Color: colorNonT #9E9E9E 247 darkgrey -" Color: colorTab #BCBCBC 250 lightgrey -" Color: colorC #000000 16 black -" Color: colorlC #FF00FF 201 magenta -" Color: colorV #5F87AF 67 darkblue -" Color: colorMP #ff00af 199 magenta -" Color: colorPMenuSel #C6C6C6 251 darkcyan -" Color: colorDim #626262 241 darkgrey -" Color: diffAdd #D7AFD7 182 darkmagenta -" Color: diffDelete #870000 88 darkred -" Color: diffChange #D0D0D0 252 lightgray -" Color: diffText #5FD7D7 80 cyan -" Color: fgDiff #000000 16 black -" Term colors: color00 color01 color02 color03 color04 color05 color06 color07 -" Term colors: color08 color09 color10 color11 color12 color13 color14 color15 -" Background: any " vim: et ts=8 sw=2 sts=2 diff --git a/runtime/colors/morning.vim b/runtime/colors/morning.vim index 3cdf41614e..aee04b0326 100644 --- a/runtime/colors/morning.vim +++ b/runtime/colors/morning.vim @@ -2,412 +2,255 @@ " Description: Colorscheme with light grey background. " Author: Original author Bram Moolenaar " Maintainer: Original maintainer Bram Moolenaar -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = 'morning' -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 = ['#e4e4e4', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#bcbcbc', '#0000ff', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#000000'] -if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#e4e4e4', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#bcbcbc', '#0000ff', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#000000'] -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 StatuslineTerm Statusline -hi! link StatuslineTermNC StatuslineNC +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! link PopupSelected PmenuSel -hi Normal guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE -hi EndOfBuffer guifg=#0000ff guibg=#cccccc gui=bold cterm=bold -hi Folded guifg=#00008b guibg=#d3d3d3 gui=NONE cterm=NONE -hi CursorLine guifg=NONE guibg=#d3d3d3 gui=NONE cterm=NONE -hi CursorColumn guifg=NONE guibg=#d3d3d3 gui=NONE cterm=NONE -hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=bold -hi QuickFixLine guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi StatusLine guifg=#eeeeee guibg=#000000 gui=bold cterm=bold -hi StatusLineNC guifg=#bcbcbc guibg=#000000 gui=NONE cterm=NONE -hi VertSplit guifg=#bcbcbc guibg=#000000 gui=NONE cterm=NONE -hi Pmenu guifg=#000000 guibg=#b2b2b2 gui=NONE cterm=NONE -hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi PmenuSbar guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE -hi PmenuThumb guifg=NONE guibg=#000000 gui=NONE cterm=NONE -hi PmenuMatch guifg=#a52a2a guibg=#b2b2b2 gui=NONE cterm=NONE -hi PmenuMatchSel guifg=#a52a2a guibg=#ffff00 gui=NONE cterm=NONE -hi TabLine guifg=#000000 guibg=#bcbcbc gui=underline cterm=underline -hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse -hi TabLineSel guifg=#000000 guibg=#e4e4e4 gui=bold cterm=bold -hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi ToolbarButton guifg=NONE guibg=#bcbcbc gui=bold cterm=bold -hi NonText guifg=#0000ff guibg=#bcbcbc gui=bold cterm=bold -hi SpecialKey guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE -hi Visual guifg=NONE guibg=#d0d0d0 gui=NONE cterm=NONE -hi VisualNOS guifg=NONE guibg=#0000ff 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 SignColumn guifg=#00008b guibg=NONE gui=NONE cterm=NONE -hi Underlined guifg=#6a5acd guibg=NONE gui=underline cterm=underline -hi Error guifg=#ff0000 guibg=#e4e4e4 gui=reverse cterm=reverse -hi ErrorMsg guifg=#ff0000 guibg=#e4e4e4 gui=reverse cterm=reverse -hi WarningMsg guifg=#6a0dad guibg=NONE gui=bold cterm=bold -hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold -hi ModeMsg guifg=#000000 guibg=NONE gui=bold cterm=bold -hi Question guifg=#008787 guibg=NONE gui=bold cterm=bold -hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi MatchParen guifg=#e4e4e4 guibg=#6a5acd gui=NONE cterm=NONE -hi Search guifg=#e4e4e4 guibg=#6a0dad gui=NONE cterm=NONE -hi IncSearch guifg=#2e8b57 guibg=NONE gui=reverse cterm=reverse -hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold -hi ColorColumn guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE -hi Cursor guifg=#e4e4e4 guibg=#2e8b57 gui=NONE cterm=NONE -hi lCursor guifg=#e4e4e4 guibg=#a52a2a gui=NONE cterm=NONE -hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline -hi SpellCap guifg=#00d700 guibg=NONE guisp=#00d700 gui=undercurl cterm=underline -hi SpellLocal guifg=#a52a2a guibg=NONE guisp=#a52a2a gui=undercurl cterm=underline -hi SpellRare guifg=#2e8b57 guibg=NONE guisp=#2e8b57 gui=undercurl cterm=underline -hi Comment guifg=#0000ff guibg=NONE gui=NONE cterm=NONE -hi Constant guifg=#ff00ff guibg=#eeeeee gui=NONE cterm=NONE -hi Identifier guifg=#008787 guibg=NONE gui=NONE cterm=NONE -hi Statement guifg=#a52a2a guibg=NONE gui=bold cterm=bold -hi PreProc guifg=#6a0dad guibg=NONE gui=NONE cterm=NONE -hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold -hi Special guifg=#6a5acd guibg=NONE gui=NONE cterm=NONE -hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi Directory guifg=#008787 guibg=NONE gui=bold cterm=bold -hi Conceal guifg=#878787 guibg=NONE gui=NONE cterm=NONE -hi Title guifg=#a52a2a 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 StatusLineTerm Statusline +hi! link StatusLineTermNC StatuslineNC +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 StatuslineTerm Statusline - hi! link StatuslineTermNC StatuslineNC - hi! link MessageWindow Pmenu - hi! link PopupNotification Todo - hi! link PopupSelected PmenuSel - hi Normal ctermfg=16 ctermbg=254 cterm=NONE - hi EndOfBuffer ctermfg=21 ctermbg=252 cterm=bold - hi Folded ctermfg=18 ctermbg=252 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=252 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=252 cterm=NONE - hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=bold - hi QuickFixLine ctermfg=16 ctermbg=226 cterm=NONE - hi StatusLine ctermfg=255 ctermbg=16 cterm=bold - hi StatusLineNC ctermfg=250 ctermbg=16 cterm=NONE - hi VertSplit ctermfg=250 ctermbg=16 cterm=NONE - hi Pmenu ctermfg=16 ctermbg=249 cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=254 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=16 cterm=NONE - hi PmenuMatch ctermfg=124 ctermbg=249 cterm=NONE - hi PmenuMatchSel ctermfg=124 ctermbg=226 cterm=NONE - hi TabLine ctermfg=16 ctermbg=250 cterm=underline - hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse - hi TabLineSel ctermfg=16 ctermbg=254 cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=NONE ctermbg=250 cterm=bold - hi NonText ctermfg=21 ctermbg=250 cterm=bold - hi SpecialKey ctermfg=250 ctermbg=NONE cterm=NONE - hi Visual ctermfg=NONE ctermbg=252 cterm=NONE - hi VisualNOS ctermfg=NONE ctermbg=21 cterm=NONE - hi LineNr ctermfg=124 ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=18 ctermbg=NONE cterm=NONE - hi SignColumn ctermfg=18 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=62 ctermbg=NONE cterm=underline - hi Error ctermfg=196 ctermbg=254 cterm=reverse - hi ErrorMsg ctermfg=196 ctermbg=254 cterm=reverse - hi WarningMsg ctermfg=55 ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold - hi ModeMsg ctermfg=16 ctermbg=NONE cterm=bold - hi Question ctermfg=30 ctermbg=NONE cterm=bold - hi Todo ctermfg=16 ctermbg=226 cterm=NONE - hi MatchParen ctermfg=254 ctermbg=62 cterm=NONE - hi Search ctermfg=254 ctermbg=55 cterm=NONE - hi IncSearch ctermfg=29 ctermbg=NONE cterm=reverse - hi WildMenu ctermfg=16 ctermbg=226 cterm=bold - hi ColorColumn ctermfg=16 ctermbg=231 cterm=NONE - hi Cursor ctermfg=254 ctermbg=29 cterm=NONE - hi lCursor ctermfg=254 ctermbg=124 cterm=NONE - hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=40 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=124 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=29 ctermbg=NONE cterm=underline - hi Comment ctermfg=21 ctermbg=NONE cterm=NONE - hi Constant ctermfg=201 ctermbg=255 cterm=NONE - hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE - hi Statement ctermfg=124 ctermbg=NONE cterm=bold - hi PreProc ctermfg=55 ctermbg=NONE cterm=NONE - hi Type ctermfg=29 ctermbg=NONE cterm=bold - hi Special ctermfg=62 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Directory ctermfg=30 ctermbg=NONE cterm=bold - hi Conceal ctermfg=102 ctermbg=NONE cterm=NONE - hi Title ctermfg=124 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=#000000 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=NONE +hi ColorColumn guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=reverse +hi Comment guifg=#0000ff guibg=NONE guisp=NONE gui=NONE ctermfg=21 ctermbg=NONE cterm=NONE term=bold +hi Conceal guifg=#878787 guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=NONE +hi Constant guifg=#ff00ff guibg=#eeeeee guisp=NONE gui=NONE ctermfg=201 ctermbg=255 cterm=NONE term=NONE +hi Cursor guifg=#e4e4e4 guibg=#2e8b57 guisp=NONE gui=NONE ctermfg=254 ctermbg=29 cterm=NONE term=reverse +hi CursorColumn guifg=NONE guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=NONE ctermbg=252 cterm=NONE term=NONE +hi CursorLine guifg=NONE guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=NONE ctermbg=252 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=#008787 guibg=NONE guisp=NONE gui=bold ctermfg=30 ctermbg=NONE cterm=bold term=NONE +hi EndOfBuffer guifg=#0000ff guibg=#cccccc guisp=NONE gui=bold ctermfg=21 ctermbg=252 cterm=bold term=NONE +hi Error guifg=#ff0000 guibg=#e4e4e4 guisp=NONE gui=reverse ctermfg=196 ctermbg=254 cterm=reverse term=bold,reverse +hi ErrorMsg guifg=#ff0000 guibg=#e4e4e4 guisp=NONE gui=reverse ctermfg=196 ctermbg=254 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=#d3d3d3 guisp=NONE gui=NONE ctermfg=18 ctermbg=252 cterm=NONE term=NONE +hi Identifier guifg=#008787 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=#2e8b57 guibg=NONE guisp=NONE gui=reverse ctermfg=29 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=#e4e4e4 guibg=#6a5acd guisp=NONE gui=NONE ctermfg=254 ctermbg=62 cterm=NONE term=bold,underline +hi ModeMsg guifg=#000000 guibg=NONE guisp=NONE gui=bold ctermfg=16 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=#bcbcbc guisp=NONE gui=bold ctermfg=21 ctermbg=250 cterm=bold term=NONE +hi Pmenu guifg=#000000 guibg=#b2b2b2 guisp=NONE gui=NONE ctermfg=16 ctermbg=249 cterm=NONE term=reverse +hi PmenuMatch guifg=#a52a2a guibg=#b2b2b2 guisp=NONE gui=NONE ctermfg=124 ctermbg=249 cterm=NONE term=NONE +hi PmenuMatchSel guifg=#a52a2a guibg=#ffff00 guisp=NONE gui=NONE ctermfg=124 ctermbg=226 cterm=NONE term=NONE +hi PmenuSbar guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 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=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=NONE +hi PreProc guifg=#6a0dad guibg=NONE guisp=NONE gui=NONE ctermfg=55 ctermbg=NONE cterm=NONE term=NONE +hi Question guifg=#008787 guibg=NONE guisp=NONE gui=bold ctermfg=30 ctermbg=NONE cterm=bold term=standout +hi QuickFixLine guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=NONE +hi Search guifg=#e4e4e4 guibg=#6a0dad guisp=NONE gui=NONE ctermfg=254 ctermbg=55 cterm=NONE term=reverse +hi SignColumn guifg=#00008b guibg=NONE guisp=NONE gui=NONE ctermfg=18 ctermbg=NONE cterm=NONE term=reverse +hi Special guifg=#6a5acd guibg=NONE guisp=NONE gui=NONE ctermfg=62 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=#00d700 guibg=NONE guisp=#00d700 gui=undercurl ctermfg=40 ctermbg=NONE cterm=underline term=underline +hi SpellLocal guifg=#a52a2a guibg=NONE guisp=#a52a2a gui=undercurl ctermfg=124 ctermbg=NONE cterm=underline term=underline +hi SpellRare guifg=#2e8b57 guibg=NONE guisp=#2e8b57 gui=undercurl ctermfg=29 ctermbg=NONE cterm=underline term=underline +hi Statement guifg=#a52a2a guibg=NONE guisp=NONE gui=bold ctermfg=124 ctermbg=NONE cterm=bold term=NONE +hi StatusLine guifg=#eeeeee guibg=#000000 guisp=NONE gui=bold ctermfg=255 ctermbg=16 cterm=bold term=bold,reverse +hi StatusLineNC guifg=#bcbcbc guibg=#000000 guisp=NONE gui=NONE ctermfg=250 ctermbg=16 cterm=NONE term=bold,underline +hi TabLine guifg=#000000 guibg=#bcbcbc guisp=NONE gui=underline ctermfg=16 ctermbg=250 cterm=underline term=bold,underline +hi TabLineFill guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=NONE +hi TabLineSel guifg=#000000 guibg=#e4e4e4 guisp=NONE gui=bold ctermfg=16 ctermbg=254 cterm=bold term=bold,reverse +hi Title guifg=#a52a2a guibg=NONE guisp=NONE gui=bold ctermfg=124 ctermbg=NONE cterm=bold term=NONE +hi TitleBar guifg=#000000 guibg=#cccccc guisp=NONE gui=NONE ctermfg=16 ctermbg=250 cterm=NONE term=NONE +hi TitleBarNC guifg=#5f5f5f guibg=#bcbcbc guisp=NONE gui=NONE ctermfg=59 ctermbg=252 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=NONE guibg=#bcbcbc guisp=NONE gui=bold ctermfg=NONE ctermbg=250 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=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 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=#bcbcbc guibg=#000000 guisp=NONE gui=NONE ctermfg=250 ctermbg=16 cterm=NONE term=NONE +hi Visual guifg=NONE guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=NONE ctermbg=252 cterm=NONE term=reverse +hi VisualNOS guifg=NONE guibg=#0000ff guisp=NONE gui=NONE ctermfg=NONE ctermbg=21 cterm=NONE term=NONE +hi WarningMsg guifg=#6a0dad guibg=NONE guisp=NONE gui=bold ctermfg=55 ctermbg=NONE cterm=bold term=standout +hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=bold ctermfg=16 ctermbg=226 cterm=bold term=bold +hi lCursor guifg=#e4e4e4 guibg=#a52a2a guisp=NONE gui=NONE ctermfg=254 ctermbg=124 cterm=NONE term=NONE + +if s:tgc || s:t_Co >= 256 finish endif if s:t_Co >= 16 hi Normal ctermfg=black ctermbg=grey cterm=NONE - hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE - hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi ColorColumn ctermfg=black ctermbg=white cterm=NONE + hi Comment ctermfg=blue ctermbg=NONE cterm=NONE + hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE + hi Constant ctermfg=magenta ctermbg=white cterm=NONE + hi Cursor ctermfg=grey ctermbg=darkgreen cterm=NONE hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=darkred ctermbg=NONE cterm=underline - hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE - hi StatusLine ctermfg=white ctermbg=black cterm=bold - hi StatusLineNC ctermfg=darkgrey ctermbg=black cterm=NONE - hi VertSplit ctermfg=darkgrey ctermbg=black 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=darkcyan ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE + hi Error ctermfg=red ctermbg=grey cterm=reverse + hi ErrorMsg ctermfg=red ctermbg=grey cterm=reverse + hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkblue 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=darkred ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=grey ctermbg=darkblue cterm=NONE + hi ModeMsg ctermfg=black ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold + hi NonText ctermfg=blue ctermbg=white cterm=bold hi Pmenu ctermfg=black ctermbg=white cterm=NONE - hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE hi PmenuMatch ctermfg=black ctermbg=white cterm=bold hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE + hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE + hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi Question ctermfg=darkcyan ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE + hi Search ctermfg=grey ctermbg=darkmagenta cterm=NONE + hi SignColumn ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Special ctermfg=darkblue 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=darkred ctermbg=NONE cterm=underline + hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=underline + hi Statement ctermfg=darkred ctermbg=NONE cterm=bold + hi StatusLine ctermfg=white ctermbg=black cterm=bold + hi StatusLineNC ctermfg=darkgrey ctermbg=black cterm=NONE hi TabLine ctermfg=black ctermbg=white cterm=underline hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse hi TabLineSel ctermfg=black ctermbg=grey cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Title ctermfg=darkred ctermbg=NONE cterm=bold + hi TitleBar ctermfg=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgray ctermbg=white cterm=NONE + hi Todo ctermfg=black ctermbg=yellow cterm=NONE hi ToolbarButton ctermfg=NONE ctermbg=white cterm=bold - hi NonText ctermfg=blue ctermbg=white cterm=bold - hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold + hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline + hi VertSplit ctermfg=darkgrey ctermbg=black cterm=NONE hi Visual ctermfg=NONE ctermbg=white cterm=NONE hi VisualNOS ctermfg=NONE ctermbg=blue cterm=NONE - hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE - hi SignColumn ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline - hi Error ctermfg=red ctermbg=grey cterm=reverse - hi ErrorMsg ctermfg=red ctermbg=grey cterm=reverse hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold - hi ModeMsg ctermfg=black ctermbg=NONE cterm=bold - hi Question ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Todo ctermfg=black ctermbg=yellow cterm=NONE - hi MatchParen ctermfg=grey ctermbg=darkblue cterm=NONE - hi Search ctermfg=grey ctermbg=darkmagenta cterm=NONE - hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse hi WildMenu ctermfg=black ctermbg=yellow cterm=bold - hi ColorColumn ctermfg=black ctermbg=white cterm=NONE - hi Cursor ctermfg=grey ctermbg=darkgreen cterm=NONE hi lCursor ctermfg=grey ctermbg=darkred cterm=NONE - hi SpellBad ctermfg=red ctermbg=NONE cterm=underline - hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=darkred ctermbg=NONE cterm=underline - hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=underline - hi Comment ctermfg=blue ctermbg=NONE cterm=NONE - hi Constant ctermfg=magenta ctermbg=white cterm=NONE - hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkred ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold - hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Conceal ctermfg=gray ctermbg=NONE 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 finish endif if s:t_Co >= 8 hi Normal ctermfg=black ctermbg=gray cterm=NONE - hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi ColorColumn ctermfg=black 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=bold + hi Cursor ctermfg=grey ctermbg=darkgreen cterm=NONE hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold - hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE - hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse - hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse - hi VertSplit ctermfg=black ctermbg=gray cterm=reverse - 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=NONE cterm=reverse - 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=bold - hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=bold - 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 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=darkcyan ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE hi Error ctermfg=darkred ctermbg=gray cterm=reverse hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=reverse - hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkblue 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=gray ctermbg=darkblue 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=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=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=darkcyan ctermbg=NONE cterm=NONE - hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE - hi MatchParen ctermfg=gray ctermbg=darkblue cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE hi Search ctermfg=gray 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=darkblue ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=bold hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse - hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold - hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=bold - hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Statement ctermfg=darkred ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse + hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse + hi TabLine ctermfg=gray ctermbg=black cterm=NONE + hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse + hi TabLineSel ctermfg=black ctermbg=gray 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=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgray 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=darkgreen ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi VertSplit ctermfg=black ctermbg=gray 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 lCursor ctermfg=grey ctermbg=darkred 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 Function term=NONE + hi Number term=NONE + hi StatusLineTerm term=bold,reverse + hi StatusLineTermNC term=bold,underline + hi Terminal term=NONE finish endif -" Background: light -" Color: comment #0000ff 21 blue -" Color: constant #ff00ff 201 magenta -" Color: identifier #008787 30 darkcyan -" Color: statement #a52a2a 124 darkred -" Color: preproc #6a0dad 55 darkmagenta -" Color: type #2e8b57 29 darkgreen -" Color: special #6a5acd 62 darkblue -" Color: fg0 #000000 16 black -" Color: bg0 #e4e4e4 254 grey -" Color: bg1 #bcbcbc 250 white -" Color: status #bcbcbc 250 darkgrey -" Color: bg2 #eeeeee 255 white -" Color: endofbuffer #cccccc 252 darkgrey -" Color: visual #d0d0d0 252 white -" Color: folded #d3d3d3 252 darkgrey -" Color: folded_fg #00008b 18 darkblue -" Color: pmenu #b2b2b2 249 white -" Color: wildmenu #ffff00 226 yellow -" Color: error #ff0000 196 red -" Color: colorcolumn #ffffff 231 white -" Color: spellcap #00d700 40 green -" 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 -" 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 diff --git a/runtime/colors/murphy.vim b/runtime/colors/murphy.vim index 7ade6689a6..a5610fc584 100644 --- a/runtime/colors/murphy.vim +++ b/runtime/colors/murphy.vim @@ -2,408 +2,256 @@ " Description: Green foreground black background. " Author: Original author Ron Aaron . " Maintainer: Original maintainer Ron Aaron . -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = 'murphy' -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 = ['#303030', '#ffa700', '#005f00', '#ffd7af', '#87afff', '#ffafaf', '#00afaf', '#bcbcbc', '#444444', '#ff0000', '#00875f', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff'] -endif -hi! link Terminal Normal -hi! link LineNrAbove LineNr -hi! link LineNrBelow LineNr +let g:terminal_ansi_colors = ['#303030', '#ffa700', '#005f00', '#ffd7af', '#87afff', '#ffafaf', '#00afaf', '#bcbcbc', '#444444', '#ff0000', '#00875f', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff'] + +hi! link Added Constant hi! link CurSearch Search hi! link CursorLineFold CursorLine hi! link CursorLineSign CursorLine -hi! link StatusLineTerm StatusLine -hi! link StatusLineTermNC StatusLineNC +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! link PopupSelected PmenuSel -hi! link Added Constant -hi Normal guifg=#87ff87 guibg=#000000 gui=NONE cterm=NONE -hi EndOfBuffer guifg=#0000ff guibg=#000000 gui=NONE cterm=NONE -hi StatusLine guifg=#ffffff guibg=#00008b gui=NONE cterm=NONE -hi StatusLineNC guifg=#ffffff guibg=#3a3a3a gui=NONE cterm=NONE -hi VertSplit guifg=#ffffff guibg=#3a3a3a gui=NONE cterm=NONE -hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE -hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi PmenuSbar guifg=NONE guibg=#303030 gui=NONE cterm=NONE -hi PmenuThumb guifg=NONE guibg=#bcbcbc 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 TabLineFill guifg=NONE guibg=#303030 gui=NONE cterm=NONE -hi TabLine guifg=#87ff87 guibg=#444444 gui=NONE cterm=NONE -hi TabLineSel guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE -hi ToolbarLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE -hi ToolbarButton guifg=#ffffff guibg=#444444 gui=bold cterm=bold -hi NonText guifg=#00afaf guibg=NONE gui=NONE cterm=NONE -hi SpecialKey guifg=#00afaf guibg=NONE gui=NONE cterm=NONE -hi QuickFixLine guifg=#303030 guibg=#00afaf gui=NONE cterm=NONE -hi Folded guifg=#00afaf guibg=#303030 gui=NONE cterm=NONE -hi CursorLine guifg=NONE guibg=#444444 gui=NONE cterm=NONE -hi CursorColumn guifg=NONE guibg=#444444 gui=NONE cterm=NONE -hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold -hi ColorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE -hi Visual guifg=#ffffff guibg=#005f00 gui=NONE cterm=NONE -hi VisualNOS guifg=#ffffff guibg=#005f00 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=#00afaf 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=#87ff87 guibg=NONE gui=bold cterm=bold -hi WarningMsg guifg=#ffa700 guibg=NONE gui=bold cterm=bold -hi MoreMsg guifg=#005f00 guibg=NONE gui=bold cterm=bold -hi Question guifg=#00ffff guibg=NONE gui=bold cterm=bold -hi Todo guifg=#0000ff guibg=#ffff00 gui=NONE cterm=NONE -hi MatchParen guifg=#303030 guibg=#ffd7af gui=NONE cterm=NONE -hi Search guifg=#ffffff guibg=#0000ff gui=NONE cterm=NONE -hi IncSearch guifg=#ffa700 guibg=NONE gui=reverse cterm=reverse -hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi Cursor guifg=#000000 guibg=#87ff87 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=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline -hi SpellLocal guifg=#ffd7af guibg=NONE guisp=#ffd7af gui=undercurl cterm=underline -hi SpellRare guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl cterm=underline -hi Comment guifg=#ffa700 guibg=NONE gui=NONE cterm=NONE -hi Identifier guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi Statement guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE -hi Constant guifg=#ffffff guibg=NONE gui=NONE cterm=NONE -hi PreProc guifg=#ffd7af guibg=NONE gui=NONE cterm=NONE -hi Type guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE -hi Special guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE -hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi Conceal guifg=#bcbcbc 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 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 StatusLineTerm StatusLine +hi! link StatusLineTermNC StatusLineNC +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 StatusLineTerm StatusLine - hi! link StatusLineTermNC StatusLineNC - hi! link MessageWindow Pmenu - hi! link PopupNotification Todo - hi! link PopupSelected PmenuSel - hi! link Added Constant - hi Normal ctermfg=120 ctermbg=16 cterm=NONE - hi EndOfBuffer ctermfg=21 ctermbg=16 cterm=NONE - hi StatusLine ctermfg=231 ctermbg=18 cterm=NONE - hi StatusLineNC ctermfg=231 ctermbg=237 cterm=NONE - hi VertSplit ctermfg=231 ctermbg=237 cterm=NONE - hi Pmenu ctermfg=231 ctermbg=238 cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=236 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=250 cterm=NONE - hi PmenuMatch ctermfg=201 ctermbg=238 cterm=NONE - hi PmenuMatchSel ctermfg=201 ctermbg=226 cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=236 cterm=NONE - hi TabLine ctermfg=120 ctermbg=238 cterm=NONE - hi TabLineSel ctermfg=231 ctermbg=16 cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=236 cterm=NONE - hi ToolbarButton ctermfg=231 ctermbg=238 cterm=bold - hi NonText ctermfg=37 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=37 ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=236 ctermbg=37 cterm=NONE - hi Folded ctermfg=37 ctermbg=236 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=238 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=238 cterm=NONE - hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold - hi ColorColumn ctermfg=NONE ctermbg=235 cterm=NONE - hi Visual ctermfg=231 ctermbg=22 cterm=NONE - hi VisualNOS ctermfg=231 ctermbg=22 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=37 ctermbg=NONE cterm=underline - hi Error ctermfg=231 ctermbg=196 cterm=NONE - hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE - hi ModeMsg ctermfg=120 ctermbg=NONE cterm=bold - hi WarningMsg ctermfg=214 ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=22 ctermbg=NONE cterm=bold - hi Question ctermfg=51 ctermbg=NONE cterm=bold - hi Todo ctermfg=21 ctermbg=226 cterm=NONE - hi MatchParen ctermfg=236 ctermbg=223 cterm=NONE - hi Search ctermfg=231 ctermbg=21 cterm=NONE - hi IncSearch ctermfg=214 ctermbg=NONE cterm=reverse - hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE - hi Cursor ctermfg=16 ctermbg=120 cterm=NONE - hi lCursor ctermfg=16 ctermbg=196 cterm=NONE - hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=51 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=223 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=226 ctermbg=NONE cterm=underline - hi Comment ctermfg=214 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=51 ctermbg=NONE cterm=NONE - hi Statement ctermfg=226 ctermbg=NONE cterm=NONE - hi Constant ctermfg=231 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=223 ctermbg=NONE cterm=NONE - hi Type ctermfg=250 ctermbg=NONE cterm=NONE - hi Special ctermfg=201 ctermbg=NONE cterm=NONE - hi Directory ctermfg=51 ctermbg=NONE cterm=NONE - hi Conceal ctermfg=250 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Title ctermfg=201 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=#87ff87 guibg=#000000 guisp=NONE gui=NONE ctermfg=120 ctermbg=16 cterm=NONE term=NONE +hi ColorColumn guifg=NONE guibg=#262626 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=reverse +hi Comment guifg=#ffa700 guibg=NONE guisp=NONE gui=NONE ctermfg=214 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=#ffffff guibg=NONE guisp=NONE gui=NONE ctermfg=231 ctermbg=NONE cterm=NONE term=NONE +hi Cursor guifg=#000000 guibg=#87ff87 guisp=NONE gui=NONE ctermfg=16 ctermbg=120 cterm=NONE term=reverse +hi CursorColumn guifg=NONE guibg=#444444 guisp=NONE gui=NONE ctermfg=NONE ctermbg=238 cterm=NONE term=NONE +hi CursorLine guifg=NONE guibg=#444444 guisp=NONE gui=NONE ctermfg=NONE ctermbg=238 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=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE +hi EndOfBuffer guifg=#0000ff guibg=#000000 guisp=NONE gui=NONE 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=#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 Identifier guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 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=#ffa700 guibg=NONE guisp=NONE gui=reverse ctermfg=214 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=#303030 guibg=#ffd7af guisp=NONE gui=NONE ctermfg=236 ctermbg=223 cterm=NONE term=bold,underline +hi ModeMsg guifg=#87ff87 guibg=NONE guisp=NONE gui=bold ctermfg=120 ctermbg=NONE cterm=bold term=bold +hi MoreMsg guifg=#005f00 guibg=NONE guisp=NONE gui=bold ctermfg=22 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=#ffffff guibg=#444444 guisp=NONE gui=NONE ctermfg=231 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=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 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=#bcbcbc guisp=NONE gui=NONE ctermfg=NONE ctermbg=250 cterm=NONE term=NONE +hi PreProc guifg=#ffd7af guibg=NONE guisp=NONE gui=NONE ctermfg=223 ctermbg=NONE cterm=NONE term=NONE +hi Question guifg=#00ffff guibg=NONE guisp=NONE gui=bold ctermfg=51 ctermbg=NONE cterm=bold term=standout +hi QuickFixLine guifg=#303030 guibg=#00afaf guisp=NONE gui=NONE ctermfg=236 ctermbg=37 cterm=NONE term=NONE +hi Search guifg=#ffffff guibg=#0000ff guisp=NONE gui=NONE ctermfg=231 ctermbg=21 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=#ff00ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 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=#00ffff guibg=NONE guisp=#00ffff gui=undercurl ctermfg=51 ctermbg=NONE cterm=underline term=underline +hi SpellLocal guifg=#ffd7af guibg=NONE guisp=#ffd7af gui=undercurl ctermfg=223 ctermbg=NONE cterm=underline term=underline +hi SpellRare guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl ctermfg=226 ctermbg=NONE cterm=underline term=underline +hi Statement guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE +hi StatusLine guifg=#ffffff guibg=#00008b guisp=NONE gui=NONE ctermfg=231 ctermbg=18 cterm=NONE term=bold,reverse +hi StatusLineNC guifg=#ffffff guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=231 ctermbg=237 cterm=NONE term=bold,underline +hi TabLine guifg=#87ff87 guibg=#444444 guisp=NONE gui=NONE ctermfg=120 ctermbg=238 cterm=NONE term=bold,underline +hi TabLineFill guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=NONE +hi TabLineSel guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=bold,reverse +hi Title guifg=#ff00ff guibg=NONE guisp=NONE gui=bold ctermfg=201 ctermbg=NONE cterm=bold term=NONE +hi TitleBar guifg=#87ff87 guibg=#4c4c4c guisp=NONE gui=NONE ctermfg=120 ctermbg=237 cterm=NONE term=NONE +hi TitleBarNC guifg=#bcbcbc guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=250 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=#ffffff guibg=#444444 guisp=NONE gui=bold ctermfg=231 ctermbg=238 cterm=bold term=bold,reverse +hi ToolbarLine guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=reverse +hi Type guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=NONE +hi Underlined guifg=#00afaf guibg=NONE guisp=NONE gui=underline ctermfg=37 ctermbg=NONE cterm=underline term=underline +hi VertSplit guifg=#ffffff guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=231 ctermbg=237 cterm=NONE term=NONE +hi Visual guifg=#ffffff guibg=#005f00 guisp=NONE gui=NONE ctermfg=231 ctermbg=22 cterm=NONE term=reverse +hi VisualNOS guifg=#ffffff guibg=#005f00 guisp=NONE gui=NONE ctermfg=231 ctermbg=22 cterm=NONE term=NONE +hi WarningMsg guifg=#ffa700 guibg=NONE guisp=NONE gui=bold ctermfg=214 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=green ctermbg=black cterm=NONE - hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE - hi StatusLine ctermfg=white ctermbg=darkblue cterm=NONE - hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=NONE - hi VertSplit ctermfg=white ctermbg=darkgrey 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 TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE - hi TabLine ctermfg=green ctermbg=darkgrey cterm=NONE - hi TabLineSel ctermfg=white ctermbg=black cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE - hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold - hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE - hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi ColorColumn ctermfg=green ctermbg=darkgrey cterm=NONE + hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE + hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE + hi Constant ctermfg=white ctermbg=NONE cterm=NONE + hi Cursor ctermfg=black ctermbg=green 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 ColorColumn ctermfg=green ctermbg=darkgrey cterm=NONE - hi Visual ctermfg=white ctermbg=darkgreen cterm=NONE - hi VisualNOS ctermfg=white ctermbg=darkgreen 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=darkcyan 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=blue ctermbg=black cterm=NONE hi Error ctermfg=white ctermbg=red cterm=NONE hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE + hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=darkred ctermbg=NONE cterm=reverse + hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE hi ModeMsg ctermfg=green ctermbg=NONE cterm=bold - hi WarningMsg ctermfg=darkred 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=darkmagenta ctermbg=NONE cterm=NONE hi Question ctermfg=cyan ctermbg=NONE cterm=bold - hi Todo ctermfg=blue ctermbg=yellow cterm=NONE - hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE hi Search ctermfg=white ctermbg=blue cterm=NONE - hi IncSearch ctermfg=darkred ctermbg=NONE cterm=reverse - hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE - hi Cursor ctermfg=black ctermbg=green cterm=NONE - hi lCursor ctermfg=black ctermbg=red cterm=NONE + hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Special ctermfg=magenta ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE hi SpellBad ctermfg=red ctermbg=NONE cterm=underline hi SpellCap ctermfg=cyan ctermbg=NONE cterm=underline hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=underline hi SpellRare ctermfg=yellow ctermbg=NONE cterm=underline - hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE - hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE - hi Constant ctermfg=white ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Type ctermfg=grey ctermbg=NONE cterm=NONE - hi Special ctermfg=magenta 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=white ctermbg=darkblue cterm=NONE + hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=NONE + hi TabLine ctermfg=green ctermbg=darkgrey cterm=NONE + hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE + hi TabLineSel ctermfg=white ctermbg=black cterm=NONE hi Title ctermfg=magenta 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=green ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=grey ctermbg=black cterm=NONE + hi Todo ctermfg=blue ctermbg=yellow cterm=NONE + hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE + hi Type ctermfg=grey ctermbg=NONE cterm=NONE + hi Underlined ctermfg=darkcyan ctermbg=NONE cterm=underline + hi VertSplit ctermfg=white ctermbg=darkgrey cterm=NONE + hi Visual ctermfg=white ctermbg=darkgreen cterm=NONE + hi VisualNOS ctermfg=white ctermbg=darkgreen cterm=NONE + hi WarningMsg ctermfg=darkred 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=darkgreen ctermbg=black cterm=NONE - hi EndOfBuffer ctermfg=darkblue 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 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 TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE - hi TabLine ctermfg=grey ctermbg=black cterm=reverse - hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE - hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse - hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE - hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE + hi Comment ctermfg=darkred ctermbg=NONE cterm=bold + hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE + hi Constant ctermfg=grey ctermbg=NONE cterm=bold + hi Cursor ctermfg=black ctermbg=green 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 ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse - hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=reverse,underline - 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 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=bold 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 Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=darkred ctermbg=NONE cterm=reverse + hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE hi ModeMsg ctermfg=grey ctermbg=NONE cterm=bold - hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold + hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE + 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=darkmagenta ctermbg=NONE cterm=bold hi Question ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE - hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE hi Search ctermfg=grey ctermbg=darkblue cterm=NONE - hi IncSearch ctermfg=darkred ctermbg=NONE cterm=reverse - hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE + hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse - hi Comment ctermfg=darkred ctermbg=NONE cterm=bold - hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Statement ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Constant ctermfg=grey ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold - hi Type ctermfg=grey ctermbg=NONE cterm=NONE - hi Special ctermfg=darkmagenta 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=darkblue ctermbg=grey cterm=bold,reverse + hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse + hi TabLine ctermfg=grey ctermbg=black cterm=reverse + 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=green 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=grey ctermbg=NONE cterm=NONE + 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=reverse,underline + hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold + 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 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: foreground #87FF87 120 green -" Color: background #000000 16 black -" Color: color00 #303030 236 black -" Color: color08 #444444 238 darkgrey -" Color: color01 #FFA700 214 darkred -" Color: color09 #FF0000 196 red -" Color: color02 #005F00 22 darkgreen -" Color: color10 #00875F 29 green -" Color: color03 #FFD7AF 223 darkyellow -" Color: color11 #FFFF00 226 yellow -" Color: color04 #00008B 18 darkblue -" Color: color12 #0000FF 21 blue -" Color: color05 #FFAFAF 217 darkmagenta -" Color: color13 #FF00FF 201 magenta -" Color: color06 #00AFAF 37 darkcyan -" Color: color14 #00FFFF 51 cyan -" Color: color07 #BCBCBC 250 grey -" Color: color15 #FFFFFF 231 white -" Color: color16 #262626 235 black -" Color: color17 #3A3A3A 237 darkgrey -" Color: color04t #87AFFF 111 darkblue -" Color: color12t #005FFF 27 blue -" Term colors: color00 color01 color02 color03 color04t color05 color06 color07 -" Term colors: color08 color09 color10 color11 color12t 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 diff --git a/runtime/colors/pablo.vim b/runtime/colors/pablo.vim index 777698df69..8829c0700d 100644 --- a/runtime/colors/pablo.vim +++ b/runtime/colors/pablo.vim @@ -1,440 +1,259 @@ " Name: pablo " Author: Ron Aaron " Maintainer: Original maintainerRon Aaron -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = 'pablo' -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! link Terminal Normal -hi! link StatusLineTerm StatusLine -hi! link StatusLineTermNC StatusLineNC hi! link CurSearch Search hi! link CursorLineFold CursorLine hi! link CursorLineSign CursorLine -hi! link MessageWindow Pmenu -hi! link PopupNotification Todo -hi! link PopupSelected PmenuSel -hi Normal guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE -hi Comment guifg=#808080 guibg=NONE gui=NONE cterm=NONE -hi Constant guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi Identifier guifg=#00c0c0 guibg=NONE gui=NONE cterm=NONE -hi Statement guifg=#c0c000 guibg=NONE gui=bold cterm=bold -hi PreProc guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE -hi Type guifg=#00c000 guibg=NONE gui=NONE cterm=NONE -hi Special guifg=#0000ff guibg=NONE gui=NONE cterm=NONE -hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline -hi Ignore guifg=#000000 guibg=#000000 gui=NONE cterm=NONE -hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE -hi Todo guifg=#000000 guibg=#c0c000 gui=NONE cterm=NONE -hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE -hi Cursor guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE -hi lCursor guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE -hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE -hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold -hi Directory guifg=#00c000 guibg=NONE gui=NONE cterm=NONE -hi Search guifg=#000000 guibg=#c0c000 gui=NONE cterm=NONE -hi IncSearch guifg=#ffffff guibg=NONE gui=reverse cterm=reverse -hi NonText guifg=#0000ff guibg=NONE gui=bold cterm=bold -hi EndOfBuffer guifg=#0000ff guibg=NONE gui=bold cterm=bold -hi ErrorMsg guifg=#ffffff guibg=#cd0000 gui=NONE cterm=NONE -hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE -hi SignColumn guifg=#00ffff guibg=#a9a9a9 gui=NONE cterm=NONE -hi ColorColumn guifg=NONE guibg=#4d4d4d gui=NONE cterm=NONE -hi FoldColumn guifg=#7f7f7f guibg=#303030 gui=NONE cterm=NONE -hi Folded guifg=#7f7f7f guibg=#303030 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=#3a3a3a gui=bold cterm=bold -hi Visual guifg=#00008b guibg=#a9a9a9 gui=NONE cterm=NONE -hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline -hi LineNr guifg=#7f7f7f guibg=NONE gui=NONE cterm=NONE +hi! link Float Number +hi! link Function Identifier hi! link LineNrAbove LineNr hi! link LineNrBelow LineNr -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=#5c5cff guibg=NONE gui=bold cterm=bold -hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold -hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi QuickFixLine guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE -hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline -hi SpellCap guifg=#5c5cff guibg=NONE guisp=#5c5cff gui=undercurl cterm=underline -hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline -hi SpellRare guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl cterm=underline -hi StatusLine guifg=#ffff00 guibg=#0000ee gui=NONE cterm=NONE -hi StatusLineNC guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE -hi VertSplit guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE -hi TabLine guifg=#ffffff guibg=#7f7f7f gui=NONE cterm=NONE -hi TabLineFill guifg=NONE guibg=#000000 gui=reverse cterm=reverse -hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold -hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE -hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold -hi PmenuMatch guifg=#ff00ff guibg=#303030 gui=NONE cterm=NONE -hi PmenuMatchSel guifg=#ff00ff guibg=#e5e5e5 gui=NONE cterm=NONE -hi Pmenu guifg=fg guibg=#303030 gui=NONE cterm=NONE -hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi PmenuSel guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE -hi PmenuThumb guifg=NONE guibg=#ffffff 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 MessageWindow Pmenu +hi! link Number Constant +hi! link PopupNotification Todo +hi! link StatusLineTerm StatusLine +hi! link StatusLineTermNC StatusLineNC +hi! link TabPanel Normal +hi! link TabPanelFill EndOfBuffer +hi! link Terminal Normal -if s:t_Co >= 256 - hi! link Terminal Normal - hi! link StatusLineTerm StatusLine - hi! link StatusLineTermNC StatusLineNC - hi! link CurSearch Search - hi! link CursorLineFold CursorLine - hi! link CursorLineSign CursorLine - hi! link MessageWindow Pmenu - hi! link PopupNotification Todo - hi! link PopupSelected PmenuSel - hi Normal ctermfg=231 ctermbg=16 cterm=NONE - hi Comment ctermfg=244 ctermbg=NONE cterm=NONE - hi Constant ctermfg=51 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=37 ctermbg=NONE cterm=NONE - hi Statement ctermfg=142 ctermbg=NONE cterm=bold - hi PreProc ctermfg=46 ctermbg=NONE cterm=NONE - hi Type ctermfg=34 ctermbg=NONE cterm=NONE - hi Special ctermfg=21 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=111 ctermbg=NONE cterm=underline - hi Ignore ctermfg=16 ctermbg=16 cterm=NONE - hi Error ctermfg=231 ctermbg=196 cterm=NONE - hi Todo ctermfg=16 ctermbg=142 cterm=NONE - hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE - hi Cursor ctermfg=16 ctermbg=231 cterm=NONE - hi lCursor ctermfg=16 ctermbg=231 cterm=NONE - hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE - hi Title ctermfg=225 ctermbg=NONE cterm=bold - hi Directory ctermfg=34 ctermbg=NONE cterm=NONE - hi Search ctermfg=16 ctermbg=142 cterm=NONE - hi IncSearch ctermfg=231 ctermbg=NONE cterm=reverse - hi NonText ctermfg=63 ctermbg=NONE cterm=bold - hi EndOfBuffer ctermfg=63 ctermbg=NONE cterm=bold - hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE - hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE - hi SignColumn ctermfg=51 ctermbg=248 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=239 cterm=NONE - hi FoldColumn ctermfg=102 ctermbg=236 cterm=NONE - hi Folded ctermfg=102 ctermbg=236 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE - hi CursorLineNr ctermfg=226 ctermbg=237 cterm=bold - hi Visual ctermfg=20 ctermbg=248 cterm=NONE - hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline - hi LineNr ctermfg=102 ctermbg=NONE cterm=NONE - hi! link LineNrAbove LineNr - hi! link LineNrBelow LineNr - hi MatchParen ctermfg=NONE ctermbg=44 cterm=NONE - hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=63 ctermbg=NONE cterm=bold - hi Question ctermfg=121 ctermbg=NONE cterm=bold - hi SpecialKey ctermfg=81 ctermbg=NONE cterm=NONE - hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE - hi QuickFixLine ctermfg=16 ctermbg=44 cterm=NONE - hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=63 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=201 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=226 ctermbg=NONE cterm=underline - hi StatusLine ctermfg=226 ctermbg=20 cterm=NONE - hi StatusLineNC ctermfg=16 ctermbg=231 cterm=NONE - hi VertSplit ctermfg=16 ctermbg=231 cterm=NONE - hi TabLine ctermfg=231 ctermbg=102 cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=16 cterm=reverse - hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE - hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold - hi PmenuMatch ctermfg=201 ctermbg=236 cterm=NONE - hi PmenuMatchSel ctermfg=201 ctermbg=254 cterm=NONE - hi Pmenu ctermfg=fg ctermbg=236 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=254 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=231 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=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=NONE +hi ColorColumn guifg=NONE guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=NONE ctermbg=239 cterm=NONE term=reverse +hi Comment guifg=#808080 guibg=NONE guisp=NONE gui=NONE ctermfg=244 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=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE +hi Cursor guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 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=#3a3a3a guisp=NONE gui=bold ctermfg=226 ctermbg=237 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=#00c000 guibg=NONE guisp=NONE gui=NONE ctermfg=34 ctermbg=NONE cterm=NONE term=NONE +hi EndOfBuffer guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=63 ctermbg=NONE cterm=bold 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=#7f7f7f guibg=#303030 guisp=NONE gui=NONE ctermfg=102 ctermbg=236 cterm=NONE term=NONE +hi Folded guifg=#7f7f7f guibg=#303030 guisp=NONE gui=NONE ctermfg=102 ctermbg=236 cterm=NONE term=NONE +hi Identifier guifg=#00c0c0 guibg=NONE guisp=NONE gui=NONE ctermfg=37 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=#ffffff guibg=NONE guisp=NONE gui=reverse ctermfg=231 ctermbg=NONE cterm=reverse term=bold,reverse,underline +hi LineNr guifg=#7f7f7f guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=NONE +hi MatchParen guifg=NONE guibg=#008b8b guisp=NONE gui=NONE ctermfg=NONE ctermbg=44 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=#5c5cff guibg=NONE guisp=NONE gui=bold ctermfg=63 ctermbg=NONE cterm=bold term=NONE +hi NonText guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=63 ctermbg=NONE cterm=bold term=NONE +hi Pmenu guifg=fg guibg=#303030 guisp=NONE gui=NONE ctermfg=fg ctermbg=236 cterm=NONE term=reverse +hi PmenuMatch guifg=#ff00ff guibg=#303030 guisp=NONE gui=NONE ctermfg=201 ctermbg=236 cterm=NONE term=NONE +hi PmenuMatchSel guifg=#ff00ff guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=201 ctermbg=254 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=#e5e5e5 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 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=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=NONE +hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=bold ctermfg=121 ctermbg=NONE cterm=bold term=standout +hi QuickFixLine guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=NONE +hi Search guifg=#000000 guibg=#c0c000 guisp=NONE gui=NONE ctermfg=16 ctermbg=142 cterm=NONE term=reverse +hi SignColumn guifg=#00ffff guibg=#a9a9a9 guisp=NONE gui=NONE ctermfg=51 ctermbg=248 cterm=NONE term=reverse +hi Special guifg=#0000ff guibg=NONE guisp=NONE gui=NONE ctermfg=21 ctermbg=NONE cterm=NONE term=NONE +hi SpecialKey guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=81 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=#5c5cff guibg=NONE guisp=#5c5cff gui=undercurl ctermfg=63 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=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl ctermfg=226 ctermbg=NONE cterm=underline term=underline +hi Statement guifg=#c0c000 guibg=NONE guisp=NONE gui=bold ctermfg=142 ctermbg=NONE cterm=bold term=NONE +hi StatusLine guifg=#ffff00 guibg=#0000ee guisp=NONE gui=NONE ctermfg=226 ctermbg=20 cterm=NONE term=bold,reverse +hi StatusLineNC guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=bold,underline +hi TabLine guifg=#ffffff guibg=#7f7f7f guisp=NONE gui=NONE ctermfg=231 ctermbg=102 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=#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=225 ctermbg=NONE cterm=bold term=NONE +hi TitleBar guifg=#ffffff guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=231 ctermbg=237 cterm=NONE term=NONE +hi TitleBarNC guifg=#e5e5e5 guibg=#2c2c2c guisp=NONE gui=NONE ctermfg=254 ctermbg=236 cterm=NONE term=NONE +hi Todo guifg=#000000 guibg=#c0c000 guisp=NONE gui=NONE ctermfg=16 ctermbg=142 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=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse +hi Type guifg=#00c000 guibg=NONE guisp=NONE gui=NONE ctermfg=34 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=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE +hi Visual guifg=#00008b guibg=#a9a9a9 guisp=NONE gui=NONE ctermfg=20 ctermbg=248 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 +hi lCursor guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 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 ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold - hi PreProc ctermfg=green ctermbg=NONE cterm=NONE - hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Special ctermfg=blue ctermbg=NONE cterm=NONE - hi Underlined ctermfg=darkgreen ctermbg=NONE cterm=underline - hi Ignore ctermfg=black ctermbg=black cterm=NONE - hi Error ctermfg=white ctermbg=red cterm=NONE - hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE hi Cursor ctermfg=black ctermbg=white cterm=NONE - hi lCursor ctermfg=black ctermbg=white cterm=NONE + hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE - hi Title ctermfg=magenta ctermbg=NONE cterm=bold + 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=darkgreen ctermbg=NONE cterm=NONE - hi Search ctermfg=black ctermbg=darkyellow cterm=NONE - hi IncSearch ctermfg=white ctermbg=NONE cterm=reverse - hi NonText ctermfg=blue ctermbg=NONE cterm=bold hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=bold + hi Error ctermfg=white ctermbg=red cterm=NONE hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE - hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE - hi SignColumn ctermfg=cyan ctermbg=black cterm=NONE - hi ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi Folded ctermfg=blue ctermbg=NONE 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 Visual ctermfg=darkblue ctermbg=grey cterm=NONE - hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline + hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=black ctermbg=black cterm=NONE + hi IncSearch ctermfg=white ctermbg=NONE cterm=reverse hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi! link LineNrAbove LineNr - hi! link LineNrBelow LineNr hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg ctermfg=blue ctermbg=NONE cterm=bold + hi NonText ctermfg=blue ctermbg=NONE cterm=bold + hi Pmenu ctermfg=fg ctermbg=darkgrey cterm=NONE + hi PmenuMatch ctermfg=fg ctermbg=darkgrey cterm=bold + hi PmenuMatchSel ctermfg=black ctermbg=grey cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=black ctermbg=grey 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=bold - hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE - hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE + hi Search ctermfg=black ctermbg=darkyellow cterm=NONE + hi SignColumn ctermfg=cyan ctermbg=black cterm=NONE + hi Special ctermfg=blue ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=cyan 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=yellow ctermbg=NONE cterm=underline + hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold hi StatusLine ctermfg=yellow ctermbg=darkblue cterm=NONE hi StatusLineNC ctermfg=black ctermbg=white cterm=NONE - hi VertSplit ctermfg=black ctermbg=white cterm=NONE hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE hi TabLineFill ctermfg=NONE ctermbg=black cterm=reverse hi TabLineSel ctermfg=white ctermbg=black cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE + hi Title ctermfg=magenta ctermbg=NONE cterm=bold + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=grey ctermbg=black cterm=NONE + hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold - hi PmenuMatch ctermfg=fg ctermbg=darkgrey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=grey cterm=bold - hi Pmenu ctermfg=fg ctermbg=darkgrey cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=black ctermbg=grey cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=white 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 ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE + hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Underlined ctermfg=darkgreen ctermbg=NONE cterm=underline + hi VertSplit ctermfg=black ctermbg=white cterm=NONE + hi Visual ctermfg=darkblue ctermbg=grey 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 lCursor ctermfg=black ctermbg=white 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=darkblue ctermbg=grey cterm=reverse - hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse - hi StatusLineTerm ctermfg=darkblue ctermbg=grey cterm=reverse - hi StatusLineTermNC ctermfg=grey 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 ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi Comment ctermfg=grey ctermbg=NONE cterm=bold + hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold + hi Cursor ctermfg=black ctermbg=white 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=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 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=darkgreen ctermbg=NONE cterm=bold + 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 FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE + hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=black ctermbg=darkcyan 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 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=darkgreen ctermbg=NONE cterm=NONE hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE - hi MatchParen ctermfg=black ctermbg=darkcyan cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE hi Search ctermfg=black ctermbg=darkyellow cterm=NONE - hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE - hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE + hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Special ctermfg=darkblue 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=grey ctermbg=NONE cterm=bold - hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=darkblue ctermbg=grey cterm=reverse + hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse + hi StatusLineTerm ctermfg=darkblue ctermbg=grey cterm=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=darkmagenta ctermbg=NONE cterm=bold + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=grey ctermbg=black cterm=NONE + hi Todo ctermfg=black 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 Special ctermfg=darkblue ctermbg=NONE cterm=NONE hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=grey ctermbg=darkred cterm=NONE - hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE - hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold - hi Conceal ctermfg=grey 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 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=white 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 #000000 16 black -" Color: color08 #7f7f7f 102 darkgrey -" Color: color01 #cd0000 160 darkred -" Color: color09 #ff0000 196 red -" Color: color02 #00cd00 40 darkgreen -" Color: color10 #00ff00 46 green -" Color: color03 #cdcd00 184 darkyellow -" Color: color11 #ffff00 226 yellow -" Color: color04 #0000ee 20 darkblue -" Color: color12 #5c5cff 63 blue -" Color: color05 #cd00cd 164 darkmagenta -" Color: color13 #ff00ff 201 magenta -" Color: color06 #00cdcd 44 darkcyan -" Color: color14 #00ffff 51 cyan -" Color: color07 #e5e5e5 254 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: rgbGrey30 #4d4d4d 239 darkgrey -" Color: rgbGrey40 #666666 241 darkgrey -" Color: rgbDarkGrey #a9a9a9 248 grey -" Color: rgbDarkBlue #00008b 20 darkblue -" Color: rgbDarkMagenta #8b008b 164 darkmagenta -" Color: rgbBlue #0000ff 63 blue -" Color: rgbDarkCyan #008b8b 44 darkcyan -" Color: rgbSeaGreen #2e8b57 121 darkgreen -" Color: rgbGrey #bebebe 248 grey -" Color: Question #00ff00 121 green -" Color: SignColumn #a9a9a9 248 black -" Color: SpecialKey #00ffff 81 cyan -" Color: StatusLineTerm #90ee90 121 darkgreen -" Color: Title #ff00ff 225 magenta -" Color: WarningMsg #ff0000 196 red -" Color: ToolbarLine #7f7f7f 242 darkgrey -" Color: ToolbarButton #d3d3d3 254 grey -" Color: Underlined #80a0ff 111 darkgreen -" Color: Comment #808080 244 darkgrey -" Color: Constant #00ffff 51 cyan -" Color: Special #0000ff 21 blue -" Color: Identifier #00c0c0 37 darkcyan -" Color: Search #c0c000 142 darkyellow -" Color: Statement #c0c000 142 darkyellow -" Color: Todo #c0c000 142 darkyellow -" Color: PreProc #00ff00 46 green -" Color: Type #00c000 34 darkgreen -" Color: Directory #00c000 34 darkgreen -" Color: Pmenu #303030 236 darkgrey -" Color: Folded #303030 236 darkgrey -" Color: Cursorline #3a3a3a 237 darkgrey -" 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 diff --git a/runtime/colors/peachpuff.vim b/runtime/colors/peachpuff.vim index f08a93ba88..12654db633 100644 --- a/runtime/colors/peachpuff.vim +++ b/runtime/colors/peachpuff.vim @@ -2,417 +2,257 @@ " Description: This color scheme uses a peachpuff background (what you've expected when it's " called peachpuff?). " Author: Original author David Ne\v{c}as (Yeti) " Maintainer: Original maintainer David Ne\v{c}as (Yeti) -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = 'peachpuff' -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 = ['#ffdab9', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#737373', '#406090', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#000000'] -if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#ffdab9', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#737373', '#406090', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#000000'] -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 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! link PopupSelected PmenuSel -hi Normal guifg=#000000 guibg=#ffdab9 gui=NONE cterm=NONE -hi Folded guifg=#000000 guibg=#e3c1a5 gui=NONE cterm=NONE -hi CursorLine guifg=NONE guibg=#f5c195 gui=NONE cterm=NONE -hi CursorColumn guifg=NONE guibg=#f5c195 gui=NONE cterm=NONE -hi CursorLineNr guifg=#cd0000 guibg=NONE gui=bold cterm=bold -hi QuickFixLine guifg=#000000 guibg=#ffaf87 gui=NONE cterm=NONE -hi EndOfBuffer guifg=#737373 guibg=NONE gui=NONE cterm=NONE -hi StatusLine guifg=#ffffff guibg=#000000 gui=bold cterm=bold -hi StatusLineNC guifg=#ffdab9 guibg=#737373 gui=bold cterm=bold -hi StatusLineTerm guifg=#ffffff guibg=#2e8b57 gui=bold cterm=bold -hi StatusLineTermNC guifg=#ffdab9 guibg=#008b8b gui=bold cterm=bold -hi VertSplit guifg=#ffdab9 guibg=#737373 gui=NONE cterm=NONE -hi Pmenu guifg=#000000 guibg=#ffaf87 gui=NONE cterm=NONE -hi PmenuSbar guifg=NONE guibg=#ffdab9 gui=NONE cterm=NONE -hi PmenuThumb guifg=NONE guibg=#737373 gui=NONE cterm=NONE -hi PmenuSel guifg=#000000 guibg=#f5c195 gui=bold cterm=bold -hi PmenuMatch guifg=#a52a2a guibg=#ffaf87 gui=NONE cterm=NONE -hi PmenuMatchSel guifg=#a52a2a guibg=#f5c195 gui=bold cterm=bold -hi TabLine guifg=#ffdab9 guibg=#737373 gui=underline cterm=underline -hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse -hi TabLineSel guifg=#000000 guibg=#ffdab9 gui=bold cterm=bold -hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi ToolbarButton guifg=#ffdab9 guibg=#737373 gui=bold cterm=bold -hi NonText guifg=#737373 guibg=NONE gui=NONE cterm=NONE -hi SpecialKey guifg=#737373 guibg=NONE gui=NONE cterm=NONE -hi Visual guifg=#000000 guibg=#cccccc gui=NONE cterm=NONE -hi VisualNOS guifg=NONE guibg=#406090 gui=NONE cterm=NONE -hi LineNr guifg=#cd0000 guibg=NONE gui=NONE cterm=NONE -hi FoldColumn guifg=#406090 guibg=NONE 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=bold,reverse cterm=bold,reverse -hi ErrorMsg guifg=#ff0000 guibg=#ffffff gui=bold,reverse cterm=bold,reverse -hi WarningMsg guifg=#cd00cd guibg=#ffdab9 gui=bold cterm=bold -hi MoreMsg guifg=#2e8b57 guibg=#ffdab9 gui=bold cterm=bold -hi ModeMsg guifg=#000000 guibg=#ffdab9 gui=bold cterm=bold -hi Question guifg=#c00058 guibg=NONE gui=bold cterm=bold -hi Todo guifg=#6a5acd guibg=#ffff00 gui=NONE cterm=NONE -hi MatchParen guifg=#ffdab9 guibg=#6a5acd gui=NONE cterm=NONE -hi Search guifg=#ffdab9 guibg=#cd00cd gui=NONE cterm=NONE -hi IncSearch guifg=#2e8b57 guibg=NONE gui=reverse cterm=reverse -hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold -hi ColorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE -hi Cursor guifg=#ffdab9 guibg=#000000 gui=NONE cterm=NONE -hi lCursor guifg=#000000 guibg=#c00058 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=#cd00cd guibg=NONE guisp=#cd00cd gui=undercurl cterm=underline -hi SpellRare guifg=#6a5acd guibg=NONE guisp=#6a5acd gui=undercurl cterm=underline -hi Comment guifg=#406090 guibg=NONE gui=NONE cterm=NONE -hi Constant guifg=#c00058 guibg=NONE gui=NONE cterm=NONE -hi Identifier guifg=#008b8b guibg=NONE gui=NONE cterm=NONE -hi Statement guifg=#a52a2a guibg=NONE gui=bold cterm=bold -hi PreProc guifg=#cd00cd guibg=NONE gui=NONE cterm=NONE -hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold -hi Special guifg=#6a5acd guibg=NONE gui=NONE cterm=NONE -hi Directory guifg=#008b8b guibg=NONE gui=bold cterm=bold -hi Conceal guifg=#737373 guibg=NONE gui=NONE cterm=NONE -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 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 MessageWindow Pmenu - hi! link PopupNotification Todo - hi! link PopupSelected PmenuSel - hi Normal ctermfg=16 ctermbg=223 cterm=NONE - hi Folded ctermfg=16 ctermbg=252 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=180 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=180 cterm=NONE - hi CursorLineNr ctermfg=160 ctermbg=NONE cterm=bold - hi QuickFixLine ctermfg=16 ctermbg=216 cterm=NONE - hi EndOfBuffer ctermfg=243 ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=231 ctermbg=16 cterm=bold - hi StatusLineNC ctermfg=223 ctermbg=243 cterm=bold - hi StatusLineTerm ctermfg=231 ctermbg=29 cterm=bold - hi StatusLineTermNC ctermfg=223 ctermbg=30 cterm=bold - hi VertSplit ctermfg=223 ctermbg=243 cterm=NONE - hi Pmenu ctermfg=16 ctermbg=216 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=223 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=180 cterm=bold - hi PmenuMatch ctermfg=124 ctermbg=216 cterm=NONE - hi PmenuMatchSel ctermfg=124 ctermbg=180 cterm=bold - hi TabLine ctermfg=223 ctermbg=243 cterm=underline - hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse - hi TabLineSel ctermfg=16 ctermbg=223 cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=223 ctermbg=243 cterm=bold - hi NonText ctermfg=243 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=243 ctermbg=NONE cterm=NONE - hi Visual ctermfg=16 ctermbg=252 cterm=NONE - hi VisualNOS ctermfg=NONE ctermbg=25 cterm=NONE - hi LineNr ctermfg=160 ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=25 ctermbg=NONE 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=bold,reverse - hi ErrorMsg ctermfg=196 ctermbg=231 cterm=bold,reverse - hi WarningMsg ctermfg=164 ctermbg=223 cterm=bold - hi MoreMsg ctermfg=29 ctermbg=223 cterm=bold - hi ModeMsg ctermfg=16 ctermbg=223 cterm=bold - hi Question ctermfg=161 ctermbg=NONE cterm=bold - hi Todo ctermfg=62 ctermbg=226 cterm=NONE - hi MatchParen ctermfg=223 ctermbg=62 cterm=NONE - hi Search ctermfg=223 ctermbg=164 cterm=NONE - hi IncSearch ctermfg=29 ctermbg=NONE cterm=reverse - hi WildMenu ctermfg=16 ctermbg=226 cterm=bold - hi ColorColumn ctermfg=NONE ctermbg=255 cterm=NONE - hi Cursor ctermfg=223 ctermbg=16 cterm=NONE - hi lCursor ctermfg=16 ctermbg=161 cterm=NONE - hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=30 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=164 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=62 ctermbg=NONE cterm=underline - hi Comment ctermfg=25 ctermbg=NONE cterm=NONE - hi Constant ctermfg=161 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE - hi Statement ctermfg=124 ctermbg=NONE cterm=bold - hi PreProc ctermfg=164 ctermbg=NONE cterm=NONE - hi Type ctermfg=29 ctermbg=NONE cterm=bold - hi Special ctermfg=62 ctermbg=NONE cterm=NONE - hi Directory ctermfg=30 ctermbg=NONE cterm=bold - hi Conceal ctermfg=243 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Title ctermfg=164 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=#000000 guibg=#ffdab9 guisp=NONE gui=NONE ctermfg=16 ctermbg=223 cterm=NONE term=NONE +hi ColorColumn guifg=NONE guibg=#eeeeee guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=reverse +hi Comment guifg=#406090 guibg=NONE guisp=NONE gui=NONE ctermfg=25 ctermbg=NONE cterm=NONE term=bold +hi Conceal guifg=#737373 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE +hi Constant guifg=#c00058 guibg=NONE guisp=NONE gui=NONE ctermfg=161 ctermbg=NONE cterm=NONE term=NONE +hi Cursor guifg=#ffdab9 guibg=#000000 guisp=NONE gui=NONE ctermfg=223 ctermbg=16 cterm=NONE term=reverse +hi CursorColumn guifg=NONE guibg=#f5c195 guisp=NONE gui=NONE ctermfg=NONE ctermbg=180 cterm=NONE term=NONE +hi CursorLine guifg=NONE guibg=#f5c195 guisp=NONE gui=NONE ctermfg=NONE ctermbg=180 cterm=NONE term=underline +hi CursorLineNr guifg=#cd0000 guibg=NONE guisp=NONE gui=bold ctermfg=160 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=#737373 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE +hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=bold,reverse ctermfg=196 ctermbg=231 cterm=bold,reverse term=bold,reverse +hi ErrorMsg guifg=#ff0000 guibg=#ffffff guisp=NONE gui=bold,reverse ctermfg=196 ctermbg=231 cterm=bold,reverse term=bold,reverse +hi FoldColumn guifg=#406090 guibg=NONE guisp=NONE gui=NONE ctermfg=25 ctermbg=NONE cterm=NONE term=NONE +hi Folded guifg=#000000 guibg=#e3c1a5 guisp=NONE gui=NONE ctermfg=16 ctermbg=252 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=#2e8b57 guibg=NONE guisp=NONE gui=reverse ctermfg=29 ctermbg=NONE cterm=reverse term=bold,reverse,underline +hi LineNr guifg=#cd0000 guibg=NONE guisp=NONE gui=NONE ctermfg=160 ctermbg=NONE cterm=NONE term=NONE +hi MatchParen guifg=#ffdab9 guibg=#6a5acd guisp=NONE gui=NONE ctermfg=223 ctermbg=62 cterm=NONE term=bold,underline +hi ModeMsg guifg=#000000 guibg=#ffdab9 guisp=NONE gui=bold ctermfg=16 ctermbg=223 cterm=bold term=bold +hi MoreMsg guifg=#2e8b57 guibg=#ffdab9 guisp=NONE gui=bold ctermfg=29 ctermbg=223 cterm=bold term=NONE +hi NonText guifg=#737373 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE +hi Pmenu guifg=#000000 guibg=#ffaf87 guisp=NONE gui=NONE ctermfg=16 ctermbg=216 cterm=NONE term=reverse +hi PmenuMatch guifg=#a52a2a guibg=#ffaf87 guisp=NONE gui=NONE ctermfg=124 ctermbg=216 cterm=NONE term=NONE +hi PmenuMatchSel guifg=#a52a2a guibg=#f5c195 guisp=NONE gui=bold ctermfg=124 ctermbg=180 cterm=bold term=bold +hi PmenuSbar guifg=NONE guibg=#ffdab9 guisp=NONE gui=NONE ctermfg=NONE ctermbg=223 cterm=NONE term=reverse +hi PmenuSel guifg=#000000 guibg=#f5c195 guisp=NONE gui=bold ctermfg=16 ctermbg=180 cterm=bold term=bold +hi PmenuThumb guifg=NONE guibg=#737373 guisp=NONE gui=NONE ctermfg=NONE ctermbg=243 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=#c00058 guibg=NONE guisp=NONE gui=bold ctermfg=161 ctermbg=NONE cterm=bold term=standout +hi QuickFixLine guifg=#000000 guibg=#ffaf87 guisp=NONE gui=NONE ctermfg=16 ctermbg=216 cterm=NONE term=NONE +hi Search guifg=#ffdab9 guibg=#cd00cd guisp=NONE gui=NONE ctermfg=223 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=#6a5acd guibg=NONE guisp=NONE gui=NONE ctermfg=62 ctermbg=NONE cterm=NONE term=NONE +hi SpecialKey guifg=#737373 guibg=NONE guisp=NONE gui=NONE ctermfg=243 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=#cd00cd guibg=NONE guisp=#cd00cd gui=undercurl ctermfg=164 ctermbg=NONE cterm=underline term=underline +hi SpellRare guifg=#6a5acd guibg=NONE guisp=#6a5acd gui=undercurl ctermfg=62 ctermbg=NONE cterm=underline term=underline +hi Statement guifg=#a52a2a guibg=NONE guisp=NONE gui=bold ctermfg=124 ctermbg=NONE cterm=bold term=NONE +hi StatusLine guifg=#ffffff guibg=#000000 guisp=NONE gui=bold ctermfg=231 ctermbg=16 cterm=bold term=bold,reverse +hi StatusLineNC guifg=#ffdab9 guibg=#737373 guisp=NONE gui=bold ctermfg=223 ctermbg=243 cterm=bold term=bold,underline +hi StatusLineTerm guifg=#ffffff guibg=#2e8b57 guisp=NONE gui=bold ctermfg=231 ctermbg=29 cterm=bold term=bold,reverse +hi StatusLineTermNC guifg=#ffdab9 guibg=#008b8b guisp=NONE gui=bold ctermfg=223 ctermbg=30 cterm=bold term=bold,underline +hi TabLine guifg=#ffdab9 guibg=#737373 guisp=NONE gui=underline ctermfg=223 ctermbg=243 cterm=underline term=bold,underline +hi TabLineFill guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=NONE +hi TabLineSel guifg=#000000 guibg=#ffdab9 guisp=NONE gui=bold ctermfg=16 ctermbg=223 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=#dfba99 guisp=NONE gui=NONE ctermfg=16 ctermbg=255 cterm=NONE term=NONE +hi TitleBarNC guifg=#5f5f5f guibg=#efcaa9 guisp=NONE gui=NONE ctermfg=59 ctermbg=254 cterm=NONE term=NONE +hi Todo guifg=#6a5acd guibg=#ffff00 guisp=NONE gui=NONE ctermfg=62 ctermbg=226 cterm=NONE term=bold,reverse +hi ToolbarButton guifg=#ffdab9 guibg=#737373 guisp=NONE gui=bold ctermfg=223 ctermbg=243 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=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 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=#ffdab9 guibg=#737373 guisp=NONE gui=NONE ctermfg=223 ctermbg=243 cterm=NONE term=NONE +hi Visual guifg=#000000 guibg=#cccccc guisp=NONE gui=NONE ctermfg=16 ctermbg=252 cterm=NONE term=reverse +hi VisualNOS guifg=NONE guibg=#406090 guisp=NONE gui=NONE ctermfg=NONE ctermbg=25 cterm=NONE term=NONE +hi WarningMsg guifg=#cd00cd guibg=#ffdab9 guisp=NONE gui=bold ctermfg=164 ctermbg=223 cterm=bold term=standout +hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=bold ctermfg=16 ctermbg=226 cterm=bold term=bold +hi lCursor guifg=#000000 guibg=#c00058 guisp=NONE gui=NONE ctermfg=16 ctermbg=161 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 Folded ctermfg=darkblue ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi ColorColumn ctermfg=NONE ctermbg=grey cterm=NONE + hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE + hi Cursor ctermfg=white ctermbg=black cterm=NONE hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=underline - hi QuickFixLine ctermfg=black ctermbg=grey 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=darkcyan ctermbg=NONE cterm=bold hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=white cterm=bold,reverse + hi ErrorMsg ctermfg=darkred ctermbg=white cterm=bold,reverse + hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkblue 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=red ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=white ctermbg=darkblue cterm=NONE + hi ModeMsg ctermfg=black ctermbg=white cterm=bold + hi MoreMsg ctermfg=darkgreen ctermbg=white cterm=bold + hi NonText ctermfg=darkgrey 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=yellow cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE + hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE + hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi Question ctermfg=darkred ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=black ctermbg=grey cterm=NONE + hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline + hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline + hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=underline + hi Statement ctermfg=darkred ctermbg=NONE cterm=bold hi StatusLine ctermfg=white ctermbg=black cterm=bold hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=bold hi StatusLineTerm ctermfg=white ctermbg=darkgreen cterm=bold hi StatusLineTermNC ctermfg=white ctermbg=darkcyan cterm=bold - hi VertSplit ctermfg=white ctermbg=darkgrey cterm=NONE - hi Pmenu ctermfg=black ctermbg=grey cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE - hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE - hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold hi TabLine ctermfg=white ctermbg=darkgrey cterm=underline hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse hi TabLineSel ctermfg=black ctermbg=white cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold + hi TitleBar ctermfg=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgray ctermbg=white cterm=NONE + hi Todo ctermfg=darkblue ctermbg=yellow 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 ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold + hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline + hi VertSplit ctermfg=white ctermbg=darkgrey cterm=NONE hi Visual ctermfg=black ctermbg=grey cterm=NONE hi VisualNOS ctermfg=NONE ctermbg=darkgrey cterm=NONE - hi LineNr ctermfg=red ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline - hi Error ctermfg=darkred ctermbg=white cterm=bold,reverse - hi ErrorMsg ctermfg=darkred ctermbg=white cterm=bold,reverse hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=bold - hi MoreMsg ctermfg=darkgreen ctermbg=white cterm=bold - hi ModeMsg ctermfg=black ctermbg=white cterm=bold - hi Question ctermfg=darkred ctermbg=NONE cterm=bold - hi Todo ctermfg=darkblue ctermbg=yellow cterm=NONE - hi MatchParen ctermfg=white ctermbg=darkblue cterm=NONE - hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE - hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse hi WildMenu ctermfg=black ctermbg=yellow cterm=bold - hi ColorColumn ctermfg=NONE ctermbg=grey cterm=NONE - hi Cursor ctermfg=white ctermbg=black cterm=NONE hi lCursor ctermfg=black ctermbg=darkred cterm=NONE - hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline - hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline - hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=underline - hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkred ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold - hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE - 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=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=black ctermbg=gray cterm=NONE - hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi ColorColumn ctermfg=black ctermbg=darkred 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=white ctermbg=black cterm=NONE hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=underline - hi QuickFixLine ctermfg=gray ctermbg=darkcyan 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=bold hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold + hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse + hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse + hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkblue 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=black ctermbg=NONE cterm=bold + hi MatchParen ctermfg=gray ctermbg=darkblue cterm=NONE + hi ModeMsg ctermfg=black 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=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=darkred ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=gray ctermbg=darkcyan cterm=NONE + hi Search ctermfg=gray ctermbg=darkmagenta cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=bold + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse + hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse + hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=reverse + hi Statement ctermfg=darkred ctermbg=NONE cterm=bold hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse hi StatusLineTerm ctermfg=black ctermbg=gray cterm=bold,reverse hi StatusLineTermNC ctermfg=black ctermbg=gray cterm=reverse - hi VertSplit ctermfg=black ctermbg=gray cterm=reverse - 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=NONE cterm=reverse hi TabLineSel ctermfg=black ctermbg=white cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold + hi TitleBar ctermfg=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgray ctermbg=white cterm=NONE + hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse - hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold - hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=bold + 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=black ctermbg=gray cterm=reverse hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline - hi LineNr ctermfg=black ctermbg=NONE cterm=bold - hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse - hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold - hi ModeMsg ctermfg=black ctermbg=NONE cterm=bold - hi Question ctermfg=darkred ctermbg=NONE cterm=bold - hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE - hi MatchParen ctermfg=gray ctermbg=darkblue cterm=NONE - hi Search ctermfg=gray 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 SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse - hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse - hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=reverse - hi Comment ctermfg=NONE ctermbg=NONE cterm=bold - hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkred ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE - 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=darkred 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 Function term=NONE + hi Number term=NONE + hi Terminal term=NONE finish endif -" Background: light -" Color: comment #406090 25 darkgrey -" Color: constant #c00058 161 darkred -" Color: identifier #008b8b 30 darkcyan -" Color: statement #a52a2a 124 darkred -" Color: preproc #cd00cd 164 darkmagenta -" Color: type #2e8b57 29 darkgreen -" Color: special #6a5acd 62 darkblue -" Color: fg0 #000000 16 black -" Color: bg0 #ffdab9 223 white -" Color: fg1 #ffffff 231 white -" Color: bg1 #737373 243 darkgrey -" Color: visual #cccccc 252 grey -" Color: folded #e3c1a5 252 cyan -" Color: folded_fg #000000 16 black -" Color: cursorline #f5c195 180 yellow -" Color: pmenu #ffaf87 216 grey -" Color: wildmenu #ffff00 226 yellow -" Color: error #ff0000 196 darkred -" Color: linenr #cd0000 160 red -" Color: blue #0000ff 21 darkblue -" Color: red #ff0000 196 darkred -" Color: colorcolumn #eeeeee 255 grey -" 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 -" 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 diff --git a/runtime/colors/quiet.vim b/runtime/colors/quiet.vim index 687221e38b..f1872b783c 100644 --- a/runtime/colors/quiet.vim +++ b/runtime/colors/quiet.vim @@ -2,31 +2,25 @@ " Description: A mostly monochrome colorscheme, with a few niceties. " Author: Maxence Weynans " Maintainer: Maxence Weynans -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Vim License (see `:help license`)` -" Last Change: 2025 Jan 07 +" Last Change: 2025 Oct 08 -" Generated by Colortemplate v2.2.3 +" Generated by Colortemplate v3.0.0-beta10 hi clear let g:colors_name = 'quiet' -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 hi! link Added Normal -hi! link Changed Normal -hi! link Removed Normal -hi! link Terminal Normal -hi! link StatusLineTerm StatusLine -hi! link StatusLineTermNC StatusLineNC -hi! link MessageWindow Pmenu -hi! link PopupNotification Todo -hi! link PopupSelected PmenuSel hi! link Boolean Constant +hi! link Changed Normal hi! link Character Constant hi! link Conditional Statement -hi! link Define PreProc hi! link Debug Special +hi! link Define PreProc hi! link Delimiter Special hi! link Exception Statement hi! link Float Constant @@ -35,329 +29,114 @@ hi! link Include PreProc hi! link Keyword Statement hi! link Label Statement 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 Normal 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 Tag Special +hi! link Terminal Normal hi! link Typedef Type -hi! link lCursor Cursor hi! link debugBreakpoint ModeMsg hi! link debugPC CursorLine +hi! link lCursor Cursor -if &background ==# 'dark' - if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff'] - endif - hi Normal guifg=#dadada guibg=#000000 gui=NONE cterm=NONE - hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE - hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse - hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse - hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE - hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE - hi CursorLineNr guifg=#dadada guibg=#303030 gui=NONE cterm=NONE - hi DiffAdd guifg=#00af00 guibg=#000000 gui=reverse cterm=reverse - hi DiffChange guifg=#87afd7 guibg=#000000 gui=reverse cterm=reverse - hi DiffDelete guifg=#d75f5f guibg=#000000 gui=reverse cterm=reverse - hi DiffText guifg=#d787d7 guibg=#000000 gui=reverse cterm=reverse - hi Directory guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi EndOfBuffer guifg=#707070 guibg=NONE gui=NONE cterm=NONE - hi ErrorMsg guifg=#dadada guibg=#000000 gui=reverse cterm=reverse - hi FoldColumn guifg=#707070 guibg=NONE gui=NONE cterm=NONE - hi Folded guifg=#707070 guibg=#000000 gui=NONE cterm=NONE - hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse - hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE - hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold - hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold - hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE - hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE - hi PmenuMatch guifg=#d7005f guibg=#a8a8a8 gui=NONE cterm=NONE - hi PmenuExtra guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE - hi PmenuKind guifg=#000000 guibg=#a8a8a8 gui=bold cterm=bold - hi PmenuSbar guifg=#707070 guibg=#585858 gui=NONE cterm=NONE - hi PmenuSel guifg=#000000 guibg=#dadada gui=NONE cterm=NONE - hi PmenuMatchSel guifg=#d7005f guibg=#dadada gui=bold cterm=bold - hi PmenuExtraSel guifg=#000000 guibg=#dadada gui=NONE cterm=NONE - hi PmenuKindSel guifg=#000000 guibg=#dadada gui=bold cterm=bold - hi PmenuThumb guifg=#dadada guibg=#dadada gui=NONE cterm=NONE - hi Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse - hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse - hi SignColumn guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi SpecialKey guifg=#707070 guibg=NONE gui=bold cterm=bold - hi SpellBad guifg=#d7005f guibg=NONE guisp=#d7005f gui=undercurl cterm=underline - hi SpellCap guifg=#0087d7 guibg=NONE guisp=#0087d7 gui=undercurl cterm=underline - hi SpellLocal guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline - hi SpellRare guifg=#00afaf guibg=NONE guisp=#00afaf gui=undercurl cterm=underline - hi StatusLine guifg=#000000 guibg=#dadada gui=bold cterm=bold - hi StatusLineNC guifg=#707070 guibg=#000000 gui=reverse cterm=reverse - hi TabLine guifg=#707070 guibg=#000000 gui=reverse cterm=reverse - hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi TabLineSel guifg=#000000 guibg=#dadada gui=bold cterm=bold - hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi VertSplit guifg=#707070 guibg=#000000 gui=NONE cterm=NONE - hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse - hi VisualNOS guifg=NONE guibg=#303030 gui=NONE cterm=NONE - hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi WildMenu guifg=#00afff guibg=#000000 gui=bold cterm=bold - hi Comment guifg=#707070 guibg=NONE gui=bold cterm=bold - hi Constant guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi Error guifg=#ff005f guibg=#000000 gui=bold,reverse cterm=bold,reverse - hi Identifier guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi Ignore guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi PreProc guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi Special guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi Statement guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi Todo guifg=#00ffaf guibg=NONE gui=bold,reverse cterm=bold,reverse - hi Type guifg=#dadada guibg=NONE gui=NONE cterm=NONE - hi Underlined guifg=#dadada guibg=NONE gui=underline cterm=underline - hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE - hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE - hi ToolbarButton guifg=#dadada guibg=#000000 gui=bold cterm=bold -else - " Light background - if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#000000', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff'] - endif - hi Normal guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE - hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE - hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse - hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse - hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE - hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE - hi CursorLineNr guifg=#000000 guibg=#eeeeee gui=NONE cterm=NONE - hi DiffAdd guifg=#87d787 guibg=#000000 gui=reverse cterm=reverse - hi DiffChange guifg=#afafd7 guibg=#000000 gui=reverse cterm=reverse - hi DiffDelete guifg=#d78787 guibg=#000000 gui=reverse cterm=reverse - hi DiffText guifg=#d787d7 guibg=#000000 gui=reverse cterm=reverse - hi Directory guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi EndOfBuffer guifg=#626262 guibg=NONE gui=NONE cterm=NONE - hi ErrorMsg guifg=#000000 guibg=#d7d7d7 gui=reverse cterm=reverse - hi FoldColumn guifg=#626262 guibg=NONE gui=NONE cterm=NONE - hi Folded guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE - hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse - hi LineNr guifg=#a8a8a8 guibg=NONE gui=NONE cterm=NONE - hi MatchParen guifg=#ff00af guibg=#d7d7d7 gui=bold cterm=bold - hi ModeMsg guifg=#000000 guibg=NONE gui=bold cterm=bold - hi MoreMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi NonText guifg=#626262 guibg=NONE gui=NONE cterm=NONE - hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE - hi PmenuMatch guifg=#d70000 guibg=#a8a8a8 gui=NONE cterm=NONE - hi PmenuExtra guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE - hi PmenuKind guifg=#000000 guibg=#a8a8a8 gui=bold cterm=bold - hi PmenuSbar guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE - hi PmenuSel guifg=#d7d7d7 guibg=#000000 gui=NONE cterm=NONE - hi PmenuMatchSel guifg=#d70000 guibg=#000000 gui=bold cterm=bold - hi PmenuExtraSel guifg=#d7d7d7 guibg=#000000 gui=NONE cterm=NONE - hi PmenuKindSel guifg=#d7d7d7 guibg=#000000 gui=bold cterm=bold - hi PmenuThumb guifg=#000000 guibg=#000000 gui=NONE cterm=NONE - hi Question guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse - hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse - hi SignColumn guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi SpecialKey guifg=#626262 guibg=NONE gui=bold cterm=bold - hi SpellBad guifg=#af0000 guibg=#d7d7d7 guisp=#af0000 gui=undercurl cterm=underline - hi SpellCap guifg=#005faf guibg=#d7d7d7 guisp=#005faf gui=undercurl cterm=underline - hi SpellLocal guifg=#870087 guibg=#d7d7d7 guisp=#870087 gui=undercurl cterm=underline - hi SpellRare guifg=#008787 guibg=#d7d7d7 guisp=#008787 gui=undercurl cterm=underline - hi StatusLine guifg=#eeeeee guibg=#000000 gui=bold cterm=bold - hi StatusLineNC guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE - hi TabLine guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE - hi TabLineFill guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE - hi TabLineSel guifg=#eeeeee guibg=#000000 gui=bold cterm=bold - hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi VertSplit guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE - hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse - hi VisualNOS guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE - hi WarningMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi WildMenu guifg=#000000 guibg=#eeeeee gui=bold cterm=bold - hi Comment guifg=#000000 guibg=NONE gui=bold cterm=bold - hi Constant guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi Error guifg=#ff005f guibg=#000000 gui=bold,reverse cterm=bold,reverse - hi Identifier guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi Ignore guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi PreProc guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi Special guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi Statement guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi Todo guifg=#00ffaf guibg=#000000 gui=bold,reverse cterm=bold,reverse - hi Type guifg=#000000 guibg=NONE gui=NONE cterm=NONE - hi Underlined guifg=#000000 guibg=NONE gui=underline cterm=underline - hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE - hi ToolbarLine guifg=NONE guibg=#d7d7d7 gui=NONE cterm=NONE - hi ToolbarButton guifg=#000000 guibg=#d7d7d7 gui=bold cterm=bold -endif +if &background == 'dark' + let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff'] -if s:t_Co >= 256 - if &background ==# 'dark' - hi Normal ctermfg=253 ctermbg=16 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE - hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE - hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse - hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse - hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE - hi CursorLineNr ctermfg=253 ctermbg=236 cterm=NONE - hi DiffAdd ctermfg=34 ctermbg=16 cterm=reverse - hi DiffChange ctermfg=110 ctermbg=16 cterm=reverse - hi DiffDelete ctermfg=167 ctermbg=16 cterm=reverse - hi DiffText ctermfg=176 ctermbg=16 cterm=reverse - hi Directory ctermfg=253 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=242 ctermbg=NONE cterm=NONE - hi ErrorMsg ctermfg=253 ctermbg=16 cterm=reverse - hi FoldColumn ctermfg=242 ctermbg=NONE cterm=NONE - hi Folded ctermfg=242 ctermbg=16 cterm=NONE - hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse - hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold - hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=253 ctermbg=NONE cterm=NONE - hi NonText ctermfg=242 ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE - hi PmenuMatch ctermfg=161 ctermbg=248 cterm=NONE - hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE - hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold - hi PmenuSbar ctermfg=242 ctermbg=240 cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=253 cterm=NONE - hi PmenuMatchSel ctermfg=161 ctermbg=253 cterm=bold - hi PmenuExtraSel ctermfg=16 ctermbg=253 cterm=NONE - hi PmenuKindSel ctermfg=16 ctermbg=253 cterm=bold - hi PmenuThumb ctermfg=253 ctermbg=253 cterm=NONE - hi Question ctermfg=253 ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse - hi Search ctermfg=39 ctermbg=16 cterm=reverse - hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=242 ctermbg=NONE cterm=bold - hi SpellBad ctermfg=161 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=32 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=176 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline - hi StatusLine ctermfg=16 ctermbg=253 cterm=bold - hi StatusLineNC ctermfg=242 ctermbg=16 cterm=reverse - hi TabLine ctermfg=242 ctermbg=16 cterm=reverse - hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE - hi TabLineSel ctermfg=16 ctermbg=253 cterm=bold - hi Title ctermfg=NONE ctermbg=NONE cterm=NONE - hi VertSplit ctermfg=242 ctermbg=16 cterm=NONE - hi Visual ctermfg=214 ctermbg=16 cterm=reverse - hi VisualNOS ctermfg=NONE ctermbg=236 cterm=NONE - hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE - hi WildMenu ctermfg=39 ctermbg=16 cterm=bold - hi Comment ctermfg=242 ctermbg=NONE cterm=bold - hi Constant ctermfg=253 ctermbg=NONE cterm=NONE - hi Error ctermfg=197 ctermbg=16 cterm=bold,reverse - hi Identifier ctermfg=253 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=253 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=253 ctermbg=NONE cterm=NONE - hi Special ctermfg=253 ctermbg=NONE cterm=NONE - hi Statement ctermfg=253 ctermbg=NONE cterm=NONE - hi Todo ctermfg=49 ctermbg=NONE cterm=bold,reverse - hi Type ctermfg=253 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=253 ctermbg=NONE cterm=underline - hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE - hi ToolbarButton ctermfg=253 ctermbg=16 cterm=bold - else - " Light background - hi Normal ctermfg=16 ctermbg=188 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE - hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE - hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse - hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse - hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE - hi CursorLineNr ctermfg=16 ctermbg=255 cterm=NONE - hi DiffAdd ctermfg=114 ctermbg=16 cterm=reverse - hi DiffChange ctermfg=146 ctermbg=16 cterm=reverse - hi DiffDelete ctermfg=174 ctermbg=16 cterm=reverse - hi DiffText ctermfg=176 ctermbg=16 cterm=reverse - hi Directory ctermfg=16 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=241 ctermbg=NONE cterm=NONE - hi ErrorMsg ctermfg=16 ctermbg=188 cterm=reverse - hi FoldColumn ctermfg=241 ctermbg=NONE cterm=NONE - hi Folded ctermfg=241 ctermbg=188 cterm=NONE - hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse - hi LineNr ctermfg=248 ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=199 ctermbg=188 cterm=bold - hi ModeMsg ctermfg=16 ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=16 ctermbg=NONE cterm=NONE - hi NonText ctermfg=241 ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE - hi PmenuMatch ctermfg=160 ctermbg=248 cterm=NONE - hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE - hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold - hi PmenuSbar ctermfg=16 ctermbg=254 cterm=NONE - hi PmenuSel ctermfg=188 ctermbg=16 cterm=NONE - hi PmenuMatchSel ctermfg=160 ctermbg=16 cterm=bold - hi PmenuExtraSel ctermfg=188 ctermbg=16 cterm=NONE - hi PmenuKindSel ctermfg=188 ctermbg=16 cterm=bold - hi PmenuThumb ctermfg=16 ctermbg=16 cterm=NONE - hi Question ctermfg=16 ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse - hi Search ctermfg=39 ctermbg=16 cterm=reverse - hi SignColumn ctermfg=16 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=241 ctermbg=NONE cterm=bold - hi SpellBad ctermfg=124 ctermbg=188 cterm=underline - hi SpellCap ctermfg=25 ctermbg=188 cterm=underline - hi SpellLocal ctermfg=90 ctermbg=188 cterm=underline - hi SpellRare ctermfg=30 ctermbg=188 cterm=underline - hi StatusLine ctermfg=255 ctermbg=16 cterm=bold - hi StatusLineNC ctermfg=16 ctermbg=248 cterm=NONE - hi TabLine ctermfg=16 ctermbg=248 cterm=NONE - hi TabLineFill ctermfg=16 ctermbg=188 cterm=NONE - hi TabLineSel ctermfg=255 ctermbg=16 cterm=bold - hi Title ctermfg=NONE ctermbg=NONE cterm=NONE - hi VertSplit ctermfg=241 ctermbg=188 cterm=NONE - hi Visual ctermfg=214 ctermbg=16 cterm=reverse - hi VisualNOS ctermfg=NONE ctermbg=255 cterm=NONE - hi WarningMsg ctermfg=16 ctermbg=NONE cterm=NONE - hi WildMenu ctermfg=16 ctermbg=255 cterm=bold - hi Comment ctermfg=16 ctermbg=NONE cterm=bold - hi Constant ctermfg=16 ctermbg=NONE cterm=NONE - hi Error ctermfg=197 ctermbg=16 cterm=bold,reverse - hi Identifier ctermfg=16 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=16 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=16 ctermbg=NONE cterm=NONE - hi Special ctermfg=16 ctermbg=NONE cterm=NONE - hi Statement ctermfg=16 ctermbg=NONE cterm=NONE - hi Todo ctermfg=49 ctermbg=16 cterm=bold,reverse - hi Type ctermfg=16 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=16 ctermbg=NONE cterm=underline - hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=188 cterm=NONE - hi ToolbarButton ctermfg=16 ctermbg=188 cterm=bold + hi Normal guifg=#dadada guibg=#000000 guisp=NONE gui=NONE ctermfg=253 ctermbg=16 cterm=NONE term=NONE + hi ColorColumn guifg=NONE guibg=#1c1c1c guisp=NONE gui=NONE ctermfg=NONE ctermbg=234 cterm=NONE term=reverse + hi Comment guifg=#707070 guibg=NONE guisp=NONE gui=bold ctermfg=242 ctermbg=NONE cterm=bold term=bold + hi Conceal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE + hi Constant guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE + hi CurSearch guifg=#ff5fff guibg=#000000 guisp=NONE gui=reverse ctermfg=207 ctermbg=16 cterm=reverse term=reverse + hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=reverse + hi CursorColumn guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=NONE + hi CursorIM guifg=#000000 guibg=#afff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=154 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=#303030 guisp=NONE gui=NONE ctermfg=253 ctermbg=236 cterm=NONE term=bold + hi DiffAdd guifg=#00af00 guibg=#000000 guisp=NONE gui=reverse ctermfg=34 ctermbg=16 cterm=reverse term=reverse + hi DiffChange guifg=#87afd7 guibg=#000000 guisp=NONE gui=reverse ctermfg=110 ctermbg=16 cterm=reverse term=NONE + hi DiffDelete guifg=#d75f5f guibg=#000000 guisp=NONE gui=reverse ctermfg=167 ctermbg=16 cterm=reverse term=reverse + hi DiffText guifg=#d787d7 guibg=#000000 guisp=NONE gui=reverse ctermfg=176 ctermbg=16 cterm=reverse term=reverse + hi Directory guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE + hi EndOfBuffer guifg=#707070 guibg=NONE guisp=NONE gui=NONE ctermfg=242 ctermbg=NONE cterm=NONE term=NONE + hi Error guifg=#ff005f guibg=#000000 guisp=NONE gui=bold,reverse ctermfg=197 ctermbg=16 cterm=bold,reverse term=bold,reverse + hi ErrorMsg guifg=#dadada guibg=#000000 guisp=NONE gui=reverse ctermfg=253 ctermbg=16 cterm=reverse term=bold,reverse + hi FoldColumn guifg=#707070 guibg=NONE guisp=NONE gui=NONE ctermfg=242 ctermbg=NONE cterm=NONE term=NONE + hi Folded guifg=#707070 guibg=#000000 guisp=NONE gui=NONE ctermfg=242 ctermbg=16 cterm=NONE term=NONE + hi Identifier guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE + hi Ignore guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE + hi IncSearch guifg=#ffaf00 guibg=#000000 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 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=#dadada guibg=NONE guisp=NONE gui=bold ctermfg=253 ctermbg=NONE cterm=bold term=bold + hi MoreMsg guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE + hi NonText guifg=#707070 guibg=NONE guisp=NONE gui=NONE ctermfg=242 ctermbg=NONE cterm=NONE term=NONE + hi Pmenu guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=reverse + hi PmenuExtra guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=NONE + hi PmenuExtraSel guifg=#000000 guibg=#dadada guisp=NONE gui=NONE ctermfg=16 ctermbg=253 cterm=NONE term=NONE + hi PmenuKind guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=bold ctermfg=16 ctermbg=248 cterm=bold term=bold + hi PmenuKindSel guifg=#000000 guibg=#dadada guisp=NONE gui=bold ctermfg=16 ctermbg=253 cterm=bold term=bold + hi PmenuMatch guifg=#d7005f guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=161 ctermbg=248 cterm=NONE term=NONE + hi PmenuMatchSel guifg=#d7005f guibg=#dadada guisp=NONE gui=bold ctermfg=161 ctermbg=253 cterm=bold term=bold + hi PmenuSbar guifg=#707070 guibg=#585858 guisp=NONE gui=NONE ctermfg=242 ctermbg=240 cterm=NONE term=reverse + hi PmenuSel guifg=#000000 guibg=#dadada guisp=NONE gui=NONE ctermfg=16 ctermbg=253 cterm=NONE term=bold + hi PmenuThumb guifg=#dadada guibg=#dadada guisp=NONE gui=NONE ctermfg=253 ctermbg=253 cterm=NONE term=NONE + hi PreProc guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE + hi Question guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=standout + hi QuickFixLine guifg=#ff5fff guibg=#000000 guisp=NONE gui=reverse ctermfg=207 ctermbg=16 cterm=reverse term=NONE + hi Search guifg=#00afff guibg=#000000 guisp=NONE gui=reverse ctermfg=39 ctermbg=16 cterm=reverse term=reverse + hi SignColumn guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=reverse + hi Special guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE + hi SpecialKey guifg=#707070 guibg=NONE guisp=NONE gui=bold ctermfg=242 ctermbg=NONE cterm=bold term=bold + hi SpellBad guifg=#d7005f guibg=NONE guisp=#d7005f gui=undercurl ctermfg=161 ctermbg=NONE cterm=underline term=underline + hi SpellCap guifg=#0087d7 guibg=NONE guisp=#0087d7 gui=undercurl ctermfg=32 ctermbg=NONE cterm=underline term=underline + hi SpellLocal guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl ctermfg=176 ctermbg=NONE cterm=underline term=underline + hi SpellRare guifg=#00afaf guibg=NONE guisp=#00afaf gui=undercurl ctermfg=37 ctermbg=NONE cterm=underline term=underline + hi Statement guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE + hi StatusLine guifg=#000000 guibg=#dadada guisp=NONE gui=bold ctermfg=16 ctermbg=253 cterm=bold term=bold,reverse + hi StatusLineNC guifg=#707070 guibg=#000000 guisp=NONE gui=reverse ctermfg=242 ctermbg=16 cterm=reverse term=bold,underline + hi TabLine guifg=#707070 guibg=#000000 guisp=NONE gui=reverse ctermfg=242 ctermbg=16 cterm=reverse term=bold,underline + hi TabLineFill guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE + hi TabLineSel guifg=#000000 guibg=#dadada guisp=NONE gui=bold ctermfg=16 ctermbg=253 cterm=bold term=bold,reverse + hi Title guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE + hi TitleBar guifg=#dadada guibg=#4c4c4c guisp=NONE gui=NONE ctermfg=253 ctermbg=237 cterm=NONE term=NONE + hi TitleBarNC guifg=#707070 guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=242 ctermbg=236 cterm=NONE term=NONE + hi Todo guifg=#00ffaf guibg=NONE guisp=NONE gui=bold,reverse ctermfg=49 ctermbg=NONE cterm=bold,reverse term=bold,reverse + hi ToolbarButton guifg=#dadada guibg=#000000 guisp=NONE gui=bold ctermfg=253 ctermbg=16 cterm=bold term=bold,reverse + hi ToolbarLine guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse + hi Type guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE + hi Underlined guifg=#dadada guibg=NONE guisp=NONE gui=underline ctermfg=253 ctermbg=NONE cterm=underline term=underline + hi VertSplit guifg=#707070 guibg=#000000 guisp=NONE gui=NONE ctermfg=242 ctermbg=16 cterm=NONE term=NONE + hi Visual guifg=#ffaf00 guibg=#000000 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 cterm=reverse term=reverse + hi VisualNOS guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=NONE + hi WarningMsg guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=standout + hi WildMenu guifg=#00afff guibg=#000000 guisp=NONE gui=bold ctermfg=39 ctermbg=16 cterm=bold term=bold + + if s:tgc || s:t_Co >= 256 + finish endif - unlet s:t_Co - finish -endif -if s:t_Co >= 16 - if &background ==# 'dark' - hi Comment ctermfg=darkgrey ctermbg=NONE cterm=bold - hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse - hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse - hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse - hi Search ctermfg=cyan ctermbg=black cterm=reverse - hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold - hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse - hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse - hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE + if s:t_Co >= 16 hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse + hi Comment ctermfg=darkgrey ctermbg=NONE cterm=bold hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE + hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse @@ -365,67 +144,72 @@ if s:t_Co >= 16 hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse + hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE + hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuMatch ctermfg=NONE ctermbg=darkred cterm=reverse hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse - hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold - hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold 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=darkred cterm=reverse + hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE + hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE hi Question ctermfg=NONE ctermbg=NONE cterm=standout hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse + hi Search ctermfg=cyan ctermbg=black cterm=reverse hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse + hi Special ctermfg=NONE ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline + hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse + hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi Title ctermfg=NONE ctermbg=NONE cterm=NONE - hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse - hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout - hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold - hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse - hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE - hi Special ctermfg=NONE ctermbg=NONE cterm=NONE - hi Statement ctermfg=NONE 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=bold,reverse + hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse hi Type ctermfg=NONE ctermbg=NONE cterm=NONE hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse - hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse - else - " Light background - hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse - hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse - hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse - hi Search ctermfg=cyan ctermbg=black cterm=reverse - hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold - hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse - hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse + hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout + hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold + finish + endif + + if s:t_Co >= 8 hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse + hi Comment ctermfg=NONE ctermbg=NONE cterm=bold hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE + hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse @@ -433,74 +217,164 @@ if s:t_Co >= 16 hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse + 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=NONE ctermbg=NONE cterm=NONE + hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuMatch ctermfg=NONE ctermbg=darkred cterm=reverse hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse - hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold - hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold 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=darkred cterm=reverse + hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE + hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE hi Question ctermfg=NONE ctermbg=NONE cterm=standout hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse + hi Search ctermfg=darkcyan ctermbg=black cterm=reverse hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse + hi Special ctermfg=NONE ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline + hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline + hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi Title ctermfg=NONE 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=bold,reverse + hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse + hi Type ctermfg=NONE ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold - hi Comment ctermfg=NONE ctermbg=NONE cterm=bold - hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse - hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE - hi Special ctermfg=NONE ctermbg=NONE cterm=NONE - hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE - hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse - hi Type ctermfg=NONE ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse - hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + finish endif - unlet s:t_Co + + if s:t_Co >= 0 + hi CursorLineFold term=underline + hi CursorLineSign term=underline + 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 + finish endif -if s:t_Co >= 8 - if &background ==# 'dark' - hi Comment ctermfg=NONE ctermbg=NONE cterm=bold - hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse - hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE - hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE - hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse - hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE - hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse - hi Search ctermfg=darkcyan ctermbg=black cterm=reverse - hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold - hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline - hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline - hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE +if &background == 'light' + let g:terminal_ansi_colors = ['#000000', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff'] + + hi Normal guifg=#000000 guibg=#d7d7d7 guisp=NONE gui=NONE ctermfg=16 ctermbg=188 cterm=NONE term=NONE + hi ColorColumn guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=reverse + hi Comment guifg=#000000 guibg=NONE guisp=NONE gui=bold ctermfg=16 ctermbg=NONE cterm=bold term=bold + hi Conceal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE + hi Constant guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=NONE + hi CurSearch guifg=#ff5fff guibg=#000000 guisp=NONE gui=reverse ctermfg=207 ctermbg=16 cterm=reverse term=reverse + hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=reverse + hi CursorColumn guifg=NONE guibg=#eeeeee guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=NONE + hi CursorIM guifg=#000000 guibg=#afff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=154 cterm=NONE term=NONE + hi CursorLine guifg=NONE guibg=#eeeeee guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=underline + hi CursorLineNr guifg=#000000 guibg=#eeeeee guisp=NONE gui=NONE ctermfg=16 ctermbg=255 cterm=NONE term=bold + hi DiffAdd guifg=#87d787 guibg=#000000 guisp=NONE gui=reverse ctermfg=114 ctermbg=16 cterm=reverse term=reverse + hi DiffChange guifg=#afafd7 guibg=#000000 guisp=NONE gui=reverse ctermfg=146 ctermbg=16 cterm=reverse term=NONE + hi DiffDelete guifg=#d78787 guibg=#000000 guisp=NONE gui=reverse ctermfg=174 ctermbg=16 cterm=reverse term=reverse + hi DiffText guifg=#d787d7 guibg=#000000 guisp=NONE gui=reverse ctermfg=176 ctermbg=16 cterm=reverse term=reverse + hi Directory guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=NONE + hi EndOfBuffer guifg=#626262 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE + hi Error guifg=#ff005f guibg=#000000 guisp=NONE gui=bold,reverse ctermfg=197 ctermbg=16 cterm=bold,reverse term=bold,reverse + hi ErrorMsg guifg=#000000 guibg=#d7d7d7 guisp=NONE gui=reverse ctermfg=16 ctermbg=188 cterm=reverse term=bold,reverse + hi FoldColumn guifg=#626262 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE + hi Folded guifg=#626262 guibg=#d7d7d7 guisp=NONE gui=NONE ctermfg=241 ctermbg=188 cterm=NONE term=NONE + hi Identifier guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=NONE + hi Ignore guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=NONE + hi IncSearch guifg=#ffaf00 guibg=#000000 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 cterm=reverse term=bold,reverse,underline + hi LineNr guifg=#a8a8a8 guibg=NONE guisp=NONE gui=NONE ctermfg=248 ctermbg=NONE cterm=NONE term=NONE + hi MatchParen guifg=#ff00af guibg=#d7d7d7 guisp=NONE gui=bold ctermfg=199 ctermbg=188 cterm=bold term=bold,underline + hi ModeMsg guifg=#000000 guibg=NONE guisp=NONE gui=bold ctermfg=16 ctermbg=NONE cterm=bold term=bold + hi MoreMsg guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=NONE + hi NonText guifg=#626262 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE + hi Pmenu guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=reverse + hi PmenuExtra guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=NONE + hi PmenuExtraSel guifg=#d7d7d7 guibg=#000000 guisp=NONE gui=NONE ctermfg=188 ctermbg=16 cterm=NONE term=NONE + hi PmenuKind guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=bold ctermfg=16 ctermbg=248 cterm=bold term=bold + hi PmenuKindSel guifg=#d7d7d7 guibg=#000000 guisp=NONE gui=bold ctermfg=188 ctermbg=16 cterm=bold term=bold + hi PmenuMatch guifg=#d70000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=160 ctermbg=248 cterm=NONE term=NONE + hi PmenuMatchSel guifg=#d70000 guibg=#000000 guisp=NONE gui=bold ctermfg=160 ctermbg=16 cterm=bold term=bold + hi PmenuSbar guifg=#000000 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=reverse + hi PmenuSel guifg=#d7d7d7 guibg=#000000 guisp=NONE gui=NONE ctermfg=188 ctermbg=16 cterm=NONE term=bold + hi PmenuThumb guifg=#000000 guibg=#000000 guisp=NONE gui=NONE ctermfg=16 ctermbg=16 cterm=NONE term=NONE + hi PreProc guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=NONE + hi Question guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=standout + hi QuickFixLine guifg=#ff5fff guibg=#000000 guisp=NONE gui=reverse ctermfg=207 ctermbg=16 cterm=reverse term=NONE + hi Search guifg=#00afff guibg=#000000 guisp=NONE gui=reverse ctermfg=39 ctermbg=16 cterm=reverse term=reverse + hi SignColumn guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=reverse + hi Special guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=NONE + hi SpecialKey guifg=#626262 guibg=NONE guisp=NONE gui=bold ctermfg=241 ctermbg=NONE cterm=bold term=bold + hi SpellBad guifg=#af0000 guibg=#d7d7d7 guisp=#af0000 gui=undercurl ctermfg=124 ctermbg=188 cterm=underline term=underline + hi SpellCap guifg=#005faf guibg=#d7d7d7 guisp=#005faf gui=undercurl ctermfg=25 ctermbg=188 cterm=underline term=underline + hi SpellLocal guifg=#870087 guibg=#d7d7d7 guisp=#870087 gui=undercurl ctermfg=90 ctermbg=188 cterm=underline term=underline + hi SpellRare guifg=#008787 guibg=#d7d7d7 guisp=#008787 gui=undercurl ctermfg=30 ctermbg=188 cterm=underline term=underline + hi Statement guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=NONE + hi StatusLine guifg=#eeeeee guibg=#000000 guisp=NONE gui=bold ctermfg=255 ctermbg=16 cterm=bold term=bold,reverse + hi StatusLineNC guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=bold,underline + hi TabLine guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=bold,underline + hi TabLineFill guifg=#000000 guibg=#d7d7d7 guisp=NONE gui=NONE ctermfg=16 ctermbg=188 cterm=NONE term=NONE + hi TabLineSel guifg=#eeeeee guibg=#000000 guisp=NONE gui=bold ctermfg=255 ctermbg=16 cterm=bold term=bold,reverse + hi Title guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE + hi TitleBar guifg=#000000 guibg=#ececec guisp=NONE gui=NONE ctermfg=16 ctermbg=255 cterm=NONE term=NONE + hi TitleBarNC guifg=#626262 guibg=#e7e7e7 guisp=NONE gui=NONE ctermfg=241 ctermbg=255 cterm=NONE term=NONE + hi Todo guifg=#00ffaf guibg=#000000 guisp=NONE gui=bold,reverse ctermfg=49 ctermbg=16 cterm=bold,reverse term=bold,reverse + hi ToolbarButton guifg=#000000 guibg=#d7d7d7 guisp=NONE gui=bold ctermfg=16 ctermbg=188 cterm=bold term=bold,reverse + hi ToolbarLine guifg=NONE guibg=#d7d7d7 guisp=NONE gui=NONE ctermfg=NONE ctermbg=188 cterm=NONE term=reverse + hi Type guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=NONE + hi Underlined guifg=#000000 guibg=NONE guisp=NONE gui=underline ctermfg=16 ctermbg=NONE cterm=underline term=underline + hi VertSplit guifg=#626262 guibg=#d7d7d7 guisp=NONE gui=NONE ctermfg=241 ctermbg=188 cterm=NONE term=NONE + hi Visual guifg=#ffaf00 guibg=#000000 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 cterm=reverse term=reverse + hi VisualNOS guifg=NONE guibg=#eeeeee guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=NONE + hi WarningMsg guifg=#000000 guibg=NONE guisp=NONE gui=NONE ctermfg=16 ctermbg=NONE cterm=NONE term=standout + hi WildMenu guifg=#000000 guibg=#eeeeee guisp=NONE gui=bold ctermfg=16 ctermbg=255 cterm=bold term=bold + + if s:tgc || s:t_Co >= 256 + finish + endif + + if s:t_Co >= 16 hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse + hi Comment ctermfg=NONE ctermbg=NONE cterm=bold hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE + hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse @@ -508,67 +382,72 @@ if s:t_Co >= 8 hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse + hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE + hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuMatch ctermfg=NONE ctermbg=darkred cterm=reverse hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse - hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold - hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold 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=darkred cterm=reverse + hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE + hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE hi Question ctermfg=NONE ctermbg=NONE cterm=standout hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse + hi Search ctermfg=cyan ctermbg=black cterm=reverse hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse + hi Special ctermfg=NONE ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline + hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse + hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi Title ctermfg=NONE ctermbg=NONE cterm=NONE + hi TitleBar ctermfg=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=white cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse + hi Type ctermfg=NONE ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold - hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse - hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE - hi Special ctermfg=NONE ctermbg=NONE cterm=NONE - hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE - hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse - hi Type ctermfg=NONE ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse - hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse - else - " Light background - hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse - hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE - hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE - hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse - hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE - hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse - hi Search ctermfg=darkcyan ctermbg=black cterm=reverse - hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold - hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline - hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline - hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE + finish + endif + + if s:t_Co >= 8 hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse + hi Comment ctermfg=NONE ctermbg=NONE cterm=bold hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE + hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse @@ -576,190 +455,74 @@ if s:t_Co >= 8 hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse + 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=NONE ctermbg=NONE cterm=NONE + hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuMatch ctermfg=NONE ctermbg=darkred cterm=reverse hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse - hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold - hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold 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=darkred cterm=reverse + hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE + hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE hi Question ctermfg=NONE ctermbg=NONE cterm=standout hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse + hi Search ctermfg=darkcyan ctermbg=black cterm=reverse hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse + hi Special ctermfg=NONE ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline + hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline + hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi Title ctermfg=NONE ctermbg=NONE cterm=NONE + hi TitleBar ctermfg=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=white cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse + hi Type ctermfg=NONE ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold - hi Comment ctermfg=NONE ctermbg=NONE cterm=bold - hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse - hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE - hi Special ctermfg=NONE ctermbg=NONE cterm=NONE - hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE - hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse - hi Type ctermfg=NONE ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse - hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + finish + endif + + if s:t_Co >= 0 + hi CursorLineFold term=underline + hi CursorLineSign term=underline + 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 - 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 - finish endif -" Background: dark -" Color: dark0 #000000 16 black -" Color: dark1 #d7005f 161 darkred -" Color: dark2 #00af5f 35 darkgreen -" Color: dark3 #d78700 172 darkyellow -" Color: dark4 #0087d7 32 darkblue -" Color: dark5 #d787d7 176 darkmagenta -" Color: dark6 #00afaf 37 darkcyan -" Color: dark7 #dadada 253 grey -" Color: dark8 #707070 242 darkgrey -" Color: dark9 #ff005f 197 red -" Color: dark10 #00d75f 41 green -" Color: dark11 #ffaf00 214 yellow -" Color: dark12 #5fafff 75 blue -" Color: dark13 #ff87ff 213 magenta -" Color: dark14 #00d7d7 44 cyan -" Color: dark15 #ffffff 231 white -" Color: diffred #d75f5f 167 darkred -" Color: diffgreen #00af00 34 darkgreen -" Color: diffblue #87afd7 110 darkblue -" Color: diffpink #d787d7 176 darkmagenta -" Color: uipink #ff00af 199 magenta -" Color: uilime #afff00 154 green -" Color: uiteal #00ffaf 49 green -" Color: uiblue #00afff 39 blue -" Color: uipurple #af00ff 129 darkmagenta -" Color: uiamber #ffaf00 214 darkyellow -" Color: uiblack #303030 236 darkgrey -" Color: yasogrey #1c1c1c 234 black -" Color: linenrblack #585858 240 darkgrey -" Color: uicursearch #ff5fff 207 magenta -" Color: invisigrey #a8a8a8 248 darkgrey -" Color: errorred #ff005f 197 red -" Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7 -" Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15 -" Background: light -" Color: brightwhite #eeeeee 255 grey -" Color: light0 #000000 16 black -" Color: light1 #af0000 124 darkred -" Color: light2 #005f00 22 darkgreen -" Color: light3 #af5f00 130 darkyellow -" Color: light4 #005faf 25 darkblue -" Color: light5 #870087 90 darkmagenta -" Color: light6 #008787 30 darkcyan -" Color: light7 #d7d7d7 188 grey -" Color: light8 #626262 241 darkgrey -" Color: light9 #d70000 160 red -" Color: light10 #008700 28 green -" Color: light11 #d78700 172 yellow -" Color: light12 #0087d7 32 blue -" Color: light13 #af00af 127 magenta -" Color: light14 #00afaf 37 cyan -" Color: light15 #ffffff 231 white -" Color: diffred #d78787 174 red -" Color: diffgreen #87d787 114 green -" Color: diffblue #afafd7 146 blue -" Color: diffpink #d787d7 176 magenta -" Color: uipink #ff00af 199 magenta -" Color: uilime #afff00 154 green -" Color: uiteal #00ffaf 49 cyan -" Color: uiblue #00afff 39 blue -" Color: uipurple #af00ff 129 darkmagenta -" Color: uiamber #ffaf00 214 yellow -" Color: invisigrey #a8a8a8 248 darkgrey -" Color: yasogrey #e4e4e4 254 grey -" Color: uicursearch #ff5fff 207 magenta -" Color: errorred #ff005f 197 red -" Term colors: light0 light1 light2 light3 light4 light5 light6 light7 -" Term colors: light8 light9 light10 light11 light12 light13 light14 light15 -" Background: any " vim: et ts=8 sw=2 sts=2 diff --git a/runtime/colors/retrobox.vim b/runtime/colors/retrobox.vim index 9042f00604..5ebffa210a 100644 --- a/runtime/colors/retrobox.vim +++ b/runtime/colors/retrobox.vim @@ -1,893 +1,644 @@ " Name: Retro Box " Description: Retro groove color scheme similar to gruvbox originally designed by morhetz " Author: Maxim Kim , ported from gruvbox8 of Lifepillar -" Maintainer: Maxim Kim , ported from gruvbox8 of Lifepillar -" Website: https://www.github.com/vim/colorschemes -" License: Vim License (see `:help license`) -" Last Change: 2025 Feb 15 +" URL: https://www.github.com/vim/colorschemes +" Last Change: 2025 Oct 08 -" Generated by Colortemplate v2.2.3 +" Generated by Colortemplate v3.0.0-beta10 hi clear let g:colors_name = 'retrobox' -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 +hi! link CurSearch IncSearch hi! link CursorColumn CursorLine +hi! link CursorLineFold FoldColumn +hi! link CursorLineSign FoldColumn +hi! link LineNrAbove LineNr +hi! link LineNrBelow LineNr +hi! link MessageWindow PMenu +hi! link PopupNotification Todo +hi! link PreInsert LineNr hi! link StatusLineTerm StatusLine hi! link StatusLineTermNC StatusLineNC -hi! link VisualNOS Visual hi! link Tag Special -hi! link lCursor Cursor -hi! link MessageWindow PMenu -hi! link PopupNotification Todo -hi! link PopupSelected PmenuSel -hi! link CurSearch IncSearch hi! link Terminal Normal +hi! link VisualNOS Visual +hi! link lCursor Cursor -if &background ==# 'dark' - if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#1c1c1c', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#a89984', '#928374', '#fb4934', '#b8bb26', '#fabd2f', '#83a598', '#d3869b', '#8ec07c', '#ebdbb2'] - endif - hi Normal guifg=#ebdbb2 guibg=#1c1c1c gui=NONE cterm=NONE - hi CursorLineNr guifg=#fabd2f guibg=#1c1c1c gui=bold cterm=bold - hi FoldColumn guifg=#928374 guibg=#1c1c1c gui=NONE cterm=NONE - hi SignColumn guifg=#928374 guibg=#1c1c1c gui=NONE cterm=NONE - hi VertSplit guifg=#303030 guibg=#1c1c1c gui=NONE cterm=NONE - hi ColorColumn guifg=NONE guibg=#000000 gui=NONE cterm=NONE - hi Comment guifg=#928374 guibg=NONE gui=NONE cterm=NONE - hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE - hi Error guifg=#fb4934 guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse - hi ErrorMsg guifg=#1c1c1c guibg=#fb4934 gui=bold cterm=bold - hi Folded guifg=#928374 guibg=#121212 gui=NONE cterm=NONE - hi LineNr guifg=#7c6f64 guibg=NONE gui=NONE cterm=NONE - hi MatchParen guifg=NONE guibg=#504945 gui=bold,underline cterm=bold,underline - hi NonText guifg=#504945 guibg=NONE gui=NONE cterm=NONE - hi Pmenu guifg=#ebdbb2 guibg=#3c3836 gui=NONE cterm=NONE - hi PmenuSbar guifg=NONE guibg=#3c3836 gui=NONE cterm=NONE - hi PmenuSel guifg=#3c3836 guibg=#83a598 gui=bold cterm=bold - hi PmenuThumb guifg=NONE guibg=#7c6f64 gui=NONE cterm=NONE - hi PmenuKind guifg=#fb4934 guibg=#3c3836 gui=NONE cterm=NONE - hi PmenuKindSel guifg=#fb4934 guibg=#83a598 gui=NONE cterm=NONE - hi PmenuExtra guifg=#a89984 guibg=#3c3836 gui=NONE cterm=NONE - hi PmenuExtraSel guifg=#303030 guibg=#83a598 gui=NONE cterm=NONE - hi PmenuMatch guifg=#b16286 guibg=#3c3836 gui=NONE cterm=NONE - hi PmenuMatchSel guifg=#b16286 guibg=#83a598 gui=bold cterm=bold - hi SpecialKey guifg=#928374 guibg=NONE gui=NONE cterm=NONE - hi StatusLine guifg=#504945 guibg=#ebdbb2 gui=bold,reverse cterm=bold,reverse - hi StatusLineNC guifg=#3c3836 guibg=#a89984 gui=reverse cterm=reverse - hi TabLine guifg=#a89984 guibg=#3c3836 gui=NONE cterm=NONE - hi TabLineFill guifg=#ebdbb2 guibg=#3c3836 gui=NONE cterm=NONE - hi TabLineSel guifg=#fbf1c7 guibg=#1c1c1c gui=bold cterm=bold - hi ToolbarButton guifg=#fbf1c7 guibg=#303030 gui=bold cterm=bold - hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi Visual guifg=#1c1c1c guibg=#83a598 gui=NONE cterm=NONE - hi WildMenu guifg=#83a598 guibg=#504945 gui=bold cterm=bold - hi EndOfBuffer guifg=#504945 guibg=NONE gui=NONE cterm=NONE - hi Conceal guifg=#504945 guibg=NONE gui=NONE cterm=NONE - hi Cursor guifg=#1c1c1c guibg=#fbf1c7 gui=NONE cterm=NONE - hi DiffAdd guifg=#b8bb26 guibg=#1c1c1c gui=reverse cterm=reverse - hi DiffChange guifg=#8ec07c guibg=#1c1c1c gui=reverse cterm=reverse - hi DiffDelete guifg=#fb4934 guibg=#1c1c1c gui=reverse cterm=reverse - hi DiffText guifg=#fabd2f guibg=#1c1c1c gui=reverse cterm=reverse - hi Directory guifg=#b8bb26 guibg=NONE gui=bold cterm=bold - hi IncSearch guifg=#fe8019 guibg=#1c1c1c gui=reverse cterm=reverse - hi ModeMsg guifg=#fabd2f guibg=NONE gui=bold cterm=bold - hi MoreMsg guifg=#fabd2f guibg=NONE gui=bold cterm=bold - hi Question guifg=#fe8019 guibg=NONE gui=bold cterm=bold - hi Search guifg=#98971a guibg=#1c1c1c gui=reverse cterm=reverse - hi QuickFixLine guifg=#8ec07c guibg=#1c1c1c gui=reverse cterm=reverse - hi SpellBad guifg=#fb4934 guibg=NONE guisp=#fb4934 gui=undercurl cterm=underline - hi SpellCap guifg=#83a598 guibg=NONE guisp=#83a598 gui=undercurl cterm=underline - hi SpellLocal guifg=#8ec07c guibg=NONE guisp=#8ec07c gui=undercurl cterm=underline - hi SpellRare guifg=#d3869b guibg=NONE guisp=#d3869b gui=undercurl cterm=underline - hi Title guifg=#b8bb26 guibg=NONE gui=bold cterm=bold - hi WarningMsg guifg=#fb4934 guibg=NONE gui=bold cterm=bold - hi Boolean guifg=#d3869b guibg=NONE gui=NONE cterm=NONE - hi Character guifg=#d3869b guibg=NONE gui=NONE cterm=NONE - hi Conditional guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE - hi Constant guifg=#d3869b guibg=NONE gui=NONE cterm=NONE - hi Define guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE - hi Debug guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE - hi Delimiter guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE - hi Error guifg=#fb4934 guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse - hi Exception guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE - hi Float guifg=#d3869b guibg=NONE gui=NONE cterm=NONE - hi Function guifg=#b8bb26 guibg=NONE gui=bold cterm=bold - hi Identifier guifg=#83a598 guibg=NONE gui=NONE cterm=NONE - hi Ignore guifg=fg guibg=NONE gui=NONE cterm=NONE - hi Include guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE - hi Keyword guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE - hi Label guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE - hi Macro guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE - hi Number guifg=#d3869b guibg=NONE gui=NONE cterm=NONE - hi Operator guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE - hi PreCondit guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE - hi PreProc guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE - hi Repeat guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE - hi SpecialChar guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE - hi SpecialComment guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE - hi Statement guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE - hi StorageClass guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE - hi Special guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE - hi String guifg=#b8bb26 guibg=NONE gui=NONE cterm=NONE - hi Structure guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE - hi Todo guifg=fg guibg=#1c1c1c gui=bold cterm=bold - hi Type guifg=#fabd2f guibg=NONE gui=NONE cterm=NONE - hi Typedef guifg=#fabd2f guibg=NONE gui=NONE cterm=NONE - hi Underlined guifg=#83a598 guibg=NONE gui=underline cterm=underline - hi CursorIM guifg=#1c1c1c guibg=#fbf1c7 gui=NONE cterm=NONE -else - " Light background - if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#3c3836', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#7c6f64', '#928374', '#9d0006', '#79740e', '#b57614', '#076678', '#8f3f71', '#427b58', '#fbf1c7'] - endif - hi Normal guifg=#3c3836 guibg=#fbf1c7 gui=NONE cterm=NONE - hi CursorLineNr guifg=#b57614 guibg=#fbf1c7 gui=bold cterm=bold - hi FoldColumn guifg=#928374 guibg=#fbf1c7 gui=NONE cterm=NONE - hi SignColumn guifg=#3c3836 guibg=#fbf1c7 gui=NONE cterm=NONE - hi VertSplit guifg=#bdae93 guibg=#fbf1c7 gui=NONE cterm=NONE - hi ColorColumn guifg=NONE guibg=#ebe1b7 gui=NONE cterm=NONE - hi Comment guifg=#928374 guibg=NONE gui=NONE cterm=NONE - hi CursorLine guifg=NONE guibg=#e5d4b1 gui=NONE cterm=NONE - hi Error guifg=#9d0006 guibg=#fbf1c7 gui=bold,reverse cterm=bold,reverse - hi ErrorMsg guifg=#fbf1c7 guibg=#9d0006 gui=bold cterm=bold - hi Folded guifg=#928374 guibg=#ffffd7 gui=NONE cterm=NONE - hi LineNr guifg=#a89984 guibg=NONE gui=NONE cterm=NONE - hi MatchParen guifg=NONE guibg=#e5d4b1 gui=bold,underline cterm=bold,underline - hi NonText guifg=#e5d4b1 guibg=NONE gui=NONE cterm=NONE - hi Pmenu guifg=#3c3836 guibg=#e5d4b1 gui=NONE cterm=NONE - hi PmenuSbar guifg=NONE guibg=#e5d4b1 gui=NONE cterm=NONE - hi PmenuSel guifg=#e5d4b1 guibg=#076678 gui=bold cterm=bold - hi PmenuThumb guifg=NONE guibg=#a89984 gui=NONE cterm=NONE - hi PmenuKind guifg=#9d0006 guibg=#e5d4b1 gui=NONE cterm=NONE - hi PmenuKindSel guifg=#9d0006 guibg=#076678 gui=NONE cterm=NONE - hi PmenuExtra guifg=#7c6f64 guibg=#e5d4b1 gui=NONE cterm=NONE - hi PmenuExtraSel guifg=#bdae93 guibg=#076678 gui=NONE cterm=NONE - hi PmenuMatch guifg=#8f3f71 guibg=#e5d4b1 gui=NONE cterm=NONE - hi PmenuMatchSel guifg=#d3869b guibg=#076678 gui=bold cterm=bold - hi SpecialKey guifg=#928374 guibg=NONE gui=NONE cterm=NONE - hi StatusLine guifg=#bdae93 guibg=#3c3836 gui=bold,reverse cterm=bold,reverse - hi StatusLineNC guifg=#ebdbb2 guibg=#3c3836 gui=reverse cterm=reverse - hi TabLine guifg=#665c54 guibg=#ebdbb2 gui=NONE cterm=NONE - hi TabLineFill guifg=#3c3836 guibg=#ebdbb2 gui=NONE cterm=NONE - hi TabLineSel guifg=#282828 guibg=#fbf1c7 gui=bold cterm=bold - hi ToolbarButton guifg=#282828 guibg=#bdae93 gui=bold cterm=bold - hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi Visual guifg=#fbf1c7 guibg=#076678 gui=NONE cterm=NONE - hi WildMenu guifg=#076678 guibg=#e5d4b1 gui=bold cterm=bold - hi EndOfBuffer guifg=#e5d4b1 guibg=NONE gui=NONE cterm=NONE - hi Conceal guifg=#a89984 guibg=NONE gui=NONE cterm=NONE - hi Cursor guifg=#fbf1c7 guibg=#282828 gui=NONE cterm=NONE - hi DiffAdd guifg=#79740e guibg=#fbf1c7 gui=reverse cterm=reverse - hi DiffChange guifg=#427b58 guibg=#fbf1c7 gui=reverse cterm=reverse - hi DiffDelete guifg=#9d0006 guibg=#fbf1c7 gui=reverse cterm=reverse - hi DiffText guifg=#b57614 guibg=#fbf1c7 gui=reverse cterm=reverse - hi Directory guifg=#79740e guibg=NONE gui=bold cterm=bold - hi IncSearch guifg=#ff5f00 guibg=#fbf1c7 gui=reverse cterm=reverse - hi ModeMsg guifg=#3c3836 guibg=NONE gui=bold cterm=bold - hi MoreMsg guifg=#3c3836 guibg=NONE gui=bold cterm=bold - hi Question guifg=#ff5f00 guibg=NONE gui=bold cterm=bold - hi Search guifg=#98971a guibg=#fbf1c7 gui=reverse cterm=reverse - hi QuickFixLine guifg=#427b58 guibg=#fbf1c7 gui=reverse cterm=reverse - hi SpellBad guifg=#9d0006 guibg=NONE guisp=#9d0006 gui=undercurl cterm=underline - hi SpellCap guifg=#076678 guibg=NONE guisp=#076678 gui=undercurl cterm=underline - hi SpellLocal guifg=#427b58 guibg=NONE guisp=#427b58 gui=undercurl cterm=underline - hi SpellRare guifg=#8f3f71 guibg=NONE guisp=#8f3f71 gui=undercurl cterm=underline - hi Title guifg=#79740e guibg=NONE gui=bold cterm=bold - hi WarningMsg guifg=#9d0006 guibg=NONE gui=bold cterm=bold - hi Boolean guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE - hi Character guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE - hi Conditional guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE - hi Constant guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE - hi Define guifg=#427b58 guibg=NONE gui=NONE cterm=NONE - hi Debug guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE - hi Delimiter guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE - hi Error guifg=#9d0006 guibg=#fbf1c7 gui=bold,reverse cterm=bold,reverse - hi Exception guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE - hi Float guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE - hi Function guifg=#79740e guibg=NONE gui=bold cterm=bold - hi Identifier guifg=#076678 guibg=NONE gui=NONE cterm=NONE - hi Ignore guifg=fg guibg=NONE gui=NONE cterm=NONE - hi Include guifg=#427b58 guibg=NONE gui=NONE cterm=NONE - hi Keyword guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE - hi Label guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE - hi Macro guifg=#427b58 guibg=NONE gui=NONE cterm=NONE - hi Number guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE - hi Operator guifg=#427b58 guibg=NONE gui=NONE cterm=NONE - hi PreCondit guifg=#427b58 guibg=NONE gui=NONE cterm=NONE - hi PreProc guifg=#427b58 guibg=NONE gui=NONE cterm=NONE - hi Repeat guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE - hi SpecialChar guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE - hi SpecialComment guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE - hi Statement guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE - hi StorageClass guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE - hi Special guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE - hi String guifg=#79740e guibg=NONE gui=NONE cterm=NONE - hi Structure guifg=#427b58 guibg=NONE gui=NONE cterm=NONE - hi Todo guifg=fg guibg=#fbf1c7 gui=bold cterm=bold - hi Type guifg=#b57614 guibg=NONE gui=NONE cterm=NONE - hi Typedef guifg=#b57614 guibg=NONE gui=NONE cterm=NONE - hi Underlined guifg=#076678 guibg=NONE gui=underline cterm=underline - hi CursorIM guifg=#fbf1c7 guibg=#282828 gui=NONE cterm=NONE -endif +if &background == 'dark' + let g:terminal_ansi_colors = ['#1c1c1c', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#a89984', '#928374', '#fb5944', '#b8bb26', '#fabd2f', '#83a598', '#d3869b', '#8ec07c', '#ebdbb2'] -if s:t_Co >= 256 - if &background ==# 'dark' - hi Normal ctermfg=187 ctermbg=234 cterm=NONE - hi CursorLineNr ctermfg=214 ctermbg=234 cterm=bold - hi FoldColumn ctermfg=102 ctermbg=234 cterm=NONE - hi SignColumn ctermfg=102 ctermbg=234 cterm=NONE - hi VertSplit ctermfg=236 ctermbg=234 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=16 cterm=NONE - hi Comment ctermfg=102 ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE - hi Error ctermfg=203 ctermbg=234 cterm=bold,reverse - hi ErrorMsg ctermfg=234 ctermbg=203 cterm=bold - hi Folded ctermfg=102 ctermbg=233 cterm=NONE - hi LineNr ctermfg=243 ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=NONE ctermbg=239 cterm=bold,underline - hi NonText ctermfg=239 ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=187 ctermbg=237 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=237 cterm=NONE - hi PmenuSel ctermfg=237 ctermbg=109 cterm=bold - hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE - hi PmenuKind ctermfg=203 ctermbg=237 cterm=NONE - hi PmenuKindSel ctermfg=203 ctermbg=109 cterm=NONE - hi PmenuExtra ctermfg=102 ctermbg=237 cterm=NONE - hi PmenuExtraSel ctermfg=236 ctermbg=109 cterm=NONE - hi PmenuMatch ctermfg=132 ctermbg=237 cterm=NONE - hi PmenuMatchSel ctermfg=132 ctermbg=109 cterm=bold - hi SpecialKey ctermfg=102 ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=239 ctermbg=187 cterm=bold,reverse - hi StatusLineNC ctermfg=237 ctermbg=102 cterm=reverse - hi TabLine ctermfg=102 ctermbg=237 cterm=NONE - hi TabLineFill ctermfg=187 ctermbg=237 cterm=NONE - hi TabLineSel ctermfg=230 ctermbg=234 cterm=bold - hi ToolbarButton ctermfg=230 ctermbg=236 cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi Visual ctermfg=234 ctermbg=109 cterm=NONE - hi WildMenu ctermfg=109 ctermbg=239 cterm=bold - hi EndOfBuffer ctermfg=239 ctermbg=NONE cterm=NONE - hi Conceal ctermfg=239 ctermbg=NONE cterm=NONE - hi Cursor ctermfg=234 ctermbg=230 cterm=NONE - hi DiffAdd ctermfg=142 ctermbg=234 cterm=reverse - hi DiffChange ctermfg=107 ctermbg=234 cterm=reverse - hi DiffDelete ctermfg=203 ctermbg=234 cterm=reverse - hi DiffText ctermfg=214 ctermbg=234 cterm=reverse - hi Directory ctermfg=142 ctermbg=NONE cterm=bold - hi IncSearch ctermfg=208 ctermbg=234 cterm=reverse - hi ModeMsg ctermfg=214 ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=214 ctermbg=NONE cterm=bold - hi Question ctermfg=208 ctermbg=NONE cterm=bold - hi Search ctermfg=100 ctermbg=234 cterm=reverse - hi QuickFixLine ctermfg=107 ctermbg=234 cterm=reverse - hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=109 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=107 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=175 ctermbg=NONE cterm=underline - hi Title ctermfg=142 ctermbg=NONE cterm=bold - hi WarningMsg ctermfg=203 ctermbg=NONE cterm=bold - hi Boolean ctermfg=175 ctermbg=NONE cterm=NONE - hi Character ctermfg=175 ctermbg=NONE cterm=NONE - hi Conditional ctermfg=203 ctermbg=NONE cterm=NONE - hi Constant ctermfg=175 ctermbg=NONE cterm=NONE - hi Define ctermfg=107 ctermbg=NONE cterm=NONE - hi Debug ctermfg=203 ctermbg=NONE cterm=NONE - hi Delimiter ctermfg=208 ctermbg=NONE cterm=NONE - hi Error ctermfg=203 ctermbg=234 cterm=bold,reverse - hi Exception ctermfg=203 ctermbg=NONE cterm=NONE - hi Float ctermfg=175 ctermbg=NONE cterm=NONE - hi Function ctermfg=142 ctermbg=NONE cterm=bold - hi Identifier ctermfg=109 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE - hi Include ctermfg=107 ctermbg=NONE cterm=NONE - hi Keyword ctermfg=203 ctermbg=NONE cterm=NONE - hi Label ctermfg=203 ctermbg=NONE cterm=NONE - hi Macro ctermfg=107 ctermbg=NONE cterm=NONE - hi Number ctermfg=175 ctermbg=NONE cterm=NONE - hi Operator ctermfg=107 ctermbg=NONE cterm=NONE - hi PreCondit ctermfg=107 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=107 ctermbg=NONE cterm=NONE - hi Repeat ctermfg=203 ctermbg=NONE cterm=NONE - hi SpecialChar ctermfg=203 ctermbg=NONE cterm=NONE - hi SpecialComment ctermfg=203 ctermbg=NONE cterm=NONE - hi Statement ctermfg=203 ctermbg=NONE cterm=NONE - hi StorageClass ctermfg=208 ctermbg=NONE cterm=NONE - hi Special ctermfg=208 ctermbg=NONE cterm=NONE - hi String ctermfg=142 ctermbg=NONE cterm=NONE - hi Structure ctermfg=107 ctermbg=NONE cterm=NONE - hi Todo ctermfg=fg ctermbg=234 cterm=bold - hi Type ctermfg=214 ctermbg=NONE cterm=NONE - hi Typedef ctermfg=214 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=109 ctermbg=NONE cterm=underline - hi CursorIM ctermfg=234 ctermbg=230 cterm=NONE - else - " Light background - hi Normal ctermfg=237 ctermbg=230 cterm=NONE - hi CursorLineNr ctermfg=172 ctermbg=230 cterm=bold - hi FoldColumn ctermfg=102 ctermbg=230 cterm=NONE - hi SignColumn ctermfg=237 ctermbg=230 cterm=NONE - hi VertSplit ctermfg=144 ctermbg=230 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=229 cterm=NONE - hi Comment ctermfg=102 ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=188 cterm=NONE - hi Error ctermfg=124 ctermbg=230 cterm=bold,reverse - hi ErrorMsg ctermfg=230 ctermbg=124 cterm=bold - hi Folded ctermfg=102 ctermbg=231 cterm=NONE - hi LineNr ctermfg=137 ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=NONE ctermbg=188 cterm=bold,underline - hi NonText ctermfg=188 ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=237 ctermbg=188 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=188 cterm=NONE - hi PmenuSel ctermfg=188 ctermbg=23 cterm=bold - hi PmenuThumb ctermfg=NONE ctermbg=137 cterm=NONE - hi PmenuKind ctermfg=124 ctermbg=188 cterm=NONE - hi PmenuKindSel ctermfg=124 ctermbg=23 cterm=NONE - hi PmenuExtra ctermfg=243 ctermbg=188 cterm=NONE - hi PmenuExtraSel ctermfg=144 ctermbg=23 cterm=NONE - hi PmenuMatch ctermfg=126 ctermbg=188 cterm=NONE - hi PmenuMatchSel ctermfg=175 ctermbg=23 cterm=bold - hi SpecialKey ctermfg=102 ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=144 ctermbg=237 cterm=bold,reverse - hi StatusLineNC ctermfg=187 ctermbg=237 cterm=reverse - hi TabLine ctermfg=59 ctermbg=187 cterm=NONE - hi TabLineFill ctermfg=237 ctermbg=187 cterm=NONE - hi TabLineSel ctermfg=235 ctermbg=230 cterm=bold - hi ToolbarButton ctermfg=235 ctermbg=144 cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi Visual ctermfg=230 ctermbg=23 cterm=NONE - hi WildMenu ctermfg=23 ctermbg=188 cterm=bold - hi EndOfBuffer ctermfg=188 ctermbg=NONE cterm=NONE - hi Conceal ctermfg=137 ctermbg=NONE cterm=NONE - hi Cursor ctermfg=230 ctermbg=235 cterm=NONE - hi DiffAdd ctermfg=64 ctermbg=230 cterm=reverse - hi DiffChange ctermfg=29 ctermbg=230 cterm=reverse - hi DiffDelete ctermfg=124 ctermbg=230 cterm=reverse - hi DiffText ctermfg=172 ctermbg=230 cterm=reverse - hi Directory ctermfg=64 ctermbg=NONE cterm=bold - hi IncSearch ctermfg=202 ctermbg=230 cterm=reverse - hi ModeMsg ctermfg=237 ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=237 ctermbg=NONE cterm=bold - hi Question ctermfg=202 ctermbg=NONE cterm=bold - hi Search ctermfg=100 ctermbg=230 cterm=reverse - hi QuickFixLine ctermfg=29 ctermbg=230 cterm=reverse - hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=29 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=126 ctermbg=NONE cterm=underline - hi Title ctermfg=64 ctermbg=NONE cterm=bold - hi WarningMsg ctermfg=124 ctermbg=NONE cterm=bold - hi Boolean ctermfg=126 ctermbg=NONE cterm=NONE - hi Character ctermfg=126 ctermbg=NONE cterm=NONE - hi Conditional ctermfg=124 ctermbg=NONE cterm=NONE - hi Constant ctermfg=126 ctermbg=NONE cterm=NONE - hi Define ctermfg=29 ctermbg=NONE cterm=NONE - hi Debug ctermfg=124 ctermbg=NONE cterm=NONE - hi Delimiter ctermfg=202 ctermbg=NONE cterm=NONE - hi Error ctermfg=124 ctermbg=230 cterm=bold,reverse - hi Exception ctermfg=124 ctermbg=NONE cterm=NONE - hi Float ctermfg=126 ctermbg=NONE cterm=NONE - hi Function ctermfg=64 ctermbg=NONE cterm=bold - hi Identifier ctermfg=23 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE - hi Include ctermfg=29 ctermbg=NONE cterm=NONE - hi Keyword ctermfg=124 ctermbg=NONE cterm=NONE - hi Label ctermfg=124 ctermbg=NONE cterm=NONE - hi Macro ctermfg=29 ctermbg=NONE cterm=NONE - hi Number ctermfg=126 ctermbg=NONE cterm=NONE - hi Operator ctermfg=29 ctermbg=NONE cterm=NONE - hi PreCondit ctermfg=29 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=29 ctermbg=NONE cterm=NONE - hi Repeat ctermfg=124 ctermbg=NONE cterm=NONE - hi SpecialChar ctermfg=124 ctermbg=NONE cterm=NONE - hi SpecialComment ctermfg=124 ctermbg=NONE cterm=NONE - hi Statement ctermfg=124 ctermbg=NONE cterm=NONE - hi StorageClass ctermfg=202 ctermbg=NONE cterm=NONE - hi Special ctermfg=202 ctermbg=NONE cterm=NONE - hi String ctermfg=64 ctermbg=NONE cterm=NONE - hi Structure ctermfg=29 ctermbg=NONE cterm=NONE - hi Todo ctermfg=fg ctermbg=230 cterm=bold - hi Type ctermfg=172 ctermbg=NONE cterm=NONE - hi Typedef ctermfg=172 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=23 ctermbg=NONE cterm=underline - hi CursorIM ctermfg=230 ctermbg=235 cterm=NONE + hi Normal guifg=#ebdbb2 guibg=#1c1c1c guisp=NONE gui=NONE ctermfg=187 ctermbg=234 cterm=NONE term=NONE + hi Boolean guifg=#d3869b guibg=NONE guisp=NONE gui=NONE ctermfg=175 ctermbg=NONE cterm=NONE term=NONE + hi Character guifg=#d3869b guibg=NONE guisp=NONE gui=NONE ctermfg=175 ctermbg=NONE cterm=NONE term=NONE + hi ColorColumn guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse + hi Comment guifg=#928374 guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=bold + hi Conceal guifg=#504945 guibg=NONE guisp=NONE gui=NONE ctermfg=239 ctermbg=NONE cterm=NONE term=NONE + hi Conditional guifg=#fb5944 guibg=NONE guisp=NONE gui=NONE ctermfg=203 ctermbg=NONE cterm=NONE term=NONE + hi Constant guifg=#d3869b guibg=NONE guisp=NONE gui=NONE ctermfg=175 ctermbg=NONE cterm=NONE term=NONE + hi Cursor guifg=#1c1c1c guibg=#fbf1c7 guisp=NONE gui=NONE ctermfg=234 ctermbg=230 cterm=NONE term=reverse + hi CursorIM guifg=#1c1c1c guibg=#fbf1c7 guisp=NONE gui=NONE ctermfg=234 ctermbg=230 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=#fabd2f guibg=#1c1c1c guisp=NONE gui=bold ctermfg=214 ctermbg=234 cterm=bold term=bold + hi Debug guifg=#fb5944 guibg=NONE guisp=NONE gui=NONE ctermfg=203 ctermbg=NONE cterm=NONE term=NONE + hi Define guifg=#8ec07c guibg=NONE guisp=NONE gui=NONE ctermfg=107 ctermbg=NONE cterm=NONE term=NONE + hi Delimiter guifg=#fe8019 guibg=NONE guisp=NONE gui=NONE ctermfg=208 ctermbg=NONE cterm=NONE term=NONE + hi DiffAdd guifg=NONE guibg=#273923 guisp=NONE gui=NONE ctermfg=230 ctermbg=22 cterm=NONE term=reverse + hi DiffChange guifg=NONE guibg=#37352f guisp=NONE gui=NONE ctermfg=230 ctermbg=59 cterm=NONE term=NONE + hi DiffDelete guifg=#a89984 guibg=#2f1f1a guisp=NONE gui=NONE ctermfg=102 ctermbg=52 cterm=NONE term=reverse + hi DiffText guifg=NONE guibg=#0f4f4f guisp=NONE gui=NONE ctermfg=230 ctermbg=23 cterm=NONE term=reverse + hi Directory guifg=#b8bb26 guibg=NONE guisp=NONE gui=bold ctermfg=142 ctermbg=NONE cterm=bold term=NONE + hi EndOfBuffer guifg=#504945 guibg=NONE guisp=NONE gui=NONE ctermfg=239 ctermbg=NONE cterm=NONE term=NONE + hi Error guifg=#fb5944 guibg=#1c1c1c guisp=NONE gui=bold,reverse ctermfg=203 ctermbg=234 cterm=bold,reverse term=bold,reverse + hi ErrorMsg guifg=#1c1c1c guibg=#fb5944 guisp=NONE gui=bold ctermfg=234 ctermbg=203 cterm=bold term=bold,reverse + hi Exception guifg=#fb5944 guibg=NONE guisp=NONE gui=NONE ctermfg=203 ctermbg=NONE cterm=NONE term=NONE + hi Float guifg=#d3869b guibg=NONE guisp=NONE gui=NONE ctermfg=175 ctermbg=NONE cterm=NONE term=NONE + hi FoldColumn guifg=#928374 guibg=#1c1c1c guisp=NONE gui=NONE ctermfg=102 ctermbg=234 cterm=NONE term=NONE + hi Folded guifg=#928374 guibg=#121212 guisp=NONE gui=NONE ctermfg=102 ctermbg=233 cterm=NONE term=NONE + hi Function guifg=#b8bb26 guibg=NONE guisp=NONE gui=bold ctermfg=142 ctermbg=NONE cterm=bold term=NONE + hi Identifier guifg=#83a598 guibg=NONE guisp=NONE gui=NONE ctermfg=109 ctermbg=NONE cterm=NONE term=NONE + hi Ignore guifg=fg guibg=NONE guisp=NONE gui=NONE ctermfg=fg ctermbg=NONE cterm=NONE term=NONE + hi IncSearch guifg=NONE guibg=#5f431f guisp=NONE gui=NONE ctermfg=208 ctermbg=234 cterm=reverse term=bold,reverse,underline + hi Include guifg=#8ec07c guibg=NONE guisp=NONE gui=NONE ctermfg=107 ctermbg=NONE cterm=NONE term=NONE + hi Keyword guifg=#fb5944 guibg=NONE guisp=NONE gui=NONE ctermfg=203 ctermbg=NONE cterm=NONE term=NONE + hi Label guifg=#fb5944 guibg=NONE guisp=NONE gui=NONE ctermfg=203 ctermbg=NONE cterm=NONE term=NONE + hi LineNr guifg=#7c6f64 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE + hi Macro guifg=#8ec07c guibg=NONE guisp=NONE gui=NONE ctermfg=107 ctermbg=NONE cterm=NONE term=NONE + hi MatchParen guifg=NONE guibg=#504945 guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=239 cterm=bold,underline term=bold,underline + hi ModeMsg guifg=#fabd2f guibg=NONE guisp=NONE gui=bold ctermfg=214 ctermbg=NONE cterm=bold term=bold + hi MoreMsg guifg=#fabd2f guibg=NONE guisp=NONE gui=bold ctermfg=214 ctermbg=NONE cterm=bold term=NONE + hi NonText guifg=#504945 guibg=NONE guisp=NONE gui=NONE ctermfg=239 ctermbg=NONE cterm=NONE term=NONE + hi Number guifg=#d3869b guibg=NONE guisp=NONE gui=NONE ctermfg=175 ctermbg=NONE cterm=NONE term=NONE + hi Operator guifg=#8ec07c guibg=NONE guisp=NONE gui=NONE ctermfg=107 ctermbg=NONE cterm=NONE term=NONE + hi Pmenu guifg=NONE guibg=#3c3836 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=reverse + hi PmenuBorder guifg=#a89984 guibg=#3c3836 guisp=NONE gui=NONE ctermfg=102 ctermbg=237 cterm=NONE term=NONE + hi PmenuExtra guifg=#a89984 guibg=#3c3836 guisp=NONE gui=NONE ctermfg=102 ctermbg=237 cterm=NONE term=NONE + hi PmenuExtraSel guifg=#a89984 guibg=#504945 guisp=NONE gui=NONE ctermfg=102 ctermbg=239 cterm=NONE term=NONE + hi PmenuKind guifg=#fb5944 guibg=#3c3836 guisp=NONE gui=NONE ctermfg=203 ctermbg=237 cterm=NONE term=NONE + hi PmenuKindSel guifg=#fb5944 guibg=#504945 guisp=NONE gui=NONE ctermfg=203 ctermbg=239 cterm=NONE term=NONE + hi PmenuMatch guifg=#d3869b guibg=#3c3836 guisp=NONE gui=NONE ctermfg=175 ctermbg=237 cterm=NONE term=NONE + hi PmenuMatchSel guifg=#d3869b guibg=#504945 guisp=NONE gui=NONE ctermfg=175 ctermbg=239 cterm=NONE term=NONE + hi PmenuSbar guifg=NONE guibg=#3c3836 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=reverse + hi PmenuSel guifg=NONE guibg=#504945 guisp=NONE gui=NONE ctermfg=NONE ctermbg=239 cterm=NONE term=bold + hi PmenuThumb guifg=NONE guibg=#7c6f64 guisp=NONE gui=NONE ctermfg=NONE ctermbg=243 cterm=NONE term=NONE + hi PreCondit guifg=#8ec07c guibg=NONE guisp=NONE gui=NONE ctermfg=107 ctermbg=NONE cterm=NONE term=NONE + hi PreProc guifg=#8ec07c guibg=NONE guisp=NONE gui=NONE ctermfg=107 ctermbg=NONE cterm=NONE term=NONE + hi Question guifg=#fe8019 guibg=NONE guisp=NONE gui=bold ctermfg=208 ctermbg=NONE cterm=bold term=standout + hi QuickFixLine guifg=NONE guibg=#4f2f4f guisp=NONE gui=NONE ctermfg=230 ctermbg=53 cterm=NONE term=NONE + hi Repeat guifg=#fb5944 guibg=NONE guisp=NONE gui=NONE ctermfg=203 ctermbg=NONE cterm=NONE term=NONE + hi Search guifg=NONE guibg=#3a4a3a guisp=NONE gui=NONE ctermfg=100 ctermbg=234 cterm=reverse term=reverse + hi SignColumn guifg=#928374 guibg=#1c1c1c guisp=NONE gui=NONE ctermfg=102 ctermbg=234 cterm=NONE term=reverse + hi Special guifg=#fe8019 guibg=NONE guisp=NONE gui=NONE ctermfg=208 ctermbg=NONE cterm=NONE term=NONE + hi SpecialChar guifg=#fb5944 guibg=NONE guisp=NONE gui=NONE ctermfg=203 ctermbg=NONE cterm=NONE term=NONE + hi SpecialComment guifg=#fb5944 guibg=NONE guisp=NONE gui=NONE ctermfg=203 ctermbg=NONE cterm=NONE term=NONE + hi SpecialKey guifg=#928374 guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=bold + hi SpellBad guifg=#fb5944 guibg=NONE guisp=#fb5944 gui=undercurl ctermfg=203 ctermbg=NONE cterm=underline term=underline + hi SpellCap guifg=#83a598 guibg=NONE guisp=#83a598 gui=undercurl ctermfg=109 ctermbg=NONE cterm=underline term=underline + hi SpellLocal guifg=#8ec07c guibg=NONE guisp=#8ec07c gui=undercurl ctermfg=107 ctermbg=NONE cterm=underline term=underline + hi SpellRare guifg=#d3869b guibg=NONE guisp=#d3869b gui=undercurl ctermfg=175 ctermbg=NONE cterm=underline term=underline + hi Statement guifg=#fb5944 guibg=NONE guisp=NONE gui=NONE ctermfg=203 ctermbg=NONE cterm=NONE term=NONE + hi StatusLine guifg=#504945 guibg=#ebdbb2 guisp=NONE gui=bold,reverse ctermfg=239 ctermbg=187 cterm=bold,reverse term=bold,reverse + hi StatusLineNC guifg=#3c3836 guibg=#a89984 guisp=NONE gui=reverse ctermfg=237 ctermbg=102 cterm=reverse term=bold,underline + hi StorageClass guifg=#fe8019 guibg=NONE guisp=NONE gui=NONE ctermfg=208 ctermbg=NONE cterm=NONE term=NONE + hi String guifg=#b8bb26 guibg=NONE guisp=NONE gui=NONE ctermfg=142 ctermbg=NONE cterm=NONE term=NONE + hi Structure guifg=#8ec07c guibg=NONE guisp=NONE gui=NONE ctermfg=107 ctermbg=NONE cterm=NONE term=NONE + hi TabLine guifg=#a89984 guibg=#3c3836 guisp=NONE gui=NONE ctermfg=102 ctermbg=237 cterm=NONE term=bold,underline + hi TabLineFill guifg=#ebdbb2 guibg=#3c3836 guisp=NONE gui=NONE ctermfg=187 ctermbg=237 cterm=NONE term=NONE + hi TabLineSel guifg=#fbf1c7 guibg=#1c1c1c guisp=NONE gui=bold ctermfg=230 ctermbg=234 cterm=bold term=bold,reverse + hi Title guifg=#b8bb26 guibg=NONE guisp=NONE gui=bold ctermfg=142 ctermbg=NONE cterm=bold term=NONE + hi TitleBar guifg=#ebdbb2 guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=187 ctermbg=237 cterm=NONE term=NONE + hi TitleBarNC guifg=#a89984 guibg=#2c2c2c guisp=NONE gui=NONE ctermfg=102 ctermbg=236 cterm=NONE term=NONE + hi Todo guifg=fg guibg=#1c1c1c guisp=NONE gui=bold ctermfg=fg ctermbg=234 cterm=bold term=bold,reverse + hi ToolbarButton guifg=#fbf1c7 guibg=#303030 guisp=NONE gui=bold ctermfg=230 ctermbg=236 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=#fabd2f guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=NONE + hi Typedef guifg=#fabd2f guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=NONE + hi Underlined guifg=#83a598 guibg=NONE guisp=NONE gui=underline ctermfg=109 ctermbg=NONE cterm=underline term=underline + hi VertSplit guifg=#303030 guibg=#1c1c1c guisp=NONE gui=NONE ctermfg=236 ctermbg=234 cterm=NONE term=NONE + hi Visual guifg=NONE guibg=#2a405a guisp=NONE gui=NONE ctermfg=109 ctermbg=234 cterm=reverse term=reverse + hi WarningMsg guifg=#fb5944 guibg=NONE guisp=NONE gui=bold ctermfg=203 ctermbg=NONE cterm=bold term=standout + hi WildMenu guifg=#83a598 guibg=#504945 guisp=NONE gui=bold ctermfg=109 ctermbg=239 cterm=bold term=bold + + if s:tgc || s:t_Co >= 256 + if s:tgc + hi IncSearch cterm=NONE + hi QuickFixLine cterm=NONE + hi Search cterm=NONE + hi Visual cterm=NONE + endif + finish endif - unlet s:t_Co - finish -endif -if s:t_Co >= 16 - if &background ==# 'dark' + if s:t_Co >= 16 hi Normal ctermfg=White ctermbg=Black cterm=NONE + hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE + hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=Black ctermbg=DarkYellow cterm=NONE hi Comment ctermfg=DarkGray ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE - hi Error ctermfg=Red ctermbg=Black cterm=reverse - hi ErrorMsg ctermfg=Black ctermbg=Red cterm=NONE - hi FoldColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE - hi Folded ctermfg=DarkGray ctermbg=NONE cterm=NONE - hi LineNr ctermfg=DarkGray ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=NONE ctermbg=Black cterm=bold,underline - hi NonText ctermfg=DarkGray ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=White ctermbg=DarkGray cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=DarkGray cterm=NONE - hi PmenuSel ctermfg=Black ctermbg=Blue cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE - hi PmenuKind ctermfg=DarkRed ctermbg=DarkGray cterm=NONE - hi PmenuKindSel ctermfg=DarkRed ctermbg=Blue cterm=NONE - hi PmenuExtra ctermfg=gray ctermbg=DarkGray cterm=NONE - hi PmenuExtraSel ctermfg=Black ctermbg=Blue cterm=NONE - hi PmenuMatch ctermfg=White ctermbg=DarkGray cterm=bold - hi PmenuMatchSel ctermfg=Black ctermbg=Blue cterm=bold - hi SignColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=DarkGray ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=gray ctermbg=Black cterm=bold,reverse - hi StatusLineNC ctermfg=gray ctermbg=Black cterm=reverse - hi TabLine ctermfg=Black ctermbg=DarkGray cterm=NONE - hi TabLineFill ctermfg=Black ctermbg=DarkGray cterm=NONE - hi TabLineSel ctermfg=White ctermbg=Black cterm=bold - hi ToolbarButton ctermfg=White ctermbg=DarkGray cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi VertSplit ctermfg=Black ctermbg=gray cterm=NONE - hi Visual ctermfg=Black ctermbg=Blue cterm=NONE - hi WildMenu ctermfg=White ctermbg=Black cterm=bold - hi EndOfBuffer ctermfg=DarkGray ctermbg=NONE cterm=NONE hi Conceal ctermfg=DarkGray ctermbg=NONE cterm=NONE - hi Cursor ctermfg=Black ctermbg=White cterm=NONE - hi DiffAdd ctermfg=Green ctermbg=Black cterm=reverse - hi DiffChange ctermfg=Cyan ctermbg=Black cterm=reverse - hi DiffDelete ctermfg=Red ctermbg=Black cterm=reverse - hi DiffText ctermfg=Yellow ctermbg=Black cterm=reverse - hi Directory ctermfg=Green ctermbg=NONE cterm=bold - hi IncSearch ctermfg=Magenta ctermbg=Black cterm=reverse - hi ModeMsg ctermfg=Yellow ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=Yellow ctermbg=NONE cterm=bold - hi Question ctermfg=Magenta ctermbg=NONE cterm=bold - hi Search ctermfg=DarkGreen ctermbg=Black cterm=reverse - hi QuickFixLine ctermfg=Cyan ctermbg=Black cterm=reverse - hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline - hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline - hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline - hi Title ctermfg=Green ctermbg=NONE cterm=bold - hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold - hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Cursor ctermfg=Black ctermbg=White cterm=NONE + hi CursorIM ctermfg=Black ctermbg=White cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE hi Debug ctermfg=Red ctermbg=NONE cterm=NONE + hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Error ctermfg=Red ctermbg=Black cterm=bold,reverse + hi DiffAdd ctermfg=Black ctermbg=darkgreen cterm=NONE + hi DiffChange ctermfg=Black ctermbg=darkyellow cterm=NONE + hi DiffDelete ctermfg=Black ctermbg=darkred cterm=NONE + hi DiffText ctermfg=Black ctermbg=darkcyan cterm=NONE + hi Directory ctermfg=Green ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=DarkGray ctermbg=NONE cterm=NONE + hi Error ctermfg=Red ctermbg=Black cterm=reverse + hi ErrorMsg ctermfg=Black ctermbg=Red cterm=NONE hi Exception ctermfg=Red ctermbg=NONE cterm=NONE hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE + hi Folded ctermfg=DarkGray ctermbg=NONE cterm=NONE hi Function ctermfg=Green ctermbg=NONE cterm=bold hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=Magenta ctermbg=Black cterm=reverse hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE hi Label ctermfg=Red ctermbg=NONE cterm=NONE + hi LineNr ctermfg=DarkGray ctermbg=NONE cterm=NONE hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=NONE ctermbg=Black cterm=bold,underline + hi ModeMsg ctermfg=Yellow ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=Yellow ctermbg=NONE cterm=bold + hi NonText ctermfg=DarkGray ctermbg=NONE cterm=NONE hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=Black ctermbg=White cterm=NONE + hi PmenuBorder ctermfg=Black ctermbg=White cterm=NONE + hi PmenuExtra ctermfg=DarkGray ctermbg=White cterm=NONE + hi PmenuExtraSel ctermfg=DarkGray ctermbg=Black cterm=NONE + hi PmenuKind ctermfg=DarkRed ctermbg=White cterm=NONE + hi PmenuKindSel ctermfg=DarkRed ctermbg=Black cterm=NONE + hi PmenuMatch ctermfg=Black ctermbg=White cterm=bold + hi PmenuMatchSel ctermfg=Black ctermbg=White cterm=bold,reverse + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=White ctermbg=Black cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Question ctermfg=Magenta ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=Black ctermbg=magenta cterm=NONE hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE + hi Search ctermfg=DarkGreen ctermbg=Black cterm=reverse + hi SignColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE + hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=DarkGray ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline + hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline + hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline hi Statement ctermfg=Red ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=gray ctermbg=Black cterm=bold,reverse + hi StatusLineNC ctermfg=gray ctermbg=Black cterm=reverse hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE hi String ctermfg=Green ctermbg=NONE cterm=NONE hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE + hi TabLine ctermfg=Black ctermbg=DarkGray cterm=NONE + hi TabLineFill ctermfg=Black ctermbg=DarkGray cterm=NONE + hi TabLineSel ctermfg=White ctermbg=Black cterm=bold + hi Title ctermfg=Green ctermbg=NONE cterm=bold + hi TitleBar ctermfg=White ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=gray ctermbg=black cterm=NONE hi Todo ctermfg=fg ctermbg=Black cterm=bold + hi ToolbarButton ctermfg=White ctermbg=DarkGray cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline - hi CursorIM ctermfg=Black ctermbg=White cterm=NONE - else - " Light background - hi Normal ctermfg=Black ctermbg=White cterm=NONE - hi ColorColumn ctermfg=White ctermbg=Grey cterm=NONE - hi Comment ctermfg=DarkGray ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE - hi Error ctermfg=Red ctermbg=White cterm=reverse - hi ErrorMsg ctermfg=White ctermbg=Red cterm=NONE - hi FoldColumn ctermfg=Grey ctermbg=NONE cterm=NONE - hi Folded ctermfg=Grey ctermbg=NONE cterm=NONE - hi LineNr ctermfg=Grey ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=NONE ctermbg=White cterm=bold,underline - hi NonText ctermfg=Grey ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=Black ctermbg=Grey cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=Grey cterm=NONE - hi PmenuSel ctermfg=White ctermbg=Blue cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE - hi PmenuKind ctermfg=DarkRed ctermbg=Grey cterm=NONE - hi PmenuKindSel ctermfg=DarkRed ctermbg=Blue cterm=NONE - hi PmenuExtra ctermfg=DarkGray ctermbg=Grey cterm=NONE - hi PmenuExtraSel ctermfg=White ctermbg=Blue cterm=NONE - hi PmenuMatch ctermfg=Black ctermbg=Grey cterm=bold - hi PmenuMatchSel ctermfg=White ctermbg=Blue cterm=bold - hi SignColumn ctermfg=Grey ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=Grey ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=DarkGray ctermbg=White cterm=bold,reverse - hi StatusLineNC ctermfg=Grey ctermbg=DarkGray cterm=reverse - hi TabLine ctermfg=DarkGray ctermbg=Grey cterm=NONE - hi TabLineFill ctermfg=White ctermbg=Grey cterm=NONE - hi TabLineSel ctermfg=DarkGray ctermbg=White cterm=bold - hi ToolbarButton ctermfg=Black ctermbg=Grey cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi VertSplit ctermfg=DarkGray ctermbg=Grey cterm=NONE - hi Visual ctermfg=White ctermbg=Blue cterm=NONE - hi WildMenu ctermfg=Black ctermbg=White cterm=bold - hi EndOfBuffer ctermfg=Grey ctermbg=NONE cterm=NONE - hi Conceal ctermfg=Grey ctermbg=NONE cterm=NONE - hi Cursor ctermfg=White ctermbg=DarkGray cterm=NONE - hi DiffAdd ctermfg=Green ctermbg=White cterm=reverse - hi DiffChange ctermfg=Cyan ctermbg=White cterm=reverse - hi DiffDelete ctermfg=Red ctermbg=White cterm=reverse - hi DiffText ctermfg=Yellow ctermbg=White cterm=reverse - hi Directory ctermfg=Green ctermbg=NONE cterm=bold - hi IncSearch ctermfg=Magenta ctermbg=White cterm=reverse - hi ModeMsg ctermfg=Black ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=Black ctermbg=NONE cterm=bold - hi Question ctermfg=Magenta ctermbg=NONE cterm=bold - hi Search ctermfg=DarkGreen ctermbg=White cterm=reverse - hi QuickFixLine ctermfg=Cyan ctermbg=White cterm=reverse - hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline - hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline - hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline - hi Title ctermfg=Green ctermbg=NONE cterm=bold + hi VertSplit ctermfg=Black ctermbg=gray cterm=NONE + hi Visual ctermfg=Blue ctermbg=Black cterm=reverse hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold + hi WildMenu ctermfg=White ctermbg=Black cterm=bold + finish + endif + + if s:t_Co >= 8 + hi Normal ctermfg=gray ctermbg=Black cterm=NONE hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE + hi ColorColumn ctermfg=Black ctermbg=gray cterm=NONE + hi Comment ctermfg=gray ctermbg=NONE cterm=bold + hi Conceal ctermfg=DarkGray ctermbg=NONE cterm=NONE hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Cursor ctermfg=Black ctermbg=White cterm=NONE + hi CursorIM ctermfg=Black ctermbg=White cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE hi Debug ctermfg=Red ctermbg=NONE cterm=NONE + hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Error ctermfg=Red ctermbg=White cterm=bold,reverse + hi DiffAdd ctermfg=Black ctermbg=darkgreen cterm=NONE + hi DiffChange ctermfg=Black ctermbg=darkyellow cterm=NONE + hi DiffDelete ctermfg=Black ctermbg=darkred cterm=NONE + hi DiffText ctermfg=Black ctermbg=darkcyan cterm=NONE + hi Directory ctermfg=Green ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=Red ctermbg=Black cterm=reverse + hi ErrorMsg ctermfg=Black ctermbg=Red cterm=NONE hi Exception ctermfg=Red ctermbg=NONE cterm=NONE hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=gray ctermbg=NONE cterm=NONE + hi Folded ctermfg=gray ctermbg=NONE cterm=NONE hi Function ctermfg=Green ctermbg=NONE cterm=bold hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=Magenta ctermbg=Black cterm=reverse hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE hi Label ctermfg=Red ctermbg=NONE cterm=NONE + hi LineNr ctermfg=gray ctermbg=NONE cterm=NONE hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=gray ctermbg=NONE cterm=bold,underline + hi ModeMsg ctermfg=Yellow ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=Yellow ctermbg=NONE cterm=bold + hi NonText ctermfg=gray ctermbg=NONE cterm=NONE hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuBorder ctermfg=gray ctermbg=DarkGray cterm=NONE + 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=Red cterm=reverse + hi PmenuMatchSel ctermfg=Red ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold + hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Question ctermfg=Magenta ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=White ctermbg=magenta cterm=NONE hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE + hi Search ctermfg=DarkGreen ctermbg=Black cterm=reverse + hi SignColumn ctermfg=gray ctermbg=NONE cterm=NONE + hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=gray ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline + hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline + hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline hi Statement ctermfg=Red ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=gray ctermbg=Black cterm=bold,reverse + hi StatusLineNC ctermfg=gray ctermbg=Black cterm=reverse hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE hi String ctermfg=Green ctermbg=NONE cterm=NONE hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE - hi Todo ctermfg=fg ctermbg=White cterm=bold - hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE - hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE - hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline - hi CursorIM ctermfg=White ctermbg=DarkGray cterm=NONE - endif - unlet s:t_Co - finish -endif - -if s:t_Co >= 8 - if &background ==# 'dark' - hi Normal ctermfg=gray ctermbg=Black cterm=NONE - hi ColorColumn ctermfg=Black ctermbg=gray cterm=NONE - hi Comment ctermfg=gray ctermbg=NONE cterm=bold - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE - hi Error ctermfg=Red ctermbg=Black cterm=reverse - hi ErrorMsg ctermfg=Black ctermbg=Red cterm=NONE - hi FoldColumn ctermfg=gray ctermbg=NONE cterm=NONE - hi Folded ctermfg=gray ctermbg=NONE cterm=NONE - hi LineNr ctermfg=gray ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=gray ctermbg=NONE cterm=bold,underline - hi NonText ctermfg=gray ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=DarkGray ctermbg=White cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=DarkGray cterm=NONE - hi PmenuSel ctermfg=Black ctermbg=Blue cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE - hi PmenuKind ctermfg=Red ctermbg=White cterm=NONE - hi PmenuKindSel ctermfg=Red ctermbg=Blue cterm=NONE - hi PmenuExtra ctermfg=DarkGray ctermbg=White cterm=NONE - hi PmenuExtraSel ctermfg=DarkGray ctermbg=Blue cterm=NONE - hi PmenuMatch ctermfg=DarkGray ctermbg=White cterm=bold - hi PmenuMatchSel ctermfg=Black ctermbg=Blue cterm=bold - hi SignColumn ctermfg=gray ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=gray ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=gray ctermbg=Black cterm=bold,reverse - hi StatusLineNC ctermfg=gray ctermbg=Black cterm=reverse hi TabLine ctermfg=Black ctermbg=gray cterm=NONE hi TabLineFill ctermfg=Black ctermbg=gray cterm=NONE hi TabLineSel ctermfg=gray ctermbg=Black cterm=NONE + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi TitleBar ctermfg=White ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=gray ctermbg=black cterm=NONE + hi Todo ctermfg=fg ctermbg=Black cterm=bold hi ToolbarButton ctermfg=Black ctermbg=gray cterm=bold hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE + hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE + hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline hi VertSplit ctermfg=Black ctermbg=gray cterm=NONE hi Visual ctermfg=Black ctermbg=Blue cterm=NONE - hi WildMenu ctermfg=Blue ctermbg=DarkGray cterm=bold - hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE - hi Conceal ctermfg=DarkGray ctermbg=NONE cterm=NONE - hi Cursor ctermfg=Black ctermbg=White cterm=NONE - hi DiffAdd ctermfg=Green ctermbg=Black cterm=reverse - hi DiffChange ctermfg=Cyan ctermbg=Black cterm=reverse - hi DiffDelete ctermfg=Red ctermbg=Black cterm=reverse - hi DiffText ctermfg=Yellow ctermbg=Black cterm=reverse - hi Directory ctermfg=Green ctermbg=NONE cterm=bold - hi IncSearch ctermfg=Magenta ctermbg=Black cterm=reverse - hi ModeMsg ctermfg=Yellow ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=Yellow ctermbg=NONE cterm=bold - hi Question ctermfg=Magenta ctermbg=NONE cterm=bold - hi Search ctermfg=DarkGreen ctermbg=Black cterm=reverse - hi QuickFixLine ctermfg=Cyan ctermbg=Black cterm=reverse - hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline - hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline - hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline - hi Title ctermfg=Green ctermbg=NONE cterm=bold hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold + hi WildMenu ctermfg=Blue ctermbg=DarkGray cterm=bold + finish + endif + + if s:t_Co >= 0 + hi CurSearch term=reverse + hi CursorColumn term=NONE + hi CursorLineFold term=underline + hi CursorLineSign term=underline + hi StatusLineTerm term=bold,reverse + hi StatusLineTermNC term=bold,underline + hi Terminal term=NONE + hi VisualNOS term=NONE + finish + endif + + finish +endif + +if &background == 'light' + let g:terminal_ansi_colors = ['#3c3836', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#7c6f64', '#928374', '#9d0006', '#79740e', '#b57614', '#076678', '#8f3f71', '#427b58', '#fbf1c7'] + + hi Normal guifg=#3c3836 guibg=#fbf1c7 guisp=NONE gui=NONE ctermfg=237 ctermbg=230 cterm=NONE term=NONE + hi Boolean guifg=#8f3f71 guibg=NONE guisp=NONE gui=NONE ctermfg=126 ctermbg=NONE cterm=NONE term=NONE + hi Character guifg=#8f3f71 guibg=NONE guisp=NONE gui=NONE ctermfg=126 ctermbg=NONE cterm=NONE term=NONE + hi ColorColumn guifg=NONE guibg=#ebe1b7 guisp=NONE gui=NONE ctermfg=NONE ctermbg=229 cterm=NONE term=reverse + hi Comment guifg=#928374 guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=bold + hi Conceal guifg=#a89984 guibg=NONE guisp=NONE gui=NONE ctermfg=137 ctermbg=NONE cterm=NONE term=NONE + hi Conditional guifg=#9d0006 guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE + hi Constant guifg=#8f3f71 guibg=NONE guisp=NONE gui=NONE ctermfg=126 ctermbg=NONE cterm=NONE term=NONE + hi Cursor guifg=#fbf1c7 guibg=#282828 guisp=NONE gui=NONE ctermfg=230 ctermbg=235 cterm=NONE term=reverse + hi CursorIM guifg=#fbf1c7 guibg=#282828 guisp=NONE gui=NONE ctermfg=230 ctermbg=235 cterm=NONE term=NONE + hi CursorLine guifg=NONE guibg=#e5d4b1 guisp=NONE gui=NONE ctermfg=NONE ctermbg=187 cterm=NONE term=underline + hi CursorLineNr guifg=#b57614 guibg=#fbf1c7 guisp=NONE gui=bold ctermfg=172 ctermbg=230 cterm=bold term=bold + hi Debug guifg=#9d0006 guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE + hi Define guifg=#427b58 guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=NONE + hi Delimiter guifg=#ff5f00 guibg=NONE guisp=NONE gui=NONE ctermfg=202 ctermbg=NONE cterm=NONE term=NONE + hi DiffAdd guifg=NONE guibg=#d7d7a7 guisp=NONE gui=NONE ctermfg=235 ctermbg=108 cterm=NONE term=reverse + hi DiffChange guifg=NONE guibg=#e7d7a7 guisp=NONE gui=NONE ctermfg=235 ctermbg=250 cterm=NONE term=NONE + hi DiffDelete guifg=#7c6f64 guibg=#e7b7a7 guisp=NONE gui=NONE ctermfg=187 ctermbg=131 cterm=NONE term=reverse + hi DiffText guifg=NONE guibg=#a7d7a7 guisp=NONE gui=NONE ctermfg=235 ctermbg=109 cterm=NONE term=reverse + hi Directory guifg=#79740e guibg=NONE guisp=NONE gui=bold ctermfg=64 ctermbg=NONE cterm=bold term=NONE + hi EndOfBuffer guifg=#e5d4b1 guibg=NONE guisp=NONE gui=NONE ctermfg=187 ctermbg=NONE cterm=NONE term=NONE + hi Error guifg=#9d0006 guibg=#fbf1c7 guisp=NONE gui=bold,reverse ctermfg=124 ctermbg=230 cterm=bold,reverse term=bold,reverse + hi ErrorMsg guifg=#fbf1c7 guibg=#9d0006 guisp=NONE gui=bold ctermfg=230 ctermbg=124 cterm=bold term=bold,reverse + hi Exception guifg=#9d0006 guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE + hi Float guifg=#8f3f71 guibg=NONE guisp=NONE gui=NONE ctermfg=126 ctermbg=NONE cterm=NONE term=NONE + hi FoldColumn guifg=#928374 guibg=#fbf1c7 guisp=NONE gui=NONE ctermfg=102 ctermbg=230 cterm=NONE term=NONE + hi Folded guifg=#928374 guibg=#ffffd7 guisp=NONE gui=NONE ctermfg=102 ctermbg=231 cterm=NONE term=NONE + hi Function guifg=#79740e guibg=NONE guisp=NONE gui=bold ctermfg=64 ctermbg=NONE cterm=bold term=NONE + hi Identifier guifg=#076678 guibg=NONE guisp=NONE gui=NONE ctermfg=23 ctermbg=NONE cterm=NONE term=NONE + hi Ignore guifg=fg guibg=NONE guisp=NONE gui=NONE ctermfg=fg ctermbg=NONE cterm=NONE term=NONE + hi IncSearch guifg=NONE guibg=#f7c7a7 guisp=NONE gui=NONE ctermfg=202 ctermbg=230 cterm=reverse term=bold,reverse,underline + hi Include guifg=#427b58 guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=NONE + hi Keyword guifg=#9d0006 guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE + hi Label guifg=#9d0006 guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE + hi LineNr guifg=#a89984 guibg=NONE guisp=NONE gui=NONE ctermfg=137 ctermbg=NONE cterm=NONE term=NONE + hi Macro guifg=#427b58 guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=NONE + hi MatchParen guifg=NONE guibg=#e5d4b1 guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=187 cterm=bold,underline term=bold,underline + hi ModeMsg guifg=#3c3836 guibg=NONE guisp=NONE gui=bold ctermfg=237 ctermbg=NONE cterm=bold term=bold + hi MoreMsg guifg=#3c3836 guibg=NONE guisp=NONE gui=bold ctermfg=237 ctermbg=NONE cterm=bold term=NONE + hi NonText guifg=#e5d4b1 guibg=NONE guisp=NONE gui=NONE ctermfg=187 ctermbg=NONE cterm=NONE term=NONE + hi Number guifg=#8f3f71 guibg=NONE guisp=NONE gui=NONE ctermfg=126 ctermbg=NONE cterm=NONE term=NONE + hi Operator guifg=#427b58 guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=NONE + hi Pmenu guifg=NONE guibg=#e5d4b1 guisp=NONE gui=NONE ctermfg=237 ctermbg=187 cterm=NONE term=reverse + hi PmenuBorder guifg=#7c6f64 guibg=#e5d4b1 guisp=NONE gui=NONE ctermfg=237 ctermbg=187 cterm=NONE term=NONE + hi PmenuExtra guifg=#7c6f64 guibg=#e5d4b1 guisp=NONE gui=NONE ctermfg=243 ctermbg=187 cterm=NONE term=NONE + hi PmenuExtraSel guifg=#3c3836 guibg=#bdae93 guisp=NONE gui=NONE ctermfg=237 ctermbg=144 cterm=NONE term=NONE + hi PmenuKind guifg=#9d0006 guibg=#e5d4b1 guisp=NONE gui=NONE ctermfg=124 ctermbg=187 cterm=NONE term=NONE + hi PmenuKindSel guifg=#9d0006 guibg=#bdae93 guisp=NONE gui=NONE ctermfg=124 ctermbg=144 cterm=NONE term=NONE + hi PmenuMatch guifg=#8f3f71 guibg=#e5d4b1 guisp=NONE gui=NONE ctermfg=126 ctermbg=187 cterm=NONE term=NONE + hi PmenuMatchSel guifg=#8f3f71 guibg=#bdae93 guisp=NONE gui=NONE ctermfg=126 ctermbg=144 cterm=NONE term=NONE + hi PmenuSbar guifg=NONE guibg=#e5d4b1 guisp=NONE gui=NONE ctermfg=NONE ctermbg=187 cterm=NONE term=reverse + hi PmenuSel guifg=NONE guibg=#bdae93 guisp=NONE gui=NONE ctermfg=NONE ctermbg=144 cterm=NONE term=bold + hi PmenuThumb guifg=NONE guibg=#a89984 guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=reverse term=NONE + hi PreCondit guifg=#427b58 guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=NONE + hi PreProc guifg=#427b58 guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=NONE + hi Question guifg=#ff5f00 guibg=NONE guisp=NONE gui=bold ctermfg=202 ctermbg=NONE cterm=bold term=standout + hi QuickFixLine guifg=NONE guibg=#e7cfd7 guisp=NONE gui=NONE ctermfg=235 ctermbg=182 cterm=NONE term=NONE + hi Repeat guifg=#9d0006 guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE + hi Search guifg=NONE guibg=#dbebb2 guisp=NONE gui=NONE ctermfg=100 ctermbg=230 cterm=reverse term=reverse + hi SignColumn guifg=#3c3836 guibg=#fbf1c7 guisp=NONE gui=NONE ctermfg=237 ctermbg=230 cterm=NONE term=reverse + hi Special guifg=#ff5f00 guibg=NONE guisp=NONE gui=NONE ctermfg=202 ctermbg=NONE cterm=NONE term=NONE + hi SpecialChar guifg=#9d0006 guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE + hi SpecialComment guifg=#9d0006 guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE + hi SpecialKey guifg=#928374 guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=bold + hi SpellBad guifg=#9d0006 guibg=NONE guisp=#9d0006 gui=undercurl ctermfg=124 ctermbg=NONE cterm=underline term=underline + hi SpellCap guifg=#076678 guibg=NONE guisp=#076678 gui=undercurl ctermfg=23 ctermbg=NONE cterm=underline term=underline + hi SpellLocal guifg=#427b58 guibg=NONE guisp=#427b58 gui=undercurl ctermfg=29 ctermbg=NONE cterm=underline term=underline + hi SpellRare guifg=#8f3f71 guibg=NONE guisp=#8f3f71 gui=undercurl ctermfg=126 ctermbg=NONE cterm=underline term=underline + hi Statement guifg=#9d0006 guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE + hi StatusLine guifg=#bdae93 guibg=#3c3836 guisp=NONE gui=bold,reverse ctermfg=144 ctermbg=237 cterm=bold,reverse term=bold,reverse + hi StatusLineNC guifg=#ebdbb2 guibg=#3c3836 guisp=NONE gui=reverse ctermfg=187 ctermbg=237 cterm=reverse term=bold,underline + hi StorageClass guifg=#ff5f00 guibg=NONE guisp=NONE gui=NONE ctermfg=202 ctermbg=NONE cterm=NONE term=NONE + hi String guifg=#79740e guibg=NONE guisp=NONE gui=NONE ctermfg=64 ctermbg=NONE cterm=NONE term=NONE + hi Structure guifg=#427b58 guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=NONE + hi TabLine guifg=#665c54 guibg=#ebdbb2 guisp=NONE gui=NONE ctermfg=59 ctermbg=187 cterm=NONE term=bold,underline + hi TabLineFill guifg=#3c3836 guibg=#ebdbb2 guisp=NONE gui=NONE ctermfg=237 ctermbg=187 cterm=NONE term=NONE + hi TabLineSel guifg=#282828 guibg=#fbf1c7 guisp=NONE gui=bold ctermfg=235 ctermbg=230 cterm=bold term=bold,reverse + hi Title guifg=#79740e guibg=NONE guisp=NONE gui=bold ctermfg=64 ctermbg=NONE cterm=bold term=NONE + hi TitleBar guifg=#3c3836 guibg=#dbcba2 guisp=NONE gui=NONE ctermfg=237 ctermbg=255 cterm=NONE term=NONE + hi TitleBarNC guifg=#7c6f64 guibg=#e9d9b0 guisp=NONE gui=NONE ctermfg=243 ctermbg=255 cterm=NONE term=NONE + hi Todo guifg=fg guibg=#fbf1c7 guisp=NONE gui=bold ctermfg=fg ctermbg=230 cterm=bold term=bold,reverse + hi ToolbarButton guifg=#282828 guibg=#bdae93 guisp=NONE gui=bold ctermfg=235 ctermbg=144 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=#b57614 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE + hi Typedef guifg=#b57614 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE + hi Underlined guifg=#076678 guibg=NONE guisp=NONE gui=underline ctermfg=23 ctermbg=NONE cterm=underline term=underline + hi VertSplit guifg=#bdae93 guibg=#fbf1c7 guisp=NONE gui=NONE ctermfg=144 ctermbg=230 cterm=NONE term=NONE + hi Visual guifg=NONE guibg=#b0d0d0 guisp=NONE gui=NONE ctermfg=23 ctermbg=230 cterm=reverse term=reverse + hi WarningMsg guifg=#9d0006 guibg=NONE guisp=NONE gui=bold ctermfg=124 ctermbg=NONE cterm=bold term=standout + hi WildMenu guifg=#076678 guibg=#e5d4b1 guisp=NONE gui=bold ctermfg=23 ctermbg=187 cterm=bold term=bold + + if s:tgc || s:t_Co >= 256 + if s:tgc + hi IncSearch cterm=NONE + hi QuickFixLine cterm=NONE + hi Search cterm=NONE + hi Visual cterm=NONE + endif + finish + endif + + if s:t_Co >= 16 + hi Normal ctermfg=Black ctermbg=White cterm=NONE hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE + hi ColorColumn ctermfg=White ctermbg=Grey cterm=NONE + hi Comment ctermfg=DarkGray ctermbg=NONE cterm=NONE + hi Conceal ctermfg=Grey ctermbg=NONE cterm=NONE hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Cursor ctermfg=White ctermbg=DarkGray cterm=NONE + hi CursorIM ctermfg=White ctermbg=DarkGray cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE hi Debug ctermfg=Red ctermbg=NONE cterm=NONE + hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Error ctermfg=Red ctermbg=Black cterm=bold,reverse + hi DiffAdd ctermfg=Black ctermbg=green cterm=NONE + hi DiffChange ctermfg=Black ctermbg=yellow cterm=NONE + hi DiffDelete ctermfg=DarkGray ctermbg=red cterm=NONE + hi DiffText ctermfg=Black ctermbg=cyan cterm=NONE + hi Directory ctermfg=Green ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=Grey ctermbg=NONE cterm=NONE + hi Error ctermfg=Red ctermbg=White cterm=reverse + hi ErrorMsg ctermfg=White ctermbg=Red cterm=bold hi Exception ctermfg=Red ctermbg=NONE cterm=NONE hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=Grey ctermbg=NONE cterm=NONE + hi Folded ctermfg=Grey ctermbg=NONE cterm=NONE hi Function ctermfg=Green ctermbg=NONE cterm=bold hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=Magenta ctermbg=White cterm=reverse hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE hi Label ctermfg=Red ctermbg=NONE cterm=NONE + hi LineNr ctermfg=Grey ctermbg=NONE cterm=NONE hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=NONE ctermbg=White cterm=bold,underline + hi ModeMsg ctermfg=Black ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=Black ctermbg=NONE cterm=bold + hi NonText ctermfg=Grey ctermbg=NONE cterm=NONE hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=Black ctermbg=Grey cterm=NONE + hi PmenuBorder ctermfg=Black ctermbg=Grey cterm=NONE + hi PmenuExtra ctermfg=DarkGray ctermbg=Grey cterm=NONE + hi PmenuExtraSel ctermfg=DarkGray ctermbg=NONE cterm=NONE + hi PmenuKind ctermfg=DarkRed ctermbg=Grey cterm=NONE + hi PmenuKindSel ctermfg=DarkRed ctermbg=NONE cterm=NONE + hi PmenuMatch ctermfg=Black ctermbg=Grey cterm=bold + hi PmenuMatchSel ctermfg=Black ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=Grey cterm=NONE + hi PmenuSel ctermfg=Black ctermbg=White cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Question ctermfg=Magenta ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=DarkGray ctermbg=magenta cterm=NONE hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE + hi Search ctermfg=DarkGreen ctermbg=White cterm=reverse + hi SignColumn ctermfg=Grey ctermbg=NONE cterm=NONE + hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=Grey ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline + hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline + hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline hi Statement ctermfg=Red ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=DarkGray ctermbg=White cterm=bold,reverse + hi StatusLineNC ctermfg=Grey ctermbg=DarkGray cterm=reverse hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE hi String ctermfg=Green ctermbg=NONE cterm=NONE hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE - hi Todo ctermfg=fg ctermbg=Black cterm=bold + hi TabLine ctermfg=DarkGray ctermbg=Grey cterm=NONE + hi TabLineFill ctermfg=White ctermbg=Grey cterm=NONE + hi TabLineSel ctermfg=DarkGray ctermbg=White cterm=bold + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi TitleBar ctermfg=Black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=Black ctermbg=white cterm=NONE + hi Todo ctermfg=fg ctermbg=White cterm=bold + hi ToolbarButton ctermfg=Black ctermbg=Grey cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline - hi CursorIM ctermfg=Black ctermbg=White cterm=NONE - else - " Light background + hi VertSplit ctermfg=DarkGray ctermbg=Grey cterm=NONE + hi Visual ctermfg=Blue ctermbg=White cterm=reverse + hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold + hi WildMenu ctermfg=Black ctermbg=White cterm=bold + finish + endif + + if s:t_Co >= 8 hi Normal ctermfg=Black ctermbg=Grey cterm=NONE + hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE + hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=White ctermbg=Black cterm=NONE hi Comment ctermfg=Black ctermbg=NONE cterm=bold - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE - hi Error ctermfg=Red ctermbg=White cterm=reverse - hi ErrorMsg ctermfg=White ctermbg=Red cterm=NONE - hi FoldColumn ctermfg=Black ctermbg=NONE cterm=NONE - hi Folded ctermfg=Black ctermbg=NONE cterm=NONE - hi LineNr ctermfg=Black ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=Black ctermbg=NONE cterm=bold,underline - hi NonText ctermfg=Black ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=Grey ctermbg=Black cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=Grey cterm=NONE - hi PmenuSel ctermfg=White ctermbg=Blue cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE - hi PmenuKind ctermfg=Red ctermbg=Black cterm=NONE - hi PmenuKindSel ctermfg=Red ctermbg=Blue cterm=NONE - hi PmenuExtra ctermfg=Grey ctermbg=Black cterm=NONE - hi PmenuExtraSel ctermfg=Grey ctermbg=Blue cterm=NONE - hi PmenuMatch ctermfg=Grey ctermbg=Black cterm=bold - hi PmenuMatchSel ctermfg=White ctermbg=Blue cterm=bold - hi SignColumn ctermfg=Black ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=Black ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=Black ctermbg=White cterm=bold,reverse - hi StatusLineNC ctermfg=Black ctermbg=White cterm=reverse - hi TabLine ctermfg=White ctermbg=Black cterm=NONE - hi TabLineFill ctermfg=White ctermbg=Black cterm=NONE - hi TabLineSel ctermfg=Black ctermbg=White cterm=NONE - hi ToolbarButton ctermfg=White ctermbg=Black cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi VertSplit ctermfg=White ctermbg=Black cterm=NONE - hi Visual ctermfg=White ctermbg=Blue cterm=NONE - hi WildMenu ctermfg=Blue ctermbg=Grey cterm=bold - hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE hi Conceal ctermfg=Grey ctermbg=NONE cterm=NONE - hi Cursor ctermfg=White ctermbg=DarkGray cterm=NONE - hi DiffAdd ctermfg=Green ctermbg=White cterm=reverse - hi DiffChange ctermfg=Cyan ctermbg=White cterm=reverse - hi DiffDelete ctermfg=Red ctermbg=White cterm=reverse - hi DiffText ctermfg=Yellow ctermbg=White cterm=reverse - hi Directory ctermfg=Green ctermbg=NONE cterm=bold - hi IncSearch ctermfg=Magenta ctermbg=White cterm=reverse - hi ModeMsg ctermfg=Black ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=Black ctermbg=NONE cterm=bold - hi Question ctermfg=Magenta ctermbg=NONE cterm=bold - hi Search ctermfg=DarkGreen ctermbg=White cterm=reverse - hi QuickFixLine ctermfg=Cyan ctermbg=White cterm=reverse - hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline - hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline - hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline - hi Title ctermfg=Green ctermbg=NONE cterm=bold - hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold - hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Cursor ctermfg=White ctermbg=DarkGray cterm=NONE + hi CursorIM ctermfg=White ctermbg=DarkGray cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE hi Debug ctermfg=Red ctermbg=NONE cterm=NONE + hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Error ctermfg=Red ctermbg=White cterm=bold,reverse + hi DiffAdd ctermfg=DarkGray ctermbg=green cterm=NONE + hi DiffChange ctermfg=DarkGray ctermbg=yellow cterm=NONE + hi DiffDelete ctermfg=DarkGray ctermbg=red cterm=NONE + hi DiffText ctermfg=DarkGray ctermbg=cyan cterm=NONE + hi Directory ctermfg=Green ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=Red ctermbg=White cterm=reverse + hi ErrorMsg ctermfg=White ctermbg=Red cterm=NONE hi Exception ctermfg=Red ctermbg=NONE cterm=NONE hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=Black ctermbg=NONE cterm=NONE + hi Folded ctermfg=Black ctermbg=NONE cterm=NONE hi Function ctermfg=Green ctermbg=NONE cterm=bold hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=Magenta ctermbg=White cterm=reverse hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE hi Label ctermfg=Red ctermbg=NONE cterm=NONE + hi LineNr ctermfg=Black ctermbg=NONE cterm=NONE hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=Black ctermbg=NONE cterm=bold,underline + hi ModeMsg ctermfg=Black ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=Black ctermbg=NONE cterm=bold + hi NonText ctermfg=Black ctermbg=NONE cterm=NONE hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuBorder ctermfg=Black ctermbg=Grey cterm=NONE + 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=Red cterm=reverse + hi PmenuMatchSel ctermfg=Red ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold + hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE + hi Question ctermfg=Magenta ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=DarkGray ctermbg=magenta cterm=NONE hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE + hi Search ctermfg=DarkGreen ctermbg=White cterm=reverse + hi SignColumn ctermfg=Black ctermbg=NONE cterm=NONE + hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=Black ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline + hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline + hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline hi Statement ctermfg=Red ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=Black ctermbg=White cterm=bold,reverse + hi StatusLineNC ctermfg=Black ctermbg=White cterm=reverse hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE - hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE hi String ctermfg=Green ctermbg=NONE cterm=NONE hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE + hi TabLine ctermfg=White ctermbg=Black cterm=NONE + hi TabLineFill ctermfg=White ctermbg=Black cterm=NONE + hi TabLineSel ctermfg=Black ctermbg=White cterm=NONE + hi Title ctermfg=Green ctermbg=NONE cterm=bold + hi TitleBar ctermfg=Black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=Black ctermbg=white cterm=NONE hi Todo ctermfg=fg ctermbg=White cterm=bold + hi ToolbarButton ctermfg=White ctermbg=Black cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline - hi CursorIM ctermfg=White ctermbg=DarkGray cterm=NONE + hi VertSplit ctermfg=White ctermbg=Black cterm=NONE + hi Visual ctermfg=White ctermbg=Blue cterm=NONE + hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold + hi WildMenu ctermfg=Blue ctermbg=Grey cterm=bold + finish + endif + + if s:t_Co >= 0 + hi CurSearch term=reverse + hi CursorColumn term=NONE + hi CursorLineFold term=underline + hi CursorLineSign term=underline + hi StatusLineTerm term=bold,reverse + hi StatusLineTermNC term=bold,underline + hi Terminal term=NONE + hi VisualNOS term=NONE + finish endif - 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 - finish endif -" Color: neutralred #cc241d 160 DarkRed -" Color: neutralgreen #98971a 100 DarkGreen -" Color: neutralyellow #d79921 172 DarkYellow -" Color: neutralblue #458588 66 DarkBlue -" Color: neutralpurple #b16286 132 DarkMagenta -" Color: neutralaqua #689d6a 71 DarkCyan -" Color: neutralorange #d65d0e 166 LightRed -" Background: dark -" Color: bg0 #1c1c1c 234 Black -" Color: bg1 #3c3836 237 DarkGray -" Color: bg2 #504945 239 DarkGray -" Color: bg3 #303030 236 -" Color: bg4 #7c6f64 243 -" Color: bg5 #000000 16 DarkGray -" Color: bg6 #121212 233 DarkGray -" Color: fg0 #fbf1c7 230 White -" Color: fg1 #ebdbb2 187 White -" Color: fg2 #d5c4a1 187 -" Color: fg3 #bdae93 144 -" Color: fg4 #a89984 102 gray -" Color: grey #928374 102 DarkGray -" Color: red #fb4934 203 Red -" Color: green #b8bb26 142 Green -" Color: yellow #fabd2f 214 Yellow -" Color: blue #83a598 109 Blue -" Color: purple #d3869b 175 Magenta -" Color: aqua #8ec07c 107 Cyan -" Color: orange #fe8019 208 Magenta -" Term colors: bg0 neutralred neutralgreen neutralyellow neutralblue neutralpurple neutralaqua fg4 -" Term colors: grey red green yellow blue purple aqua fg1 -" Background: light -" Color: bg0 #fbf1c7 230 White -" Color: bg1 #ebdbb2 187 Grey -" Color: bg2 #e5d4b1 188 Grey -" Color: bg3 #bdae93 144 -" Color: bg4 #a89984 137 Grey -" Color: bg5 #ebe1b7 229 Grey -" Color: bg6 #ffffd7 231 Grey -" Color: fg0 #282828 235 DarkGray -" Color: fg1 #3c3836 237 Black -" Color: fg2 #503836 237 -" Color: fg3 #665c54 59 -" Color: fg4 #7c6f64 243 Black -" Color: grey #928374 102 DarkGray -" Color: red #9d0006 124 Red -" Color: green #79740e 64 Green -" Color: yellow #b57614 172 Yellow -" Color: blue #076678 23 Blue -" Color: purple #8f3f71 126 Magenta -" Color: lightpurple #d3869b 175 Magenta -" Color: aqua #427b58 29 Cyan -" Color: orange #ff5f00 202 Magenta -" Term colors: fg1 neutralred neutralgreen neutralyellow neutralblue neutralpurple neutralaqua fg4 -" Term colors: grey red green yellow blue purple aqua bg0 -" Background: any " vim: et ts=8 sw=2 sts=2 diff --git a/runtime/colors/ron.vim b/runtime/colors/ron.vim index 43764188f2..139c5e68f1 100644 --- a/runtime/colors/ron.vim +++ b/runtime/colors/ron.vim @@ -1,23 +1,28 @@ " Name: ron " Author: original author Ron Aaron " Maintainer: original maintainer Ron Aaron -" 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 = 'ron' -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 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 @@ -26,9 +31,12 @@ 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 PopupSelected PmenuSel +hi! link PopupNotification Todo hi! link PreCondit PreProc hi! link Repeat Statement hi! link SpecialChar Special @@ -38,415 +46,237 @@ hi! link StatusLineTermNC StatusLineNC hi! link StorageClass Type hi! link String Constant hi! link Structure Type +hi! link TabPanel EndOfBuffer +hi! link TabPanelFill EndOfBuffer +hi! link TabPanelSel TabLineSel 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 LineNrAbove LineNr -hi! link LineNrBelow LineNr -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 ColorColumn guifg=NONE guibg=#cd0000 gui=NONE cterm=NONE -hi CursorColumn guifg=NONE guibg=#666666 gui=NONE cterm=NONE -hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE -hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=NONE -hi QuickFixLine guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE -hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE -hi Cursor guifg=#ffffff guibg=#60a060 gui=NONE cterm=NONE -hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi EndOfBuffer guifg=#ffff00 guibg=#303030 gui=NONE cterm=NONE -hi ErrorMsg guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse -hi FoldColumn guifg=#ffffff guibg=NONE gui=NONE cterm=NONE -hi Folded guifg=NONE guibg=#4d4d4d gui=NONE cterm=NONE -hi IncSearch guifg=NONE guibg=#4682b4 gui=NONE cterm=NONE -hi LineNr guifg=#a9a9a9 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=NONE -hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=NONE -hi NonText guifg=#ffff00 guibg=#303030 gui=NONE cterm=NONE -hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE -hi PmenuSbar guifg=NONE guibg=#000000 gui=NONE cterm=NONE -hi PmenuSel guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE -hi PmenuThumb guifg=NONE guibg=#e5e5e5 gui=NONE cterm=NONE -hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=NONE cterm=NONE -hi PmenuMatchSel guifg=#ff00ff guibg=#00cdcd gui=NONE cterm=NONE -hi Question guifg=#00ff00 guibg=#000000 gui=bold cterm=NONE -hi Search guifg=#000000 guibg=#a9a9a9 gui=bold cterm=NONE -hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi StatusLine guifg=#00ffff guibg=#0000ff gui=bold cterm=NONE -hi StatusLineNC guifg=#add8e6 guibg=#00008b gui=NONE cterm=NONE -hi VertSplit guifg=#add8e6 guibg=#00008b gui=NONE cterm=NONE -hi TabLine guifg=#000000 guibg=#008b8b gui=NONE cterm=NONE -hi TabLineFill guifg=#a9a9a9 guibg=#7f7f7f gui=NONE cterm=NONE -hi TabLineSel guifg=#00ffff guibg=#000000 gui=bold cterm=NONE -hi Terminal guifg=#00ffff guibg=#000000 gui=NONE cterm=NONE -hi Title guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE -hi Visual guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse -hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline -hi WarningMsg guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE -hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline -hi SpellCap guifg=#ffffff guibg=NONE guisp=#ffffff 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 Comment guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE -hi Constant guifg=#00ffff guibg=NONE gui=bold cterm=NONE -hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse -hi Identifier guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi Ignore guifg=#000000 guibg=#000000 gui=NONE cterm=NONE -hi Label guifg=#eec900 guibg=NONE gui=NONE cterm=NONE -hi Operator guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE -hi PreProc guifg=#eea9b8 guibg=NONE gui=NONE cterm=NONE -hi Special guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE -hi Statement guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE -hi Todo guifg=#000000 guibg=#ffa500 gui=NONE cterm=NONE -hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=NONE -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=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 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=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 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=#00ffff guibg=NONE guisp=NONE gui=bold ctermfg=51 ctermbg=NONE cterm=NONE term=NONE +hi Cursor guifg=#ffffff guibg=#60a060 guisp=NONE gui=NONE ctermfg=231 ctermbg=71 cterm=NONE term=reverse +hi CursorColumn guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=59 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=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=59 cterm=NONE term=underline +hi CursorLineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=bold ctermfg=226 ctermbg=NONE 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=#ffff00 guibg=#303030 guisp=NONE gui=NONE ctermfg=226 ctermbg=236 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=#ffffff guibg=NONE guisp=NONE gui=NONE ctermfg=231 ctermbg=NONE cterm=NONE term=NONE +hi Folded guifg=NONE guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=NONE ctermbg=239 cterm=NONE term=NONE +hi Identifier guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 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=#4682b4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=67 cterm=NONE term=bold,reverse,underline +hi Label guifg=#eec900 guibg=NONE guisp=NONE gui=NONE ctermfg=220 ctermbg=NONE cterm=NONE term=NONE +hi LineNr guifg=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=145 ctermbg=NONE cterm=NONE term=NONE +hi MatchParen guifg=NONE guibg=#008b8b guisp=NONE gui=NONE ctermfg=NONE ctermbg=44 cterm=NONE term=bold,underline +hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=NONE term=bold +hi MoreMsg guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=NONE term=NONE +hi NonText guifg=#ffff00 guibg=#303030 guisp=NONE gui=NONE ctermfg=226 ctermbg=236 cterm=NONE term=NONE +hi Operator guifg=#ffa500 guibg=NONE guisp=NONE gui=NONE ctermfg=214 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=NONE ctermfg=201 ctermbg=238 cterm=NONE term=NONE +hi PmenuMatchSel guifg=#ff00ff guibg=#00cdcd guisp=NONE gui=NONE ctermfg=201 ctermbg=44 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=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=bold +hi PmenuThumb guifg=NONE guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=NONE +hi PreProc guifg=#eea9b8 guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE +hi Question guifg=#00ff00 guibg=#000000 guisp=NONE gui=bold ctermfg=46 ctermbg=16 cterm=NONE term=standout +hi QuickFixLine guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=NONE +hi Search guifg=#000000 guibg=#a9a9a9 guisp=NONE gui=bold ctermfg=16 ctermbg=145 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=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 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=#ffffff guibg=NONE guisp=#ffffff gui=undercurl ctermfg=231 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=#add8e6 guibg=NONE guisp=NONE gui=NONE ctermfg=152 ctermbg=NONE cterm=NONE term=NONE +hi StatusLine guifg=#00ffff guibg=#0000ff guisp=NONE gui=bold ctermfg=51 ctermbg=21 cterm=NONE term=bold,reverse +hi StatusLineNC guifg=#add8e6 guibg=#00008b guisp=NONE gui=NONE ctermfg=152 ctermbg=20 cterm=NONE term=bold,underline +hi TabLine guifg=#000000 guibg=#008b8b guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=bold,underline +hi TabLineFill guifg=#a9a9a9 guibg=#7f7f7f guisp=NONE gui=NONE ctermfg=145 ctermbg=102 cterm=NONE term=NONE +hi TabLineSel guifg=#00ffff guibg=#000000 guisp=NONE gui=bold ctermfg=51 ctermbg=16 cterm=NONE term=bold,reverse +hi Terminal guifg=#00ffff guibg=#000000 guisp=NONE gui=NONE ctermfg=51 ctermbg=16 cterm=NONE term=NONE +hi Title guifg=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=145 ctermbg=NONE cterm=NONE 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=#000000 guibg=#ffa500 guisp=NONE gui=NONE ctermfg=16 ctermbg=214 cterm=NONE term=bold,reverse +hi ToolbarButton guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=bold ctermfg=16 ctermbg=254 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=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 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=#add8e6 guibg=#00008b guisp=NONE gui=NONE ctermfg=152 ctermbg=20 cterm=NONE term=NONE +hi Visual guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=reverse +hi VisualNOS guifg=NONE guibg=#000000 guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=16 cterm=underline term=NONE +hi WarningMsg guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 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 ColorColumn ctermfg=NONE ctermbg=160 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=59 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=59 cterm=NONE - hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=16 ctermbg=44 cterm=NONE - hi Conceal ctermfg=59 ctermbg=NONE cterm=NONE - hi Cursor ctermfg=231 ctermbg=71 cterm=NONE - hi Directory ctermfg=51 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=226 ctermbg=236 cterm=NONE - hi ErrorMsg ctermfg=196 ctermbg=231 cterm=reverse - hi FoldColumn ctermfg=231 ctermbg=NONE cterm=NONE - hi Folded ctermfg=NONE ctermbg=239 cterm=NONE - hi IncSearch ctermfg=NONE ctermbg=67 cterm=NONE - hi LineNr ctermfg=145 ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=NONE ctermbg=44 cterm=NONE - hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE - hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE - hi NonText ctermfg=226 ctermbg=236 cterm=NONE - hi Pmenu ctermfg=231 ctermbg=238 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=16 cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=44 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=254 cterm=NONE - hi PmenuMatch ctermfg=201 ctermbg=238 cterm=NONE - hi PmenuMatchSel ctermfg=201 ctermbg=44 cterm=NONE - hi Question ctermfg=46 ctermbg=16 cterm=NONE - hi Search ctermfg=16 ctermbg=145 cterm=NONE - hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=51 ctermbg=21 cterm=NONE - hi StatusLineNC ctermfg=152 ctermbg=20 cterm=NONE - hi VertSplit ctermfg=152 ctermbg=20 cterm=NONE - hi TabLine ctermfg=16 ctermbg=44 cterm=NONE - hi TabLineFill ctermfg=145 ctermbg=102 cterm=NONE - hi TabLineSel ctermfg=51 ctermbg=16 cterm=NONE - hi Terminal ctermfg=51 ctermbg=16 cterm=NONE - hi Title ctermfg=145 ctermbg=NONE cterm=NONE - hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse - hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline - hi WarningMsg ctermfg=226 ctermbg=NONE cterm=NONE - hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE - hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=231 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=226 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline - hi Comment ctermfg=46 ctermbg=NONE cterm=NONE - hi Constant ctermfg=51 ctermbg=NONE cterm=NONE - hi Error ctermfg=196 ctermbg=231 cterm=reverse - hi Identifier ctermfg=51 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=16 ctermbg=16 cterm=NONE - hi Label ctermfg=220 ctermbg=NONE cterm=NONE - hi Operator ctermfg=214 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=217 ctermbg=NONE cterm=NONE - hi Special ctermfg=226 ctermbg=NONE cterm=NONE - hi Statement ctermfg=152 ctermbg=NONE cterm=NONE - hi Todo ctermfg=16 ctermbg=214 cterm=NONE - hi Type ctermfg=29 ctermbg=NONE cterm=NONE - 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=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 +if s:tgc || s:t_Co >= 256 finish endif if s:t_Co >= 16 hi Normal ctermfg=cyan ctermbg=black cterm=NONE hi ColorColumn ctermfg=cyan ctermbg=darkred cterm=NONE + hi Comment ctermfg=green ctermbg=NONE cterm=NONE + hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE + hi Cursor ctermfg=white ctermbg=green 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 QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE - hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Cursor ctermfg=white ctermbg=green 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=yellow ctermbg=darkgrey cterm=NONE + hi Error ctermfg=red ctermbg=white cterm=reverse hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse hi FoldColumn ctermfg=white ctermbg=NONE cterm=NONE hi Folded ctermfg=NONE ctermbg=darkgrey cterm=NONE + hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=black ctermbg=black cterm=NONE hi IncSearch ctermfg=NONE ctermbg=blue cterm=NONE + hi Label ctermfg=yellow ctermbg=NONE cterm=NONE hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE hi NonText ctermfg=yellow ctermbg=darkgrey cterm=NONE + hi Operator ctermfg=darkyellow 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=darkcyan cterm=bold hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE - hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold + hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE hi Question ctermfg=green ctermbg=black cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE hi Search ctermfg=black ctermbg=grey cterm=NONE hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE + hi Special ctermfg=yellow ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=red ctermbg=NONE cterm=underline + hi SpellCap ctermfg=white ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=yellow ctermbg=NONE cterm=underline + hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline + hi Statement ctermfg=darkcyan ctermbg=NONE cterm=NONE hi StatusLine ctermfg=cyan ctermbg=darkblue cterm=NONE hi StatusLineNC ctermfg=darkcyan ctermbg=darkblue cterm=NONE - hi VertSplit ctermfg=darkcyan ctermbg=darkblue cterm=NONE hi TabLine ctermfg=black ctermbg=darkcyan cterm=NONE hi TabLineFill ctermfg=grey ctermbg=darkgrey cterm=NONE hi TabLineSel ctermfg=cyan ctermbg=black cterm=NONE hi Terminal ctermfg=cyan ctermbg=black cterm=NONE hi Title ctermfg=grey ctermbg=NONE cterm=NONE + hi TitleBar ctermfg=cyan ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE + hi Todo ctermfg=black 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=blue ctermbg=NONE cterm=underline + hi VertSplit ctermfg=darkcyan ctermbg=darkblue cterm=NONE hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline hi WarningMsg ctermfg=yellow ctermbg=NONE cterm=NONE hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE - hi SpellBad ctermfg=red ctermbg=NONE cterm=underline - hi SpellCap ctermfg=white ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=yellow ctermbg=NONE cterm=underline - hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline - hi Comment ctermfg=green ctermbg=NONE cterm=NONE - hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE - hi Error ctermfg=red ctermbg=white cterm=reverse - hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE - hi Ignore ctermfg=black ctermbg=black cterm=NONE - hi Label ctermfg=yellow ctermbg=NONE cterm=NONE - hi Operator ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Special ctermfg=yellow ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE - hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE - 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=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=darkcyan ctermbg=black cterm=NONE hi ColorColumn ctermfg=darkcyan ctermbg=darkred cterm=NONE + hi Comment ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Conceal ctermfg=grey ctermbg=grey cterm=NONE + hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold + hi Cursor ctermfg=white ctermbg=green 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 QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE - hi Conceal ctermfg=grey ctermbg=grey 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=bold hi EndOfBuffer ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=grey cterm=bold,reverse hi ErrorMsg ctermfg=darkred ctermbg=grey cterm=reverse hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE hi Folded ctermfg=darkcyan ctermbg=black cterm=reverse + hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=black ctermbg=black cterm=NONE hi IncSearch ctermfg=darkyellow ctermbg=darkblue cterm=NONE + hi Label ctermfg=darkyellow ctermbg=NONE cterm=bold hi LineNr ctermfg=grey ctermbg=NONE cterm=bold hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=bold hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE hi NonText ctermfg=darkgreen ctermbg=NONE cterm=bold + hi Operator ctermfg=darkyellow ctermbg=NONE cterm=NONE hi Pmenu ctermfg=grey ctermbg=darkgrey cterm=NONE + hi PmenuMatch ctermfg=grey ctermbg=darkgrey cterm=bold + hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE - hi PmenuMatch ctermfg=grey ctermbg=darkgrey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold + hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE hi Question ctermfg=darkgreen ctermbg=black cterm=bold + hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE hi Search ctermfg=black ctermbg=grey cterm=NONE hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Special ctermfg=darkyellow ctermbg=NONE cterm=bold hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse + hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse + hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=reverse + hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse + hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold hi StatusLine ctermfg=darkblue ctermbg=grey cterm=bold,reverse hi StatusLineNC ctermfg=darkblue ctermbg=grey cterm=reverse - hi VertSplit ctermfg=darkblue ctermbg=darkblue cterm=NONE hi TabLine ctermfg=black ctermbg=darkcyan cterm=NONE hi TabLineFill ctermfg=darkblue ctermbg=darkblue cterm=NONE hi TabLineSel ctermfg=darkcyan ctermbg=black cterm=bold hi Terminal ctermfg=darkcyan ctermbg=black cterm=NONE hi Title ctermfg=grey ctermbg=NONE cterm=bold + hi TitleBar ctermfg=cyan ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE + hi Todo ctermfg=black ctermbg=darkyellow cterm=bold + hi ToolbarButton ctermfg=grey 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 VertSplit ctermfg=darkblue ctermbg=darkblue cterm=NONE hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline hi WarningMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE hi WildMenu ctermfg=black ctermbg=darkgreen cterm=NONE - hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse - hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse - hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=reverse - hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse - hi Comment ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Error ctermfg=darkred ctermbg=grey cterm=bold,reverse - hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Ignore ctermfg=black ctermbg=black cterm=NONE - hi Label ctermfg=darkyellow ctermbg=NONE cterm=bold - hi Operator ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Special ctermfg=darkyellow ctermbg=NONE cterm=bold - hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold - hi Todo ctermfg=black ctermbg=darkyellow cterm=bold - hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse - 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 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: rgbGrey40 #666666 59 darkgrey -" Color: rgbDarkGrey #a9a9a9 145 grey -" Color: rgbDarkBlue #00008b 20 darkblue -" Color: rgbBlue #0000ff 21 darkblue -" Color: rgbDarkCyan #008b8b 44 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: StatusLineTerm #90ee90 120 darkgreen -" Color: ToolbarLine #7f7f7f 244 darkgrey -" Color: Underlined #80a0ff 111 blue -" Color: Pmenu #444444 238 darkgrey -" Color: ron303030 #303030 236 darkgrey -" Color: ronLightBlue #add8e6 152 darkcyan -" Color: ronPink2 #eea9b8 217 darkmagenta -" Color: ronOrange #ffa500 214 darkyellow -" Color: ronCursor #60a060 71 green -" Color: ronSteelBlue #4682b4 67 blue -" Color: ronGold2 #eec900 220 yellow -" Color: ronDarkGreen #006400 22 darkgreen -" Color: ronSlateBlue #6a5acd 62 blue -" Color: ronOliveDrab #6b8e23 64 green -" Color: ronCoral #ff7f50 209 red -" Color: ronGray30 #4d4d4d 239 darkgrey -" 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 diff --git a/runtime/colors/shine.vim b/runtime/colors/shine.vim index f00e34f5df..4493bd4b2f 100644 --- a/runtime/colors/shine.vim +++ b/runtime/colors/shine.vim @@ -2,425 +2,265 @@ " Description: Light colorscheme inspired by normal text editors. " Author: Original author is Yasuhiro Matsumoto " Maintainer: Original maintainer is Yasuhiro Matsumoto -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = 'shine' -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', '#8b0000', '#006400', '#ffff00', '#00008b', '#6a0dad', '#008b8b', '#dadada', '#767676', '#ffafaf', '#90ee90', '#ffff60', '#add8e6', '#ff00ff', '#00ffff', '#ffffff'] -if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#000000', '#8b0000', '#006400', '#ffff00', '#00008b', '#6a0dad', '#008b8b', '#dadada', '#767676', '#ffafaf', '#90ee90', '#ffff60', '#add8e6', '#ff00ff', '#00ffff', '#ffffff'] -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 ErrorMsg Error -hi! link Tag Special -hi! link Operator Statement +hi! link Function Identifier +hi! link LineNrAbove LineNr +hi! link LineNrBelow LineNr hi! link MessageWindow Pmenu +hi! link Operator Statement hi! link PopupNotification Todo -hi! link PopupSelected PmenuSel -hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE -hi Folded guifg=#00008b guibg=#dadada gui=NONE cterm=NONE -hi CursorLine guifg=NONE guibg=#dadada gui=NONE cterm=NONE -hi CursorColumn guifg=NONE guibg=#dadada gui=NONE cterm=NONE -hi CursorLineNr guifg=NONE guibg=#dadada gui=NONE cterm=NONE -hi QuickFixLine guifg=#000000 guibg=#ff8c00 gui=NONE cterm=NONE -hi StatusLine guifg=#ffffff guibg=#000000 gui=bold cterm=bold -hi StatusLineNC guifg=#ffffff guibg=#a8a8a8 gui=NONE cterm=NONE -hi StatusLineTerm guifg=#000000 guibg=#90ee90 gui=bold cterm=bold -hi StatusLineTermNC guifg=#dadada guibg=#006400 gui=NONE cterm=NONE -hi VertSplit guifg=#a8a8a8 guibg=#a8a8a8 gui=NONE cterm=NONE -hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE -hi PmenuSel guifg=#000000 guibg=#ffff60 gui=NONE cterm=NONE -hi PmenuSbar guifg=#ffffff guibg=#ffffff gui=NONE cterm=NONE -hi PmenuThumb guifg=#767676 guibg=#767676 gui=NONE cterm=NONE -hi PmenuMatch guifg=#ff0000 guibg=#a8a8a8 gui=NONE cterm=NONE -hi PmenuMatchSel guifg=#ff0000 guibg=#ffff60 gui=NONE cterm=NONE -hi TabLine guifg=#000000 guibg=#dadada gui=underline cterm=underline -hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse -hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold -hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi ToolbarButton guifg=NONE guibg=#a8a8a8 gui=bold cterm=bold -hi NonText guifg=#add8e6 guibg=#ffffff gui=NONE cterm=NONE -hi SpecialKey guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE -hi Visual guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE -hi VisualNOS guifg=NONE guibg=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=underline -hi LineNr guifg=#767676 guibg=NONE gui=NONE cterm=NONE -hi FoldColumn guifg=#767676 guibg=NONE gui=NONE cterm=NONE -hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi Underlined guifg=#6a0dad guibg=NONE gui=underline cterm=underline -hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse -hi WarningMsg guifg=#6a0dad guibg=#ffffff gui=NONE cterm=NONE -hi MoreMsg guifg=#006400 guibg=#ffffff gui=NONE cterm=NONE -hi ModeMsg guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE -hi Question guifg=#a07070 guibg=NONE gui=NONE cterm=NONE -hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi MatchParen guifg=#ffffff guibg=#ffafaf gui=NONE cterm=NONE -hi Search guifg=#ffffff guibg=#6a0dad gui=NONE cterm=NONE -hi IncSearch guifg=#008b8b guibg=#ffff00 gui=reverse cterm=reverse -hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold -hi ColorColumn guifg=#000000 guibg=#ffafaf gui=NONE cterm=NONE -hi Cursor guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE -hi lCursor guifg=#000000 guibg=#a07070 gui=NONE cterm=NONE -hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline -hi SpellCap guifg=#2e8b57 guibg=NONE guisp=#2e8b57 gui=undercurl cterm=underline -hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline -hi SpellRare guifg=#00008b guibg=NONE guisp=#00008b gui=undercurl cterm=underline -hi Statement guifg=#2e8b57 guibg=NONE gui=bold cterm=bold -hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold -hi Comment guifg=#a8a8a8 guibg=NONE gui=bold cterm=NONE -hi StorageClass guifg=#ff0000 guibg=NONE gui=bold cterm=bold -hi Conceal guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE -hi Identifier guifg=#008b8b guibg=NONE gui=NONE cterm=NONE -hi Constant guifg=#a07070 guibg=NONE gui=NONE cterm=NONE -hi Number guifg=#a07070 guibg=NONE gui=bold cterm=bold -hi Float guifg=#a07070 guibg=NONE gui=bold cterm=bold -hi PreProc guifg=#6a0dad guibg=NONE gui=NONE cterm=NONE -hi Special guifg=#ff8c00 guibg=NONE gui=NONE cterm=NONE -hi SpecialChar guifg=#00008b 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=#006400 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 Tag Special +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 ErrorMsg Error - hi! link Tag Special - hi! link Operator Statement - hi! link MessageWindow Pmenu - hi! link PopupNotification Todo - hi! link PopupSelected PmenuSel - hi Normal ctermfg=16 ctermbg=231 cterm=NONE - hi Folded ctermfg=18 ctermbg=253 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=253 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=253 cterm=NONE - hi CursorLineNr ctermfg=NONE ctermbg=253 cterm=NONE - hi QuickFixLine ctermfg=16 ctermbg=208 cterm=NONE - hi StatusLine ctermfg=231 ctermbg=16 cterm=bold - hi StatusLineNC ctermfg=231 ctermbg=248 cterm=NONE - hi StatusLineTerm ctermfg=16 ctermbg=120 cterm=bold - hi StatusLineTermNC ctermfg=253 ctermbg=22 cterm=NONE - hi VertSplit ctermfg=248 ctermbg=248 cterm=NONE - hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=228 cterm=NONE - hi PmenuSbar ctermfg=231 ctermbg=231 cterm=NONE - hi PmenuThumb ctermfg=243 ctermbg=243 cterm=NONE - hi PmenuMatch ctermfg=196 ctermbg=248 cterm=NONE - hi PmenuMatchSel ctermfg=196 ctermbg=228 cterm=NONE - hi TabLine ctermfg=16 ctermbg=253 cterm=underline - hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse - hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=NONE ctermbg=248 cterm=bold - hi NonText ctermfg=153 ctermbg=231 cterm=NONE - hi SpecialKey ctermfg=153 ctermbg=NONE cterm=NONE - hi Visual ctermfg=16 ctermbg=248 cterm=NONE - hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline - hi LineNr ctermfg=243 ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=243 ctermbg=NONE cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Underlined ctermfg=55 ctermbg=NONE cterm=underline - hi Error ctermfg=196 ctermbg=231 cterm=reverse - hi WarningMsg ctermfg=55 ctermbg=231 cterm=NONE - hi MoreMsg ctermfg=22 ctermbg=231 cterm=NONE - hi ModeMsg ctermfg=16 ctermbg=231 cterm=NONE - hi Question ctermfg=95 ctermbg=NONE cterm=NONE - hi Todo ctermfg=16 ctermbg=226 cterm=NONE - hi MatchParen ctermfg=231 ctermbg=217 cterm=NONE - hi Search ctermfg=231 ctermbg=55 cterm=NONE - hi IncSearch ctermfg=30 ctermbg=226 cterm=reverse - hi WildMenu ctermfg=16 ctermbg=226 cterm=bold - hi ColorColumn ctermfg=16 ctermbg=217 cterm=NONE - hi Cursor ctermfg=231 ctermbg=16 cterm=NONE - hi lCursor ctermfg=16 ctermbg=95 cterm=NONE - hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=29 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=201 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=18 ctermbg=NONE cterm=underline - hi Statement ctermfg=29 ctermbg=NONE cterm=bold - hi Type ctermfg=29 ctermbg=NONE cterm=bold - hi Comment ctermfg=248 ctermbg=NONE cterm=NONE - hi StorageClass ctermfg=196 ctermbg=NONE cterm=bold - hi Conceal ctermfg=153 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE - hi Constant ctermfg=95 ctermbg=NONE cterm=NONE - hi Number ctermfg=95 ctermbg=NONE cterm=bold - hi Float ctermfg=95 ctermbg=NONE cterm=bold - hi PreProc ctermfg=55 ctermbg=NONE cterm=NONE - hi Special ctermfg=208 ctermbg=NONE cterm=NONE - hi SpecialChar ctermfg=18 ctermbg=NONE cterm=NONE - hi Directory ctermfg=30 ctermbg=NONE cterm=bold - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Title ctermfg=22 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=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE +hi ColorColumn guifg=#000000 guibg=#ffafaf guisp=NONE gui=NONE ctermfg=16 ctermbg=217 cterm=NONE term=reverse +hi Comment guifg=#a8a8a8 guibg=NONE guisp=NONE gui=bold ctermfg=248 ctermbg=NONE cterm=NONE term=bold +hi Conceal guifg=#add8e6 guibg=NONE guisp=NONE gui=NONE ctermfg=153 ctermbg=NONE cterm=NONE term=NONE +hi Constant guifg=#a07070 guibg=NONE guisp=NONE gui=NONE ctermfg=95 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=#dadada guisp=NONE gui=NONE ctermfg=NONE ctermbg=253 cterm=NONE term=NONE +hi CursorLine guifg=NONE guibg=#dadada guisp=NONE gui=NONE ctermfg=NONE ctermbg=253 cterm=NONE term=underline +hi CursorLineNr guifg=NONE guibg=#dadada guisp=NONE gui=NONE ctermfg=NONE ctermbg=253 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=bold ctermfg=30 ctermbg=NONE cterm=bold term=NONE +hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse +hi Float guifg=#a07070 guibg=NONE guisp=NONE gui=bold ctermfg=95 ctermbg=NONE cterm=bold term=NONE +hi FoldColumn guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE +hi Folded guifg=#00008b guibg=#dadada guisp=NONE gui=NONE ctermfg=18 ctermbg=253 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=#008b8b guibg=#ffff00 guisp=NONE gui=reverse ctermfg=30 ctermbg=226 cterm=reverse term=bold,reverse,underline +hi LineNr guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE +hi MatchParen guifg=#ffffff guibg=#ffafaf guisp=NONE gui=NONE ctermfg=231 ctermbg=217 cterm=NONE term=bold,underline +hi ModeMsg guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=bold +hi MoreMsg guifg=#006400 guibg=#ffffff guisp=NONE gui=NONE ctermfg=22 ctermbg=231 cterm=NONE term=NONE +hi NonText guifg=#add8e6 guibg=#ffffff guisp=NONE gui=NONE ctermfg=153 ctermbg=231 cterm=NONE term=NONE +hi Number guifg=#a07070 guibg=NONE guisp=NONE gui=bold ctermfg=95 ctermbg=NONE cterm=bold term=NONE +hi Pmenu guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=reverse +hi PmenuMatch guifg=#ff0000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=196 ctermbg=248 cterm=NONE term=NONE +hi PmenuMatchSel guifg=#ff0000 guibg=#ffff60 guisp=NONE gui=NONE ctermfg=196 ctermbg=228 cterm=NONE term=NONE +hi PmenuSbar guifg=#ffffff guibg=#ffffff guisp=NONE gui=NONE ctermfg=231 ctermbg=231 cterm=NONE term=reverse +hi PmenuSel guifg=#000000 guibg=#ffff60 guisp=NONE gui=NONE ctermfg=16 ctermbg=228 cterm=NONE term=bold +hi PmenuThumb guifg=#767676 guibg=#767676 guisp=NONE gui=NONE ctermfg=243 ctermbg=243 cterm=NONE term=NONE +hi PreProc guifg=#6a0dad guibg=NONE guisp=NONE gui=NONE ctermfg=55 ctermbg=NONE cterm=NONE term=NONE +hi Question guifg=#a07070 guibg=NONE guisp=NONE gui=NONE ctermfg=95 ctermbg=NONE cterm=NONE term=standout +hi QuickFixLine guifg=#000000 guibg=#ff8c00 guisp=NONE gui=NONE ctermfg=16 ctermbg=208 cterm=NONE term=NONE +hi Search guifg=#ffffff guibg=#6a0dad guisp=NONE gui=NONE ctermfg=231 ctermbg=55 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=#ff8c00 guibg=NONE guisp=NONE gui=NONE ctermfg=208 ctermbg=NONE cterm=NONE term=NONE +hi SpecialChar guifg=#00008b guibg=NONE guisp=NONE gui=NONE ctermfg=18 ctermbg=NONE cterm=NONE term=NONE +hi SpecialKey guifg=#add8e6 guibg=NONE guisp=NONE gui=NONE ctermfg=153 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=#2e8b57 guibg=NONE guisp=#2e8b57 gui=undercurl ctermfg=29 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=#00008b guibg=NONE guisp=#00008b gui=undercurl ctermfg=18 ctermbg=NONE cterm=underline term=underline +hi Statement guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE +hi StatusLine guifg=#ffffff guibg=#000000 guisp=NONE gui=bold ctermfg=231 ctermbg=16 cterm=bold term=bold,reverse +hi StatusLineNC guifg=#ffffff guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=231 ctermbg=248 cterm=NONE term=bold,underline +hi StatusLineTerm guifg=#000000 guibg=#90ee90 guisp=NONE gui=bold ctermfg=16 ctermbg=120 cterm=bold term=bold,reverse +hi StatusLineTermNC guifg=#dadada guibg=#006400 guisp=NONE gui=NONE ctermfg=253 ctermbg=22 cterm=NONE term=bold,underline +hi StorageClass guifg=#ff0000 guibg=NONE guisp=NONE gui=bold ctermfg=196 ctermbg=NONE cterm=bold term=bold +hi TabLine guifg=#000000 guibg=#dadada guisp=NONE gui=underline ctermfg=16 ctermbg=253 cterm=underline term=bold,underline +hi TabLineFill guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=NONE +hi TabLineSel guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=bold,reverse +hi Title guifg=#006400 guibg=NONE guisp=NONE gui=bold ctermfg=22 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=#767676 guibg=#f5f5f5 guisp=NONE gui=NONE ctermfg=243 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=NONE guibg=#a8a8a8 guisp=NONE gui=bold ctermfg=NONE ctermbg=248 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=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE +hi Underlined guifg=#6a0dad guibg=NONE guisp=NONE gui=underline ctermfg=55 ctermbg=NONE cterm=underline term=underline +hi VertSplit guifg=#a8a8a8 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=248 ctermbg=248 cterm=NONE term=NONE +hi Visual guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=reverse +hi VisualNOS guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=underline term=NONE +hi WarningMsg guifg=#6a0dad guibg=#ffffff guisp=NONE gui=NONE ctermfg=55 ctermbg=231 cterm=NONE term=standout +hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=bold ctermfg=16 ctermbg=226 cterm=bold term=bold +hi lCursor guifg=#000000 guibg=#a07070 guisp=NONE gui=NONE ctermfg=16 ctermbg=95 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 Folded ctermfg=darkblue ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi ColorColumn ctermfg=black ctermbg=red cterm=NONE + hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Conceal ctermfg=blue ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred 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=NONE cterm=underline hi CursorLineNr ctermfg=NONE 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 Error ctermfg=red ctermbg=white cterm=reverse + hi Float ctermfg=darkred ctermbg=NONE cterm=bold + hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=darkcyan ctermbg=yellow cterm=reverse + hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=white ctermbg=red cterm=NONE + hi ModeMsg ctermfg=black ctermbg=white cterm=NONE + hi MoreMsg ctermfg=darkgreen ctermbg=white cterm=NONE + hi NonText ctermfg=blue ctermbg=white cterm=NONE + hi Number ctermfg=darkred ctermbg=NONE cterm=bold + hi Pmenu ctermfg=black ctermbg=darkgrey cterm=NONE + hi PmenuMatch ctermfg=black ctermbg=darkgrey cterm=bold + hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold + hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE + hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE + hi PmenuThumb ctermfg=darkgrey ctermbg=darkgrey cterm=NONE + hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi Question ctermfg=darkred ctermbg=NONE cterm=NONE hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE + hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi SpecialChar ctermfg=darkblue ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=blue ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=red ctermbg=NONE cterm=underline + hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=magenta ctermbg=NONE cterm=underline + hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=underline + hi Statement ctermfg=darkgreen ctermbg=NONE cterm=bold hi StatusLine ctermfg=white ctermbg=black cterm=bold hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=NONE hi StatusLineTerm ctermfg=black ctermbg=green cterm=bold hi StatusLineTermNC ctermfg=grey ctermbg=darkgreen cterm=NONE - hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE - hi Pmenu ctermfg=black ctermbg=darkgrey cterm=NONE - hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE - hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE - hi PmenuThumb ctermfg=darkgrey ctermbg=darkgrey cterm=NONE - hi PmenuMatch ctermfg=black ctermbg=darkgrey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold + hi StorageClass ctermfg=red ctermbg=NONE cterm=bold hi TabLine ctermfg=black ctermbg=grey cterm=underline hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse hi TabLineSel ctermfg=black ctermbg=white cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Title ctermfg=darkgreen ctermbg=NONE cterm=bold + hi TitleBar ctermfg=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=white cterm=NONE + hi Todo ctermfg=black ctermbg=yellow cterm=NONE hi ToolbarButton ctermfg=NONE ctermbg=darkgrey cterm=bold - hi NonText ctermfg=blue ctermbg=white cterm=NONE - hi SpecialKey ctermfg=blue ctermbg=NONE cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold + hi Underlined ctermfg=darkmagenta ctermbg=NONE cterm=underline + hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE hi Visual ctermfg=black ctermbg=darkgrey cterm=NONE hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline - hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Underlined ctermfg=darkmagenta ctermbg=NONE cterm=underline - hi Error ctermfg=red ctermbg=white cterm=reverse hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE - hi MoreMsg ctermfg=darkgreen ctermbg=white cterm=NONE - hi ModeMsg ctermfg=black ctermbg=white cterm=NONE - hi Question ctermfg=darkred ctermbg=NONE cterm=NONE - hi Todo ctermfg=black ctermbg=yellow cterm=NONE - hi MatchParen ctermfg=white ctermbg=red cterm=NONE - hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE - hi IncSearch ctermfg=darkcyan ctermbg=yellow cterm=reverse hi WildMenu ctermfg=black ctermbg=yellow cterm=bold - hi ColorColumn ctermfg=black ctermbg=red cterm=NONE - hi Cursor ctermfg=white ctermbg=black cterm=NONE hi lCursor ctermfg=black ctermbg=darkred cterm=NONE - hi SpellBad ctermfg=red ctermbg=NONE cterm=underline - hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=magenta ctermbg=NONE cterm=underline - hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=underline - hi Statement ctermfg=darkgreen ctermbg=NONE cterm=bold - hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold - hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi StorageClass ctermfg=red ctermbg=NONE cterm=bold - hi Conceal ctermfg=blue ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE - hi Number ctermfg=darkred ctermbg=NONE cterm=bold - hi Float ctermfg=darkred ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi SpecialChar ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Title ctermfg=darkgreen 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 finish endif if s:t_Co >= 8 hi Normal ctermfg=black ctermbg=grey cterm=NONE - hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE + hi Comment ctermfg=black ctermbg=NONE cterm=bold + hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred 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=NONE cterm=underline 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 Error ctermfg=darkred ctermbg=NONE cterm=bold,reverse + hi Float ctermfg=darkred ctermbg=NONE cterm=bold + hi FoldColumn ctermfg=grey ctermbg=NONE cterm=bold + hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=darkcyan ctermbg=darkyellow cterm=reverse + hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold + hi MatchParen ctermfg=grey ctermbg=darkred cterm=NONE + hi ModeMsg ctermfg=black ctermbg=NONE cterm=NONE + hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Number ctermfg=darkred 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=grey ctermbg=grey cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE + hi PmenuThumb ctermfg=black ctermbg=black cterm=NONE + hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi Question ctermfg=darkred ctermbg=NONE cterm=NONE hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE + hi Search ctermfg=grey ctermbg=darkmagenta cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi SpecialChar ctermfg=darkblue ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse + hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse + hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse + hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=reverse + hi Statement ctermfg=darkgreen ctermbg=NONE cterm=NONE hi StatusLine ctermfg=black ctermbg=grey cterm=bold,reverse hi StatusLineNC ctermfg=black ctermbg=grey cterm=reverse hi StatusLineTerm ctermfg=black ctermbg=darkgreen cterm=bold,reverse hi StatusLineTermNC ctermfg=grey ctermbg=darkgreen cterm=reverse - hi VertSplit ctermfg=black ctermbg=grey cterm=reverse - hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE - hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE - hi PmenuSbar ctermfg=grey ctermbg=grey cterm=NONE - hi PmenuThumb ctermfg=black ctermbg=black cterm=NONE - hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold + hi StorageClass ctermfg=darkred ctermbg=NONE cterm=bold hi TabLine ctermfg=black ctermbg=grey cterm=reverse hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse hi TabLineSel ctermfg=grey ctermbg=black cterm=reverse - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Title ctermfg=darkgreen ctermbg=NONE cterm=bold + hi TitleBar ctermfg=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=white cterm=NONE + hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold,reverse - hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE + 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=black ctermbg=grey cterm=reverse 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=grey ctermbg=NONE cterm=bold - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Error ctermfg=darkred ctermbg=NONE cterm=bold,reverse hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi ModeMsg ctermfg=black ctermbg=NONE cterm=NONE - hi Question ctermfg=darkred ctermbg=NONE cterm=NONE - hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE - hi MatchParen ctermfg=grey ctermbg=darkred cterm=NONE - hi Search ctermfg=grey ctermbg=darkmagenta cterm=NONE - hi IncSearch ctermfg=darkcyan ctermbg=darkyellow cterm=reverse hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold - hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE - hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse - hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse - hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse - hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=reverse - hi Statement ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Comment ctermfg=black ctermbg=NONE cterm=bold - hi StorageClass ctermfg=darkred ctermbg=NONE cterm=bold - hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE - hi Number ctermfg=darkred ctermbg=NONE cterm=bold - hi Float ctermfg=darkred ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi SpecialChar ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Title ctermfg=darkgreen 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=darkred 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 EndOfBuffer term=NONE + hi ErrorMsg term=bold,reverse + hi Function term=NONE + hi Terminal term=NONE finish endif -" Background: light -" Color: Black #000000 16 black -" Color: DarkGrey #767676 243 darkgrey -" Color: MediumGrey #A8A8A8 248 darkgrey -" Color: LightGrey #DADADA 253 grey -" Color: White #ffffff 231 white -" Color: Cyan #00ffff 51 cyan -" Color: Magenta #ff00ff 201 magenta -" Color: Red #ff0000 196 red -" Color: Yellow #ffff00 226 yellow -" Color: SeaGreen #2e8b57 29 darkgreen -" Color: DarkBlue #00008b 18 darkblue -" Color: DarkCyan #008b8b 30 darkcyan -" Color: DarkGreen #006400 22 darkgreen -" Color: DarkOrange #ff8c00 208 darkyellow -" Color: DarkRed #8b0000 88 darkred -" Color: LightBlue #add8e6 153 blue -" Color: LightGreen #90ee90 120 green -" Color: LightMagenta#ff83fa 213 magenta -" Color: LightRed #ffafaf 217 red -" Color: MutedRed #a07070 95 darkred -" Color: MutedYellow #ffff60 228 yellow -" Color: Purple #6a0dad 55 darkmagenta -" Term colors: Black DarkRed DarkGreen Yellow DarkBlue Purple DarkCyan LightGrey -" Term colors: DarkGrey LightRed LightGreen MutedYellow LightBlue Magenta Cyan 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 diff --git a/runtime/colors/slate.vim b/runtime/colors/slate.vim index f7ce591f9b..9795408bb6 100644 --- a/runtime/colors/slate.vim +++ b/runtime/colors/slate.vim @@ -2,440 +2,268 @@ " Description: Remake of slate " Author: Original maintainer Ralph Amissah " Maintainer: Original maintainer Ralph Amissah -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = 'slate' -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! 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! link PopupSelected PmenuSel -hi Normal guifg=#ffffff guibg=#262626 gui=NONE cterm=NONE -hi EndOfBuffer guifg=#5f87d7 guibg=NONE gui=NONE cterm=NONE -hi StatusLine guifg=#000000 guibg=#afaf87 gui=NONE cterm=NONE -hi StatusLineNC guifg=#666666 guibg=#afaf87 gui=NONE cterm=NONE -hi StatusLineTerm guifg=#000000 guibg=#afaf87 gui=NONE cterm=NONE -hi StatusLineTermNC guifg=#666666 guibg=#afaf87 gui=NONE cterm=NONE -hi VertSplit guifg=#666666 guibg=#afaf87 gui=NONE cterm=NONE -hi Pmenu guifg=NONE guibg=#4a4a4a gui=NONE cterm=NONE -hi PmenuSel guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE -hi PmenuSbar guifg=NONE guibg=#262626 gui=NONE cterm=NONE -hi PmenuThumb guifg=NONE guibg=#ffd700 gui=NONE cterm=NONE -hi PmenuMatch guifg=#d7875f guibg=#4a4a4a gui=NONE cterm=NONE -hi PmenuMatchSel guifg=#d7875f guibg=#d7d787 gui=NONE cterm=NONE -hi TabLineSel guifg=#000000 guibg=#afaf87 gui=NONE cterm=NONE -hi TabLine guifg=#666666 guibg=#333333 gui=NONE cterm=NONE -hi TabLineFill guifg=#ff8787 guibg=#333333 gui=NONE cterm=NONE -hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi ToolbarButton guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE -hi NonText guifg=#5f87d7 guibg=NONE gui=NONE cterm=NONE -hi SpecialKey guifg=#00875f guibg=NONE gui=NONE cterm=NONE -hi QuickFixLine guifg=#000000 guibg=#5f87d7 gui=NONE cterm=NONE -hi Folded guifg=#666666 guibg=#000000 gui=NONE cterm=NONE -hi FoldColumn guifg=#5f87d7 guibg=#000000 gui=NONE cterm=NONE -hi CursorLine guifg=NONE guibg=#333333 gui=NONE cterm=NONE -hi CursorColumn guifg=NONE guibg=#333333 gui=NONE cterm=NONE -hi ColorColumn guifg=NONE guibg=#000000 gui=NONE cterm=NONE -hi CursorLineNr guifg=NONE guibg=#333333 gui=NONE cterm=NONE -hi Visual guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE -hi SignColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE -hi VisualNOS guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE -hi LineNr guifg=#666666 guibg=NONE gui=NONE cterm=NONE -hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse -hi ErrorMsg guifg=#ff0000 guibg=#000000 gui=reverse cterm=reverse -hi ModeMsg guifg=#262626 guibg=#ffd700 gui=NONE cterm=NONE -hi WarningMsg guifg=#ff8787 guibg=NONE gui=NONE cterm=NONE -hi MoreMsg guifg=#00875f guibg=NONE gui=NONE cterm=NONE -hi Question guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE -hi MatchParen guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE -hi Search guifg=#000000 guibg=#d7875f gui=NONE cterm=NONE -hi IncSearch guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE -hi Todo guifg=#ff0000 guibg=#ffff00 gui=NONE cterm=NONE -hi WildMenu guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE -hi Underlined guifg=#5f87d7 guibg=NONE gui=underline cterm=underline -hi Cursor guifg=#333333 guibg=#d7d787 gui=NONE cterm=NONE -hi lCursor guifg=#262626 guibg=#ffafaf gui=NONE cterm=NONE -hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline -hi SpellCap guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl cterm=underline -hi SpellLocal guifg=#ffafaf guibg=NONE guisp=#ffafaf gui=undercurl cterm=underline -hi SpellRare guifg=#ffd7af guibg=NONE guisp=#ffd7af gui=undercurl cterm=underline -hi Comment guifg=#666666 guibg=NONE gui=NONE cterm=NONE -hi String guifg=#87d7ff guibg=NONE gui=NONE cterm=NONE -hi Identifier guifg=#ff8787 guibg=NONE gui=NONE cterm=NONE -hi Function guifg=#ffd7af guibg=NONE gui=NONE cterm=NONE -hi Special guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE -hi Statement guifg=#5f87d7 guibg=NONE gui=bold cterm=bold -hi Constant guifg=#ffafaf guibg=NONE gui=NONE cterm=NONE -hi PreProc guifg=#d7875f guibg=NONE gui=NONE cterm=NONE -hi Type guifg=#5f87d7 guibg=NONE gui=bold cterm=bold -hi Operator guifg=#d7875f guibg=NONE gui=NONE cterm=NONE -hi Define guifg=#ffd700 guibg=NONE gui=bold cterm=bold -hi Structure guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE -hi Directory guifg=#00875f guibg=NONE gui=bold cterm=bold -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=#ffd700 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 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 MessageWindow Pmenu - hi! link PopupNotification Todo - hi! link PopupSelected PmenuSel - hi Normal ctermfg=231 ctermbg=235 cterm=NONE - hi EndOfBuffer ctermfg=68 ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=16 ctermbg=144 cterm=NONE - hi StatusLineNC ctermfg=241 ctermbg=144 cterm=NONE - hi StatusLineTerm ctermfg=16 ctermbg=144 cterm=NONE - hi StatusLineTermNC ctermfg=241 ctermbg=144 cterm=NONE - hi VertSplit ctermfg=241 ctermbg=144 cterm=NONE - hi Pmenu ctermfg=NONE ctermbg=239 cterm=NONE - hi PmenuSel ctermfg=235 ctermbg=186 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=235 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=220 cterm=NONE - hi PmenuMatch ctermfg=173 ctermbg=239 cterm=NONE - hi PmenuMatchSel ctermfg=173 ctermbg=186 cterm=NONE - hi TabLineSel ctermfg=16 ctermbg=144 cterm=NONE - hi TabLine ctermfg=241 ctermbg=236 cterm=NONE - hi TabLineFill ctermfg=210 ctermbg=236 cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=235 ctermbg=186 cterm=NONE - hi NonText ctermfg=68 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=29 ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=16 ctermbg=68 cterm=NONE - hi Folded ctermfg=241 ctermbg=16 cterm=NONE - hi FoldColumn ctermfg=68 ctermbg=16 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=16 cterm=NONE - hi CursorLineNr ctermfg=NONE ctermbg=236 cterm=NONE - hi Visual ctermfg=186 ctermbg=64 cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=235 cterm=NONE - hi VisualNOS ctermfg=186 ctermbg=64 cterm=NONE - hi LineNr ctermfg=241 ctermbg=NONE cterm=NONE - hi Error ctermfg=196 ctermbg=231 cterm=reverse - hi ErrorMsg ctermfg=196 ctermbg=16 cterm=reverse - hi ModeMsg ctermfg=235 ctermbg=220 cterm=NONE - hi WarningMsg ctermfg=210 ctermbg=NONE cterm=NONE - hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE - hi Question ctermfg=220 ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=16 ctermbg=220 cterm=NONE - hi Search ctermfg=16 ctermbg=173 cterm=NONE - hi IncSearch ctermfg=16 ctermbg=46 cterm=NONE - hi Todo ctermfg=196 ctermbg=226 cterm=NONE - hi WildMenu ctermfg=235 ctermbg=186 cterm=NONE - hi Underlined ctermfg=68 ctermbg=NONE cterm=underline - hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=226 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=217 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=223 ctermbg=NONE cterm=underline - hi Comment ctermfg=241 ctermbg=NONE cterm=NONE - hi String ctermfg=117 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=210 ctermbg=NONE cterm=NONE - hi Function ctermfg=223 ctermbg=NONE cterm=NONE - hi Special ctermfg=186 ctermbg=NONE cterm=NONE - hi Statement ctermfg=68 ctermbg=NONE cterm=bold - hi Constant ctermfg=217 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=173 ctermbg=NONE cterm=NONE - hi Type ctermfg=68 ctermbg=NONE cterm=bold - hi Operator ctermfg=173 ctermbg=NONE cterm=NONE - hi Define ctermfg=220 ctermbg=NONE cterm=bold - hi Structure ctermfg=46 ctermbg=NONE cterm=NONE - hi Directory ctermfg=29 ctermbg=NONE cterm=bold - hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Title ctermfg=220 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=#262626 guisp=NONE gui=NONE ctermfg=231 ctermbg=235 cterm=NONE term=NONE +hi ColorColumn guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse +hi Comment guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=241 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=#ffafaf guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE +hi CursorColumn guifg=NONE guibg=#333333 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=NONE +hi CursorLine guifg=NONE guibg=#333333 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=underline +hi CursorLineNr guifg=NONE guibg=#333333 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=bold +hi Define guifg=#ffd700 guibg=NONE guisp=NONE gui=bold ctermfg=220 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=#00875f guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE +hi EndOfBuffer guifg=#5f87d7 guibg=NONE guisp=NONE gui=NONE ctermfg=68 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=#000000 guisp=NONE gui=reverse ctermfg=196 ctermbg=16 cterm=reverse term=bold,reverse +hi FoldColumn guifg=#5f87d7 guibg=#000000 guisp=NONE gui=NONE ctermfg=68 ctermbg=16 cterm=NONE term=NONE +hi Folded guifg=#666666 guibg=#000000 guisp=NONE gui=NONE ctermfg=241 ctermbg=16 cterm=NONE term=NONE +hi Function guifg=#ffd7af guibg=NONE guisp=NONE gui=NONE ctermfg=223 ctermbg=NONE cterm=NONE term=NONE +hi Identifier guifg=#ff8787 guibg=NONE guisp=NONE gui=NONE ctermfg=210 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=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE +hi MatchParen guifg=#000000 guibg=#ffd700 guisp=NONE gui=NONE ctermfg=16 ctermbg=220 cterm=NONE term=bold,underline +hi ModeMsg guifg=#262626 guibg=#ffd700 guisp=NONE gui=NONE ctermfg=235 ctermbg=220 cterm=NONE term=bold +hi MoreMsg guifg=#00875f guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=NONE +hi NonText guifg=#5f87d7 guibg=NONE guisp=NONE gui=NONE ctermfg=68 ctermbg=NONE cterm=NONE term=NONE +hi Operator guifg=#d7875f guibg=NONE guisp=NONE gui=NONE ctermfg=173 ctermbg=NONE cterm=NONE term=NONE +hi Pmenu guifg=NONE guibg=#4a4a4a guisp=NONE gui=NONE ctermfg=NONE ctermbg=239 cterm=NONE term=reverse +hi PmenuMatch guifg=#d7875f guibg=#4a4a4a guisp=NONE gui=NONE ctermfg=173 ctermbg=239 cterm=NONE term=NONE +hi PmenuMatchSel guifg=#d7875f guibg=#d7d787 guisp=NONE gui=NONE ctermfg=173 ctermbg=186 cterm=NONE term=NONE +hi PmenuSbar guifg=NONE guibg=#262626 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=reverse +hi PmenuSel guifg=#262626 guibg=#d7d787 guisp=NONE gui=NONE ctermfg=235 ctermbg=186 cterm=NONE term=bold +hi PmenuThumb guifg=NONE guibg=#ffd700 guisp=NONE gui=NONE ctermfg=NONE ctermbg=220 cterm=NONE term=NONE +hi PreProc guifg=#d7875f guibg=NONE guisp=NONE gui=NONE ctermfg=173 ctermbg=NONE cterm=NONE term=NONE +hi Question guifg=#ffd700 guibg=NONE guisp=NONE gui=NONE ctermfg=220 ctermbg=NONE cterm=NONE term=standout +hi QuickFixLine guifg=#000000 guibg=#5f87d7 guisp=NONE gui=NONE ctermfg=16 ctermbg=68 cterm=NONE term=NONE +hi Search guifg=#000000 guibg=#d7875f guisp=NONE gui=NONE ctermfg=16 ctermbg=173 cterm=NONE term=reverse +hi SignColumn guifg=NONE guibg=#262626 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=reverse +hi Special guifg=#d7d787 guibg=NONE guisp=NONE gui=NONE ctermfg=186 ctermbg=NONE cterm=NONE term=NONE +hi SpecialKey guifg=#00875f guibg=NONE guisp=NONE gui=NONE ctermfg=29 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=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl ctermfg=226 ctermbg=NONE cterm=underline term=underline +hi SpellLocal guifg=#ffafaf guibg=NONE guisp=#ffafaf gui=undercurl ctermfg=217 ctermbg=NONE cterm=underline term=underline +hi SpellRare guifg=#ffd7af guibg=NONE guisp=#ffd7af gui=undercurl ctermfg=223 ctermbg=NONE cterm=underline term=underline +hi Statement guifg=#5f87d7 guibg=NONE guisp=NONE gui=bold ctermfg=68 ctermbg=NONE cterm=bold term=NONE +hi StatusLine guifg=#000000 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=16 ctermbg=144 cterm=NONE term=bold,reverse +hi StatusLineNC guifg=#666666 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=241 ctermbg=144 cterm=NONE term=bold,underline +hi StatusLineTerm guifg=#000000 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=16 ctermbg=144 cterm=NONE term=bold,reverse +hi StatusLineTermNC guifg=#666666 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=241 ctermbg=144 cterm=NONE term=bold,underline +hi String guifg=#87d7ff guibg=NONE guisp=NONE gui=NONE ctermfg=117 ctermbg=NONE cterm=NONE term=NONE +hi Structure guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=NONE +hi TabLine guifg=#666666 guibg=#333333 guisp=NONE gui=NONE ctermfg=241 ctermbg=236 cterm=NONE term=bold,underline +hi TabLineFill guifg=#ff8787 guibg=#333333 guisp=NONE gui=NONE ctermfg=210 ctermbg=236 cterm=NONE term=NONE +hi TabLineSel guifg=#000000 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=16 ctermbg=144 cterm=NONE term=bold,reverse +hi Title guifg=#ffd700 guibg=NONE guisp=NONE gui=bold ctermfg=220 ctermbg=NONE cterm=bold term=NONE +hi TitleBar guifg=#ffffff guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=231 ctermbg=237 cterm=NONE term=NONE +hi TitleBarNC guifg=#666666 guibg=#2c2c2c guisp=NONE gui=NONE ctermfg=241 ctermbg=236 cterm=NONE term=NONE +hi Todo guifg=#ff0000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=196 ctermbg=226 cterm=NONE term=bold,reverse +hi ToolbarButton guifg=#262626 guibg=#d7d787 guisp=NONE gui=NONE ctermfg=235 ctermbg=186 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=#5f87d7 guibg=NONE guisp=NONE gui=bold ctermfg=68 ctermbg=NONE cterm=bold term=NONE +hi Underlined guifg=#5f87d7 guibg=NONE guisp=NONE gui=underline ctermfg=68 ctermbg=NONE cterm=underline term=underline +hi VertSplit guifg=#666666 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=241 ctermbg=144 cterm=NONE term=NONE +hi Visual guifg=#d7d787 guibg=#5f8700 guisp=NONE gui=NONE ctermfg=186 ctermbg=64 cterm=NONE term=reverse +hi VisualNOS guifg=#d7d787 guibg=#5f8700 guisp=NONE gui=NONE ctermfg=186 ctermbg=64 cterm=NONE term=NONE +hi WarningMsg guifg=#ff8787 guibg=NONE guisp=NONE gui=NONE ctermfg=210 ctermbg=NONE cterm=NONE term=standout +hi WildMenu guifg=#262626 guibg=#d7d787 guisp=NONE gui=NONE ctermfg=235 ctermbg=186 cterm=NONE term=bold + +if has('gui_running') || s:tgc + hi Cursor guifg=#333333 guibg=#d7d787 guisp=NONE gui=NONE cterm=NONE + hi lCursor guifg=#262626 guibg=#ffafaf guisp=NONE gui=NONE cterm=NONE +endif + +if s:tgc || s:t_Co >= 256 finish endif if s:t_Co >= 16 hi Normal ctermfg=grey ctermbg=black cterm=NONE - hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold - hi StatusLine ctermfg=white ctermbg=black cterm=bold,reverse - hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE - hi StatusLineTerm ctermfg=white ctermbg=black cterm=bold,reverse - hi StatusLineTermNC ctermfg=black 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=darkmagenta cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=yellow cterm=NONE - hi PmenuMatch ctermfg=black ctermbg=darkgrey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=darkmagenta cterm=bold - hi TabLineSel ctermfg=black ctermbg=darkyellow cterm=NONE - hi TabLine ctermfg=grey ctermbg=darkgrey cterm=NONE - hi TabLineFill ctermfg=cyan ctermbg=darkgrey 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=green ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE - hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE + hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE + hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkyellow ctermbg=NONE 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=bold - hi ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE - hi Visual ctermfg=yellow ctermbg=darkgreen cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=black cterm=NONE - hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=NONE - hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE + hi Define ctermfg=yellow 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=darkgreen ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold hi Error ctermfg=darkred ctermbg=white cterm=reverse hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse + hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Function ctermfg=yellow ctermbg=NONE cterm=NONE + hi Identifier ctermfg=red ctermbg=NONE cterm=bold + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE + hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=black ctermbg=yellow cterm=NONE hi ModeMsg ctermfg=black ctermbg=yellow cterm=NONE - hi WarningMsg ctermfg=cyan ctermbg=NONE cterm=NONE hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE + hi NonText ctermfg=blue ctermbg=NONE cterm=NONE + hi Operator ctermfg=red ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE + hi PmenuMatch ctermfg=black ctermbg=darkgrey cterm=bold + hi PmenuMatchSel ctermfg=black ctermbg=darkmagenta cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkmagenta cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=yellow cterm=NONE + hi PreProc ctermfg=red ctermbg=NONE cterm=NONE hi Question ctermfg=yellow ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=black ctermbg=yellow cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE - hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE - hi Todo ctermfg=black ctermbg=yellow cterm=NONE - hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE - hi Underlined ctermfg=blue ctermbg=NONE cterm=underline + hi SignColumn ctermfg=NONE ctermbg=black cterm=NONE + hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=green ctermbg=NONE cterm=NONE hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline hi SpellLocal ctermfg=red ctermbg=NONE cterm=underline hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline hi Statement ctermfg=blue ctermbg=NONE cterm=bold - hi Identifier ctermfg=red ctermbg=NONE cterm=bold - hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE - hi Operator ctermfg=red ctermbg=NONE cterm=NONE - hi PreProc ctermfg=red ctermbg=NONE cterm=NONE - hi Structure ctermfg=green ctermbg=NONE cterm=NONE - hi Function ctermfg=yellow ctermbg=NONE cterm=NONE - hi Type ctermfg=blue ctermbg=NONE cterm=bold - hi Define ctermfg=yellow ctermbg=NONE cterm=bold - hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=white ctermbg=black cterm=bold,reverse + hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE + hi StatusLineTerm ctermfg=white ctermbg=black cterm=bold,reverse + hi StatusLineTermNC ctermfg=black ctermbg=grey cterm=NONE hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold - hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi Structure ctermfg=green ctermbg=NONE cterm=NONE + hi TabLine ctermfg=grey ctermbg=darkgrey cterm=NONE + hi TabLineFill ctermfg=cyan ctermbg=darkgrey cterm=NONE + hi TabLineSel ctermfg=black ctermbg=darkyellow cterm=NONE hi Title ctermfg=darkyellow 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=grey ctermbg=black cterm=NONE + hi Todo ctermfg=black ctermbg=yellow cterm=NONE + hi ToolbarButton ctermfg=black ctermbg=darkyellow cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Type ctermfg=blue ctermbg=NONE cterm=bold + hi Underlined ctermfg=blue ctermbg=NONE cterm=underline + hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE + hi Visual ctermfg=yellow ctermbg=darkgreen cterm=NONE + hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=NONE + hi WarningMsg ctermfg=cyan ctermbg=NONE cterm=NONE + hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE finish endif if s:t_Co >= 8 hi Normal ctermfg=grey ctermbg=black cterm=NONE - hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold - 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=darkyellow cterm=NONE - hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold - hi TabLineSel ctermfg=black ctermbg=darkyellow cterm=NONE - hi TabLine ctermfg=grey ctermbg=black cterm=reverse - hi TabLineFill ctermfg=grey ctermbg=black cterm=reverse - hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse - hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold - hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=bold - hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE - hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE + hi Comment ctermfg=darkgray ctermbg=NONE cterm=bold + hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkyellow ctermbg=NONE 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 ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE - hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=underline - hi LineNr ctermfg=grey ctermbg=NONE cterm=bold - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi Define 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=darkgreen ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold hi Error ctermfg=darkred ctermbg=grey cterm=reverse hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse + hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Function ctermfg=darkyellow ctermbg=NONE cterm=bold + hi Identifier ctermfg=darkred ctermbg=NONE cterm=bold + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE + hi LineNr ctermfg=grey ctermbg=NONE cterm=bold + hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE hi ModeMsg ctermfg=NONE ctermbg=darkyellow cterm=NONE - hi WarningMsg ctermfg=darkcyan ctermbg=NONE cterm=NONE hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold + hi Operator ctermfg=darkred 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=darkyellow cterm=NONE + hi PreProc ctermfg=darkred ctermbg=NONE cterm=bold hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE - hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE - hi Todo ctermfg=black ctermbg=yellow cterm=NONE - hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE - hi Underlined ctermfg=blue ctermbg=NONE cterm=underline + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=bold hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold - hi Identifier ctermfg=darkred ctermbg=NONE cterm=bold - hi Comment ctermfg=darkgray ctermbg=NONE cterm=bold - hi Operator ctermfg=darkred ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkred ctermbg=NONE cterm=bold - hi Structure ctermfg=darkgreen ctermbg=NONE cterm=bold - hi Function ctermfg=darkyellow ctermbg=NONE cterm=bold - hi Type ctermfg=darkblue ctermbg=NONE cterm=bold - hi Define ctermfg=darkyellow ctermbg=NONE cterm=bold - hi Constant ctermfg=darkyellow 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 String ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold - hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi Structure ctermfg=darkgreen ctermbg=NONE cterm=bold + hi TabLine ctermfg=grey ctermbg=black cterm=reverse + hi TabLineFill ctermfg=grey ctermbg=black cterm=reverse + hi TabLineSel ctermfg=black ctermbg=darkyellow cterm=NONE hi Title ctermfg=darkyellow 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=black ctermbg=yellow cterm=NONE + hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Type ctermfg=darkblue ctermbg=NONE cterm=bold + hi Underlined ctermfg=blue ctermbg=NONE cterm=underline + hi VertSplit ctermfg=grey ctermbg=black cterm=reverse + hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse + hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=underline + hi WarningMsg ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE finish endif if s:t_Co >= 0 - hi Normal term=NONE - hi ColorColumn term=reverse - hi Conceal term=NONE + hi CurSearch term=reverse 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 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: foreground #FFFFFF 231 white -" Color: background #262626 235 black -" Color: color00 #000000 16 black -" Color: color08 #333333 236 darkgrey -" Color: color01 #FF0000 196 darkred -" Color: color09 #FFAFAF 217 red -" Color: color02 #5F8700 64 darkgreen -" Color: color10 #00875F 29 green -" Color: color03 #ffff00 226 darkyellow -" Color: color11 #FFD700 220 yellow -" Color: color04 #87d7FF 117 darkblue -" Color: color12 #5F87D7 68 blue -" Color: color05 #d7d787 186 darkmagenta -" Color: color13 #AFAF87 144 magenta -" Color: color06 #FFD7AF 223 darkcyan -" Color: color14 #FF8787 210 cyan -" Color: color07 #666666 241 grey -" Color: color15 #FFFFFF 231 white -" Color: color16 #D7875F 173 darkmagenta -" Color: color17 #00FF00 46 darkgreen -" Color: Pmenu #4A4A4A 239 darkgrey -" 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 diff --git a/runtime/colors/sorbet.vim b/runtime/colors/sorbet.vim index c586baec35..3e45c1500f 100644 --- a/runtime/colors/sorbet.vim +++ b/runtime/colors/sorbet.vim @@ -2,30 +2,27 @@ " Description: A shallow grave, a monument to the ruined age. " Author: Maxence Weynans " Maintainer: Maxence Weynans -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Vim License (see `:help license`)` -" Last Change: 2025 Jan 07 +" 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 = 'sorbet' -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', '#d75f5f', '#87d75f', '#d7af5f', '#87afd7', '#af87d7', '#5fafaf', '#dadada', '#707070', '#ff5f5f', '#87ff5f', '#ffd75f', '#87d7ff', '#d787ff', '#5fd7d7', '#ffffff'] -hi! link Terminal Normal -hi! link StatusLineTerm StatusLine -hi! link StatusLineTermNC StatusLineNC -hi! link MessageWindow Pmenu -hi! link PopupNotification Todo -hi! link PopupSelected PmenuSel hi! link Boolean Constant hi! link Character Constant hi! link Conditional Statement -hi! link Define PreProc hi! link Debug Special +hi! link Define PreProc hi! link Delimiter Special hi! link ErrorMsg Error hi! link Exception Statement @@ -35,191 +32,114 @@ hi! link Include PreProc hi! link Keyword Statement hi! link Label Statement 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 Repeat Statement hi! link SpecialChar Special hi! link SpecialComment Special +hi! link StatusLineTerm StatusLine +hi! link StatusLineTermNC StatusLineNC hi! link StorageClass Type hi! link Structure Type hi! link Tag Special +hi! link Terminal Normal hi! link Typedef Type -hi! link lCursor Cursor hi! link debugPC CursorLine +hi! link lCursor Cursor -if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#000000', '#d75f5f', '#87d75f', '#d7af5f', '#87afd7', '#af87d7', '#5fafaf', '#dadada', '#707070', '#ff5f5f', '#87ff5f', '#ffd75f', '#87d7ff', '#d787ff', '#5fd7d7', '#ffffff'] -endif -hi Normal guifg=#dadada guibg=#161821 gui=NONE cterm=NONE -hi Added guifg=#87d75f guibg=NONE gui=NONE cterm=NONE -hi Changed guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE -hi Removed guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE -hi ColorColumn guifg=NONE guibg=#262831 gui=NONE cterm=NONE -hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse -hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse -hi CursorColumn guifg=NONE guibg=#363841 gui=NONE cterm=NONE -hi CursorLine guifg=NONE guibg=#363841 gui=NONE cterm=NONE -hi CursorLineNr guifg=#d7d7ff guibg=#363841 gui=NONE cterm=NONE -hi DiffAdd guifg=#00af5f guibg=#000000 gui=reverse cterm=reverse -hi DiffChange guifg=#87afff guibg=#000000 gui=reverse cterm=reverse -hi DiffDelete guifg=#d7005f guibg=#000000 gui=reverse cterm=reverse -hi DiffText guifg=#ff87ff guibg=#000000 gui=reverse cterm=reverse -hi Directory guifg=#dadada guibg=NONE gui=NONE cterm=NONE -hi EndOfBuffer guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE -hi FoldColumn guifg=#8787af guibg=NONE gui=NONE cterm=NONE -hi Folded guifg=#5f5f87 guibg=#161821 gui=NONE cterm=NONE -hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse -hi LineNr guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE -hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold -hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold -hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE -hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE -hi Pmenu guifg=#000000 guibg=#a6a8b1 gui=NONE cterm=NONE -hi PmenuMatch guifg=#d7005f guibg=#a6a8b1 gui=NONE cterm=NONE -hi PmenuExtra guifg=#000000 guibg=#a6a8b1 gui=NONE cterm=NONE -hi PmenuKind guifg=#000000 guibg=#a6a8b1 gui=bold cterm=bold -hi PmenuSbar guifg=#707070 guibg=#5f5f87 gui=NONE cterm=NONE -hi PmenuSel guifg=#000000 guibg=#d7d7ff gui=NONE cterm=NONE -hi PmenuMatchSel guifg=#d7005f guibg=#d7d7ff gui=bold cterm=bold -hi PmenuExtraSel guifg=#000000 guibg=#d7d7ff gui=NONE cterm=NONE -hi PmenuKindSel guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold -hi PmenuThumb guifg=#dadada guibg=#d7d7ff gui=NONE cterm=NONE -hi Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE -hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse -hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse -hi SignColumn guifg=#dadada guibg=NONE gui=NONE cterm=NONE -hi SpecialKey guifg=#5f5f87 guibg=NONE gui=bold cterm=bold -hi SpellBad guifg=#d75f5f guibg=NONE guisp=#d75f5f gui=undercurl cterm=underline -hi SpellCap guifg=#87afd7 guibg=NONE guisp=#87afd7 gui=undercurl cterm=underline -hi SpellLocal guifg=#af87d7 guibg=NONE guisp=#af87d7 gui=undercurl cterm=underline -hi SpellRare guifg=#5fafaf guibg=NONE guisp=#5fafaf gui=undercurl cterm=underline -hi StatusLine guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold -hi StatusLineNC guifg=#8787af guibg=#000000 gui=reverse cterm=reverse -hi TabLine guifg=#8787af guibg=#000000 gui=reverse cterm=reverse -hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE -hi TabLineSel guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold -hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi VertSplit guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE -hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse -hi VisualNOS guifg=NONE guibg=#363841 gui=NONE cterm=NONE -hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE -hi WildMenu guifg=#d7d7ff guibg=#161821 gui=bold cterm=bold -hi Comment guifg=#af87d7 guibg=NONE gui=NONE cterm=NONE -hi Constant guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE -hi Error guifg=#ff5f5f guibg=#000000 gui=bold,reverse cterm=bold,reverse -hi Identifier guifg=#87d75f guibg=NONE gui=NONE cterm=NONE -hi Ignore guifg=#dadada guibg=NONE gui=NONE cterm=NONE -hi PreProc guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE -hi Special guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE -hi Statement guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE -hi String guifg=#d7af5f guibg=NONE gui=NONE cterm=NONE -hi Todo guifg=#5fd7af guibg=NONE gui=bold,reverse cterm=bold,reverse -hi Type guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE -hi Underlined guifg=#dadada guibg=NONE gui=underline cterm=underline -hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE -hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE -hi ToolbarButton guifg=#dadada guibg=#000000 gui=bold cterm=bold -hi debugBreakpoint guifg=#8787af guibg=#000000 gui=bold,reverse cterm=bold,reverse +hi Normal guifg=#dadada guibg=#161821 guisp=NONE gui=NONE ctermfg=253 ctermbg=233 cterm=NONE term=NONE +hi Added guifg=#87d75f guibg=NONE guisp=NONE gui=NONE ctermfg=113 ctermbg=NONE cterm=NONE term=NONE +hi Changed guifg=#87afd7 guibg=NONE guisp=NONE gui=NONE ctermfg=110 ctermbg=NONE cterm=NONE term=NONE +hi ColorColumn guifg=NONE guibg=#262831 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=reverse +hi Comment guifg=#af87d7 guibg=NONE guisp=NONE gui=NONE ctermfg=140 ctermbg=NONE cterm=NONE term=bold +hi Conceal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE +hi Constant guifg=#d75f5f guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE +hi CurSearch guifg=#ff5fff guibg=#000000 guisp=NONE gui=reverse ctermfg=207 ctermbg=16 cterm=reverse term=reverse +hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=reverse +hi CursorColumn guifg=NONE guibg=#363841 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=NONE +hi CursorIM guifg=#000000 guibg=#afff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=154 cterm=NONE term=NONE +hi CursorLine guifg=NONE guibg=#363841 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=underline +hi CursorLineNr guifg=#d7d7ff guibg=#363841 guisp=NONE gui=NONE ctermfg=189 ctermbg=237 cterm=NONE term=bold +hi DiffAdd guifg=#00af5f guibg=#000000 guisp=NONE gui=reverse ctermfg=35 ctermbg=16 cterm=reverse term=reverse +hi DiffChange guifg=#87afff guibg=#000000 guisp=NONE gui=reverse ctermfg=111 ctermbg=16 cterm=reverse term=NONE +hi DiffDelete guifg=#d7005f guibg=#000000 guisp=NONE gui=reverse ctermfg=161 ctermbg=16 cterm=reverse term=reverse +hi DiffText guifg=#ff87ff guibg=#000000 guisp=NONE gui=reverse ctermfg=213 ctermbg=16 cterm=reverse term=reverse +hi Directory guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE +hi EndOfBuffer guifg=#5f5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=60 ctermbg=NONE cterm=NONE term=NONE +hi Error guifg=#ff5f5f guibg=#000000 guisp=NONE gui=bold,reverse ctermfg=203 ctermbg=16 cterm=bold,reverse term=bold,reverse +hi FoldColumn guifg=#8787af guibg=NONE guisp=NONE gui=NONE ctermfg=103 ctermbg=NONE cterm=NONE term=NONE +hi Folded guifg=#5f5f87 guibg=#161821 guisp=NONE gui=NONE ctermfg=60 ctermbg=233 cterm=NONE term=NONE +hi Identifier guifg=#87d75f guibg=NONE guisp=NONE gui=NONE ctermfg=113 ctermbg=NONE cterm=NONE term=NONE +hi Ignore guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE +hi IncSearch guifg=#ffaf00 guibg=#000000 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 cterm=reverse term=bold,reverse,underline +hi LineNr guifg=#5f5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=60 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=#dadada guibg=NONE guisp=NONE gui=bold ctermfg=253 ctermbg=NONE cterm=bold term=bold +hi MoreMsg guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE +hi NonText guifg=#707070 guibg=NONE guisp=NONE gui=NONE ctermfg=242 ctermbg=NONE cterm=NONE term=NONE +hi Pmenu guifg=#000000 guibg=#a6a8b1 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=reverse +hi PmenuExtra guifg=#000000 guibg=#a6a8b1 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=NONE +hi PmenuExtraSel guifg=#000000 guibg=#d7d7ff guisp=NONE gui=NONE ctermfg=16 ctermbg=189 cterm=NONE term=NONE +hi PmenuKind guifg=#000000 guibg=#a6a8b1 guisp=NONE gui=bold ctermfg=16 ctermbg=248 cterm=bold term=bold +hi PmenuKindSel guifg=#000000 guibg=#d7d7ff guisp=NONE gui=bold ctermfg=16 ctermbg=189 cterm=bold term=bold +hi PmenuMatch guifg=#d7005f guibg=#a6a8b1 guisp=NONE gui=NONE ctermfg=161 ctermbg=248 cterm=NONE term=NONE +hi PmenuMatchSel guifg=#d7005f guibg=#d7d7ff guisp=NONE gui=bold ctermfg=161 ctermbg=189 cterm=bold term=bold +hi PmenuSbar guifg=#707070 guibg=#5f5f87 guisp=NONE gui=NONE ctermfg=242 ctermbg=60 cterm=NONE term=reverse +hi PmenuSel guifg=#000000 guibg=#d7d7ff guisp=NONE gui=NONE ctermfg=16 ctermbg=189 cterm=NONE term=bold +hi PmenuThumb guifg=#dadada guibg=#d7d7ff guisp=NONE gui=NONE ctermfg=253 ctermbg=189 cterm=NONE term=NONE +hi PreProc guifg=#87afd7 guibg=NONE guisp=NONE gui=NONE ctermfg=110 ctermbg=NONE cterm=NONE term=NONE +hi Question guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=standout +hi QuickFixLine guifg=#ff5fff guibg=#000000 guisp=NONE gui=reverse ctermfg=207 ctermbg=16 cterm=reverse term=NONE +hi Removed guifg=#d75f5f guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE +hi Search guifg=#00afff guibg=#000000 guisp=NONE gui=reverse ctermfg=39 ctermbg=16 cterm=reverse term=reverse +hi SignColumn guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=reverse +hi Special guifg=#5fafaf guibg=NONE guisp=NONE gui=NONE ctermfg=73 ctermbg=NONE cterm=NONE term=NONE +hi SpecialKey guifg=#5f5f87 guibg=NONE guisp=NONE gui=bold ctermfg=60 ctermbg=NONE cterm=bold term=bold +hi SpellBad guifg=#d75f5f guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=167 ctermbg=NONE cterm=underline term=underline +hi SpellCap guifg=#87afd7 guibg=NONE guisp=#87afd7 gui=undercurl ctermfg=110 ctermbg=NONE cterm=underline term=underline +hi SpellLocal guifg=#af87d7 guibg=NONE guisp=#af87d7 gui=undercurl ctermfg=140 ctermbg=NONE cterm=underline term=underline +hi SpellRare guifg=#5fafaf guibg=NONE guisp=#5fafaf gui=undercurl ctermfg=73 ctermbg=NONE cterm=underline term=underline +hi Statement guifg=#87afd7 guibg=NONE guisp=NONE gui=NONE ctermfg=110 ctermbg=NONE cterm=NONE term=NONE +hi StatusLine guifg=#000000 guibg=#d7d7ff guisp=NONE gui=bold ctermfg=16 ctermbg=189 cterm=bold term=bold,reverse +hi StatusLineNC guifg=#8787af guibg=#000000 guisp=NONE gui=reverse ctermfg=103 ctermbg=16 cterm=reverse term=bold,underline +hi String guifg=#d7af5f guibg=NONE guisp=NONE gui=NONE ctermfg=179 ctermbg=NONE cterm=NONE term=NONE +hi TabLine guifg=#8787af guibg=#000000 guisp=NONE gui=reverse ctermfg=103 ctermbg=16 cterm=reverse term=bold,underline +hi TabLineFill guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE +hi TabLineSel guifg=#000000 guibg=#d7d7ff guisp=NONE gui=bold ctermfg=16 ctermbg=189 cterm=bold term=bold,reverse +hi Title guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE +hi TitleBar guifg=#dadada guibg=#363851 guisp=NONE gui=NONE ctermfg=253 ctermbg=237 cterm=NONE term=NONE +hi TitleBarNC guifg=#707070 guibg=#262841 guisp=NONE gui=NONE ctermfg=242 ctermbg=236 cterm=NONE term=NONE +hi Todo guifg=#5fd7af guibg=NONE guisp=NONE gui=bold,reverse ctermfg=79 ctermbg=NONE cterm=bold,reverse term=bold,reverse +hi ToolbarButton guifg=#dadada guibg=#000000 guisp=NONE gui=bold ctermfg=253 ctermbg=16 cterm=bold term=bold,reverse +hi ToolbarLine guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse +hi Type guifg=#87afd7 guibg=NONE guisp=NONE gui=NONE ctermfg=110 ctermbg=NONE cterm=NONE term=NONE +hi Underlined guifg=#dadada guibg=NONE guisp=NONE gui=underline ctermfg=253 ctermbg=NONE cterm=underline term=underline +hi VertSplit guifg=#5f5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=60 ctermbg=NONE cterm=NONE term=NONE +hi Visual guifg=#ffaf00 guibg=#000000 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 cterm=reverse term=reverse +hi VisualNOS guifg=NONE guibg=#363841 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=NONE +hi WarningMsg guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=standout +hi WildMenu guifg=#d7d7ff guibg=#161821 guisp=NONE gui=bold ctermfg=189 ctermbg=233 cterm=bold term=bold +hi debugBreakpoint guifg=#8787af guibg=#000000 guisp=NONE gui=bold,reverse ctermfg=103 ctermbg=16 cterm=bold,reverse term=bold,reverse -if s:t_Co >= 256 - hi Normal ctermfg=253 ctermbg=233 cterm=NONE - hi Added ctermfg=113 ctermbg=NONE cterm=NONE - hi Changed ctermfg=110 ctermbg=NONE cterm=NONE - hi Removed ctermfg=167 ctermbg=NONE cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=235 cterm=NONE - hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE - hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse - hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse - hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE - hi CursorLineNr ctermfg=189 ctermbg=237 cterm=NONE - hi DiffAdd ctermfg=35 ctermbg=16 cterm=reverse - hi DiffChange ctermfg=111 ctermbg=16 cterm=reverse - hi DiffDelete ctermfg=161 ctermbg=16 cterm=reverse - hi DiffText ctermfg=213 ctermbg=16 cterm=reverse - hi Directory ctermfg=253 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=60 ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=103 ctermbg=NONE cterm=NONE - hi Folded ctermfg=60 ctermbg=233 cterm=NONE - hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse - hi LineNr ctermfg=60 ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold - hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=253 ctermbg=NONE cterm=NONE - hi NonText ctermfg=242 ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE - hi PmenuMatch ctermfg=161 ctermbg=248 cterm=NONE - hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE - hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold - hi PmenuSbar ctermfg=242 ctermbg=60 cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=189 cterm=NONE - hi PmenuMatchSel ctermfg=161 ctermbg=189 cterm=bold - hi PmenuExtraSel ctermfg=16 ctermbg=189 cterm=NONE - hi PmenuKindSel ctermfg=16 ctermbg=189 cterm=bold - hi PmenuThumb ctermfg=253 ctermbg=189 cterm=NONE - hi Question ctermfg=253 ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse - hi Search ctermfg=39 ctermbg=16 cterm=reverse - hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=60 ctermbg=NONE cterm=bold - hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=110 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=140 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=73 ctermbg=NONE cterm=underline - hi StatusLine ctermfg=16 ctermbg=189 cterm=bold - hi StatusLineNC ctermfg=103 ctermbg=16 cterm=reverse - hi TabLine ctermfg=103 ctermbg=16 cterm=reverse - hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE - hi TabLineSel ctermfg=16 ctermbg=189 cterm=bold - hi Title ctermfg=NONE ctermbg=NONE cterm=NONE - hi VertSplit ctermfg=60 ctermbg=NONE cterm=NONE - hi Visual ctermfg=214 ctermbg=16 cterm=reverse - hi VisualNOS ctermfg=NONE ctermbg=237 cterm=NONE - hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE - hi WildMenu ctermfg=189 ctermbg=233 cterm=bold - hi Comment ctermfg=140 ctermbg=NONE cterm=NONE - hi Constant ctermfg=167 ctermbg=NONE cterm=NONE - hi Error ctermfg=203 ctermbg=16 cterm=bold,reverse - hi Identifier ctermfg=113 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=253 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=110 ctermbg=NONE cterm=NONE - hi Special ctermfg=73 ctermbg=NONE cterm=NONE - hi Statement ctermfg=110 ctermbg=NONE cterm=NONE - hi String ctermfg=179 ctermbg=NONE cterm=NONE - hi Todo ctermfg=79 ctermbg=NONE cterm=bold,reverse - hi Type ctermfg=110 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=253 ctermbg=NONE cterm=underline - hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE - hi ToolbarButton ctermfg=253 ctermbg=16 cterm=bold - hi debugBreakpoint ctermfg=103 ctermbg=16 cterm=bold,reverse - unlet s:t_Co +if s:tgc || s:t_Co >= 256 finish endif if s:t_Co >= 16 - hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse - hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse - hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse - hi Search ctermfg=cyan ctermbg=black cterm=reverse - hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold - hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse - hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse - hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse + hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE + hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse @@ -227,75 +147,76 @@ if s:t_Co >= 16 hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse + hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE + hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuMatch ctermfg=NONE ctermbg=darkred cterm=reverse hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse - hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold - hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold 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=darkred cterm=reverse + hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE + hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE hi Question ctermfg=NONE ctermbg=NONE cterm=standout hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse + hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE + hi Search ctermfg=cyan 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=bold hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline + hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse + hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi Title ctermfg=NONE ctermbg=NONE cterm=NONE + hi TitleBar ctermfg=grey ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE + hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse + hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse + hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold - hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE - hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse - hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE - hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse - hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse - hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse - unlet s:t_Co finish endif if s:t_Co >= 8 - hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse - hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE - hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE - hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse - hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE - hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse - hi Search ctermfg=darkcyan ctermbg=black cterm=reverse - hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold - hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline - hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline - hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse + hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE + hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse @@ -303,159 +224,75 @@ if s:t_Co >= 8 hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE + hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse + 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=NONE ctermbg=NONE cterm=NONE + hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuMatch ctermfg=NONE ctermbg=darkred cterm=reverse hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse - hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse - hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold - hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold 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=darkred cterm=reverse + hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE + hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE hi Question ctermfg=NONE ctermbg=NONE cterm=standout hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse + hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE + hi Search ctermfg=darkcyan ctermbg=black cterm=reverse hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline + hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline + hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi Title ctermfg=NONE ctermbg=NONE cterm=NONE + hi TitleBar ctermfg=grey ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE + hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse + hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse + hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold - hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE - hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse - hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE - hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse - hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse - hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse - 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 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 Terminal term=NONE finish endif -" Background: dark -" Color: guibg #161821 233 black -" Color: statusline #d7d7ff 189 white -" Color: statuslineNC #8787af 103 grey -" Color: darkuipurple #5f5f87 60 grey -" Color: dark0 #000000 16 black -" Color: dark1 #d75f5f 167 darkred -" Color: dark2 #87d75f 113 darkgreen -" Color: dark3 #d7af5f 179 darkyellow -" Color: dark4 #87afd7 110 darkblue -" Color: dark5 #af87d7 140 darkmagenta -" Color: dark6 #5fafaf 73 darkcyan -" Color: dark7 #dadada 253 grey -" Color: dark8 #707070 242 darkgrey -" Color: dark9 #ff5f5f 203 red -" Color: dark10 #87ff5f 119 green -" Color: dark11 #ffd75f 221 yellow -" Color: dark12 #87d7ff 117 blue -" Color: dark13 #d787ff 177 magenta -" Color: dark14 #5fd7d7 80 cyan -" Color: dark15 #ffffff 231 white -" Color: diffred #d7005f 161 darkred -" Color: diffgreen #00af5f 35 darkgreen -" Color: diffblue #87afff 111 darkblue -" Color: diffpink #ff87ff 213 darkmagenta -" Color: uipink #ff00af 199 magenta -" Color: uilime #afff00 154 green -" Color: uiteal #5fd7af 79 green -" Color: uiblue #00afff 39 blue -" Color: uipurple #af00ff 129 darkmagenta -" Color: uiamber #ffaf00 214 darkyellow -" Color: uiblack #363841 237 darkgrey -" Color: yasogrey #262831 235 black -" Color: linenrblack #585858 240 darkgrey -" Color: uicursearch #ff5fff 207 magenta -" Color: invisigrey #a6a8b1 248 darkgrey -" Color: errorred #ff5f5f 203 red -" Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7 -" Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15 " vim: et ts=8 sw=2 sts=2 diff --git a/runtime/colors/tools/check_colors.vim b/runtime/colors/tools/check_colors.vim index c3fb2264e8..4217de98c7 100644 --- a/runtime/colors/tools/check_colors.vim +++ b/runtime/colors/tools/check_colors.vim @@ -34,7 +34,7 @@ def Test_check_colors() 'Comment', 'Conceal', 'Constant', - 'CurSearch', + 'CurSearch', 'Cursor', 'CursorColumn', 'CursorLine', @@ -66,6 +66,7 @@ def Test_check_colors() 'PmenuSbar', 'PmenuSel', 'PmenuThumb', + 'PopupNotification', 'PreProc', 'Question', 'QuickFixLine', @@ -156,7 +157,7 @@ def Test_check_colors() cursor(1, 1) # 4) Check, that t_Co is checked - var pat = '[&]t_Co\s*[<>=]=\?\s*\d\+' + var pat = '[&]t_Co)\?\s*\%(\%([<>=]=\?\)\|??\)\s*\d\+' if search(pat, 'ncW') == 0 err['t_Co'] = 'Does not check terminal for capable colors' endif @@ -175,7 +176,7 @@ def Test_check_colors() # 7) Normal should be defined first, not use reverse, fg or bg cursor(1, 1) - pat = 'hi\%[light] \+\%(link\|clear\)\@!\w\+\>' + pat = 'hi\%[ghlight] \+\%(link\|clear\)\@!\w\+\>' search(pat, 'cW') # Look for the first hi def, skipping `hi link` and `hi clear` if getline('.') !~# '\m\' err['highlight']['Normal'] = 'Should be defined first' diff --git a/runtime/colors/torte.vim b/runtime/colors/torte.vim index 7526109027..6f53c7d958 100644 --- a/runtime/colors/torte.vim +++ b/runtime/colors/torte.vim @@ -2,432 +2,257 @@ " Description: Remake of torte (grey on black) " Author: Original maintainer Thorsten Maerz " Maintainer: Original maintainer Thorsten Maerz -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = 'torte' -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! 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 StatusLineTerm StatusLine -hi! link StatusLineTermNC StatusLineNC +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! link PopupSelected PmenuSel -hi Normal guifg=#cccccc guibg=#000000 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=#40ffff guibg=NONE gui=NONE cterm=NONE -hi Statement guifg=#ffff60 guibg=NONE gui=NONE cterm=NONE -hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE -hi Type guifg=#60ff60 guibg=NONE gui=NONE cterm=NONE -hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE -hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline -hi Ignore guifg=#000000 guibg=#000000 gui=NONE cterm=NONE -hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE -hi Todo guifg=#ffff00 guibg=#000000 gui=reverse cterm=reverse -hi Folded guifg=#00cdcd guibg=#3a3a3a gui=NONE cterm=NONE -hi Visual guifg=#000000 guibg=#a9a9a9 gui=bold cterm=NONE -hi CursorColumn guifg=NONE guibg=#666666 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 SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi FoldColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi ColorColumn guifg=#cccccc guibg=#8b0000 gui=NONE cterm=NONE -hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE -hi Cursor guifg=#000000 guibg=#00ff00 gui=bold cterm=NONE -hi lCursor guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE -hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE -hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold -hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi Search guifg=#ff0000 guibg=#000000 gui=reverse cterm=reverse -hi IncSearch guifg=#00cd00 guibg=#000000 gui=reverse cterm=reverse -hi NonText guifg=#0000ff guibg=NONE gui=bold cterm=NONE -hi EndOfBuffer guifg=#0000ff guibg=NONE gui=bold cterm=NONE -hi ErrorMsg guifg=#ffffff guibg=#cd0000 gui=NONE cterm=NONE -hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE -hi LineNr guifg=#7f7f7f 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 Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold -hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE -hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline -hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi QuickFixLine guifg=#000000 guibg=#cdcd00 gui=NONE cterm=NONE -hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline -hi SpellCap guifg=#5c5cff guibg=NONE guisp=#5c5cff gui=undercurl cterm=underline -hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline -hi SpellRare guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline -hi StatusLine guifg=#ffffff guibg=#0000ee gui=bold cterm=bold -hi StatusLineNC guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE -hi VertSplit guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE -hi TabLine guifg=#ffffff guibg=#7f7f7f gui=NONE cterm=NONE -hi TabLineFill guifg=NONE guibg=#000000 gui=reverse cterm=reverse -hi TabLineSel guifg=#cccccc guibg=#000000 gui=bold cterm=bold -hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE -hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold -hi PmenuMatch guifg=#ff00ff guibg=#303030 gui=NONE cterm=NONE -hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 gui=NONE cterm=NONE -hi Pmenu guifg=fg guibg=#303030 gui=NONE cterm=NONE -hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi PmenuThumb guifg=NONE guibg=#bebebe 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 StatusLineTerm StatusLine +hi! link StatusLineTermNC StatusLineNC +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 StatusLineTerm StatusLine - hi! link StatusLineTermNC StatusLineNC - hi! link MessageWindow Pmenu - hi! link PopupNotification Todo - hi! link PopupSelected PmenuSel - hi Normal ctermfg=251 ctermbg=16 cterm=NONE - hi Comment ctermfg=111 ctermbg=NONE cterm=NONE - hi Constant ctermfg=217 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=87 ctermbg=NONE cterm=NONE - hi Statement ctermfg=227 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=213 ctermbg=NONE cterm=NONE - hi Type ctermfg=83 ctermbg=NONE cterm=NONE - hi Special ctermfg=214 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=111 ctermbg=NONE cterm=underline - hi Ignore ctermfg=16 ctermbg=16 cterm=NONE - hi Error ctermfg=231 ctermbg=196 cterm=NONE - hi Todo ctermfg=226 ctermbg=16 cterm=reverse - hi Folded ctermfg=44 ctermbg=237 cterm=NONE - hi Visual ctermfg=16 ctermbg=248 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=242 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=242 cterm=NONE - hi CursorLineNr ctermfg=226 ctermbg=242 cterm=NONE - hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=51 ctermbg=NONE cterm=NONE - hi ColorColumn ctermfg=251 ctermbg=88 cterm=NONE - hi Conceal ctermfg=242 ctermbg=NONE cterm=NONE - hi Cursor ctermfg=16 ctermbg=46 cterm=NONE - hi lCursor ctermfg=16 ctermbg=254 cterm=NONE - hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE - hi Title ctermfg=201 ctermbg=NONE cterm=bold - hi Directory ctermfg=51 ctermbg=NONE cterm=NONE - hi Search ctermfg=196 ctermbg=16 cterm=reverse - hi IncSearch ctermfg=40 ctermbg=16 cterm=reverse - hi NonText ctermfg=21 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=21 ctermbg=NONE cterm=NONE - hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE - hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE - hi LineNr ctermfg=102 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 Question ctermfg=46 ctermbg=NONE cterm=bold - hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE - hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline - hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE - hi QuickFixLine ctermfg=16 ctermbg=184 cterm=NONE - hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=63 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=201 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=51 ctermbg=NONE cterm=underline - hi StatusLine ctermfg=231 ctermbg=20 cterm=bold - hi StatusLineNC ctermfg=16 ctermbg=254 cterm=NONE - hi VertSplit ctermfg=16 ctermbg=254 cterm=NONE - hi TabLine ctermfg=231 ctermbg=102 cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=16 cterm=reverse - hi TabLineSel ctermfg=251 ctermbg=16 cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE - hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold - hi PmenuMatch ctermfg=201 ctermbg=236 cterm=NONE - hi PmenuMatchSel ctermfg=201 ctermbg=226 cterm=NONE - hi Pmenu ctermfg=fg ctermbg=236 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=250 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=#cccccc guibg=#000000 guisp=NONE gui=NONE ctermfg=251 ctermbg=16 cterm=NONE term=NONE +hi ColorColumn guifg=#cccccc guibg=#8b0000 guisp=NONE gui=NONE ctermfg=251 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=242 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=bold ctermfg=16 ctermbg=46 cterm=NONE term=reverse +hi CursorColumn guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 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=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 cterm=NONE term=underline +hi CursorLineNr guifg=#ffff00 guibg=#666666 guisp=NONE gui=NONE ctermfg=226 ctermbg=242 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=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=21 ctermbg=NONE 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=#00cdcd guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=44 ctermbg=237 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=#00cd00 guibg=#000000 guisp=NONE gui=reverse ctermfg=40 ctermbg=16 cterm=reverse term=bold,reverse,underline +hi LineNr guifg=#7f7f7f guibg=NONE guisp=NONE gui=NONE ctermfg=102 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=NONE term=NONE +hi Pmenu guifg=fg guibg=#303030 guisp=NONE gui=NONE ctermfg=fg ctermbg=236 cterm=NONE term=reverse +hi PmenuMatch guifg=#ff00ff guibg=#303030 guisp=NONE gui=NONE ctermfg=201 ctermbg=236 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=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE 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=#bebebe guisp=NONE gui=NONE ctermfg=NONE ctermbg=250 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=#000000 guibg=#cdcd00 guisp=NONE gui=NONE ctermfg=16 ctermbg=184 cterm=NONE term=NONE +hi Search guifg=#ff0000 guibg=#000000 guisp=NONE gui=reverse ctermfg=196 ctermbg=16 cterm=reverse term=reverse +hi SignColumn guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 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=#5c5cff guibg=NONE guisp=#5c5cff gui=undercurl ctermfg=63 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=#00ffff guibg=NONE guisp=#00ffff gui=undercurl ctermfg=51 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=#ffffff guibg=#0000ee guisp=NONE gui=bold ctermfg=231 ctermbg=20 cterm=bold term=bold,reverse +hi StatusLineNC guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=bold,underline +hi TabLine guifg=#ffffff guibg=#7f7f7f guisp=NONE gui=NONE ctermfg=231 ctermbg=102 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=#cccccc guibg=#000000 guisp=NONE gui=bold ctermfg=251 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=#cccccc guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=251 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=#ffff00 guibg=#000000 guisp=NONE gui=reverse ctermfg=226 ctermbg=16 cterm=reverse 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=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse +hi Type guifg=#60ff60 guibg=NONE guisp=NONE gui=NONE ctermfg=83 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=#e5e5e5 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=NONE +hi Visual guifg=#000000 guibg=#a9a9a9 guisp=NONE gui=bold ctermfg=16 ctermbg=248 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 +hi lCursor guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 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 ColorColumn ctermfg=white ctermbg=darkred cterm=NONE hi Comment ctermfg=blue ctermbg=NONE cterm=NONE + hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE - hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Type ctermfg=green ctermbg=NONE cterm=NONE - hi Special ctermfg=darkred ctermbg=NONE cterm=NONE - hi Underlined ctermfg=blue ctermbg=NONE cterm=underline - hi Ignore ctermfg=black ctermbg=black cterm=NONE - hi Error ctermfg=white ctermbg=red cterm=NONE - hi Todo ctermfg=yellow ctermbg=black cterm=reverse - hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Visual ctermfg=black ctermbg=grey cterm=NONE + hi Cursor ctermfg=black ctermbg=green 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=bold - hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=cyan ctermbg=NONE cterm=NONE - hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE - hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE - hi Cursor ctermfg=black ctermbg=green cterm=NONE - hi lCursor ctermfg=black ctermbg=grey cterm=NONE - hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE - hi Title ctermfg=magenta 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=cyan ctermbg=NONE cterm=NONE - hi Search ctermfg=red ctermbg=black cterm=reverse - hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse - hi NonText ctermfg=blue ctermbg=NONE cterm=NONE hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE + hi Error ctermfg=white ctermbg=red cterm=NONE hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE - hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=cyan ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=black ctermbg=black cterm=NONE + hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse hi LineNr ctermfg=darkgrey 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=blue ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=fg ctermbg=darkgrey cterm=NONE + hi PmenuMatch ctermfg=fg ctermbg=darkgrey cterm=bold + hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE + hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Question ctermfg=green ctermbg=NONE cterm=bold - hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE - hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline - hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE + hi Search ctermfg=red ctermbg=black cterm=reverse + hi SignColumn ctermfg=cyan 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=blue ctermbg=NONE cterm=underline hi SpellLocal ctermfg=magenta ctermbg=NONE cterm=underline hi SpellRare ctermfg=cyan ctermbg=NONE cterm=underline + hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE hi StatusLine ctermfg=white ctermbg=darkblue cterm=bold hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE - hi VertSplit ctermfg=black ctermbg=grey cterm=NONE hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE hi TabLineFill ctermfg=NONE ctermbg=black cterm=reverse hi TabLineSel ctermfg=white ctermbg=black cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE + hi Title ctermfg=magenta ctermbg=NONE cterm=bold + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE + hi Todo ctermfg=yellow ctermbg=black cterm=reverse hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold - hi PmenuMatch ctermfg=fg ctermbg=darkgrey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold - hi Pmenu ctermfg=fg ctermbg=darkgrey cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=grey 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 ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE + hi Type ctermfg=green ctermbg=NONE cterm=NONE + hi Underlined ctermfg=blue ctermbg=NONE cterm=underline + hi VertSplit ctermfg=black ctermbg=grey cterm=NONE + hi Visual ctermfg=black ctermbg=grey 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 lCursor ctermfg=black ctermbg=grey cterm=NONE finish endif if s:t_Co >= 8 hi Normal ctermfg=grey ctermbg=black cterm=NONE + hi ColorColumn ctermfg=white 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 Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Special ctermfg=darkred ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Ignore ctermfg=black ctermbg=black cterm=NONE - hi Error ctermfg=grey ctermbg=darkred cterm=NONE - hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse - hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse + hi Cursor ctermfg=black ctermbg=green 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=bold,underline - hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE - hi Conceal ctermfg=grey 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 DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE + hi DiffText ctermfg=black ctermbg=grey cterm=NONE hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Search ctermfg=darkred ctermbg=black cterm=bold,reverse - hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse - hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold + hi Error ctermfg=grey ctermbg=darkred cterm=NONE hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE - hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=black ctermbg=black cterm=NONE + hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse hi LineNr ctermfg=grey ctermbg=NONE cterm=bold hi MatchParen ctermfg=grey 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 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=NONE cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=darkmagenta cterm=NONE + hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=bold hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold - hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline - hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE + hi Search ctermfg=darkred ctermbg=black cterm=bold,reverse + 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=darkcyan ctermbg=NONE cterm=reverse + hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold hi StatusLine ctermfg=grey ctermbg=darkblue cterm=bold hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE - hi VertSplit ctermfg=black ctermbg=grey cterm=NONE hi TabLine ctermfg=black ctermbg=grey cterm=NONE hi TabLineFill ctermfg=NONE ctermbg=black cterm=reverse hi TabLineSel ctermfg=white ctermbg=black cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE + hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse - hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=darkmagenta cterm=NONE - hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=darkyellow 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 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=black ctermbg=grey cterm=NONE + hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse + hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline + hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE + hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE + hi lCursor ctermfg=black ctermbg=grey 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: foreground #CCCCCC 251 white -" Color: background #000000 16 black -" Color: color00 #000000 16 black -" Color: color08 #7f7f7f 102 darkgrey -" Color: color01 #cd0000 160 darkred -" Color: color09 #ff0000 196 red -" Color: color02 #00cd00 40 darkgreen -" Color: color10 #00ff00 46 green -" Color: color03 #cdcd00 184 darkyellow -" Color: color11 #ffff00 226 yellow -" Color: color04 #0000ee 20 darkblue -" Color: color12 #5c5cff 63 blue -" Color: color05 #cd00cd 164 darkmagenta -" Color: color13 #ff00ff 201 magenta -" Color: color06 #00cdcd 44 darkcyan -" Color: color14 #00ffff 51 cyan -" Color: color07 #e5e5e5 254 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: rgbGrey40 #666666 242 grey -" Color: rgbDarkGrey #a9a9a9 248 grey -" Color: rgbDarkBlue #00008b 18 darkblue -" Color: rgbDarkMagenta #8b008b 90 darkmagenta -" Color: rgbBlue #0000ff 21 blue -" 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 black -" Color: SpecialKey #00ffff 51 cyan -" Color: StatusLineTerm #90ee90 120 darkgreen -" Color: Title #ff00ff 201 magenta -" Color: WarningMsg #ff0000 196 red -" Color: ToolbarLine #7f7f7f 243 black -" Color: ToolbarButton #d3d3d3 252 darkgrey -" Color: Comment #80a0ff 111 blue -" Color: Constant #ffa0a0 217 darkmagenta -" Color: Special #ffa500 214 darkred -" Color: Identifier #40ffff 87 cyan -" Color: Statement #ffff60 227 yellow -" Color: PreProc #ff80ff 213 darkcyan -" Color: Type #60ff60 83 green -" Color: Underlined #80a0ff 111 blue -" Color: FoldedBG #3a3a3a 237 darkgrey -" Color: Pmenu #303030 236 darkgrey -" Color: rgbDarkRed #8b0000 88 darkred -" 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 diff --git a/runtime/colors/unokai.vim b/runtime/colors/unokai.vim index 8addefcc52..60cacf0b56 100644 --- a/runtime/colors/unokai.vim +++ b/runtime/colors/unokai.vim @@ -1,521 +1,332 @@ " Name: unokai " Description: Color scheme similar to Monokai originally created by Wimer Hazenberg for TextMate " Author: k-37 <60838818+k-37@users.noreply.github.com> -" Maintainer: k-37 <60838818+k-37@users.noreply.github.com> -" Website: https://github.com/vim/colorschemes -" License: Vim License (see `:help license`) -" Last Change: 2024 Dec 15 +" URL: https://github.com/vim/colorschemes +" 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 = 'unokai' -let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0) -let s:italics = has('gui_running') || (&t_ZH != '' && &t_ZH != '' && !has('win32')) +let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co) +let s:tgc = has('termguicolors') && &termguicolors + +let g:terminal_ansi_colors = ['#282923', '#c61e5c', '#81af24', '#fd971f', '#51aebe', '#ae81ff', '#80beb5', '#bababa', '#74705d', '#f92672', '#a6e22e', '#e6db74', '#66d9ef', '#fd5ff0', '#a1efe4', '#f8f8f2'] -if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#282923', '#c61e5c', '#81af24', '#fd971f', '#51aebe', '#ae81ff', '#80beb5', '#bababa', '#74705d', '#f92672', '#a6e22e', '#e6db74', '#66d9ef', '#fd5ff0', '#a1efe4', '#f8f8f2'] -endif hi! link CursorLineFold FoldColumn hi! link CursorLineSign SignColumn +hi! link Define Identifier +hi! link Delimiter PreProc +hi! link Float Number +hi! link Label String hi! link MessageWindow Pmenu +hi! link Number Constant +hi! link Operator PreProc hi! link PopupNotification Todo -hi! link PopupSelected PmenuSel hi! link StatusLineTerm StatusLine hi! link StatusLineTermNC StatusLineNC -hi! link Terminal Normal -hi! link Delimiter PreProc -hi! link Operator PreProc hi! link StorageClass PreProc hi! link Structure PreProc -hi! link Define Identifier -hi! link Label String +hi! link TabPanel Normal +hi! link TabPanelFill Normal +hi! link Terminal Normal hi! link markdownCode Comment hi! link markdownCodeBlock markdownCode hi! link markdownCodeDelimiter markdownCode -hi Normal guifg=#f8f8f2 guibg=#282923 gui=NONE cterm=NONE -hi StatusLine guifg=#282923 guibg=#bababa gui=NONE cterm=NONE -hi StatusLineNC guifg=#282923 guibg=#74705d gui=NONE cterm=NONE -hi VertSplit guifg=#74705d guibg=#74705d gui=NONE cterm=NONE -hi TabLine guifg=#282923 guibg=#74705d gui=NONE cterm=NONE -hi TabLineFill guifg=#282923 guibg=#74705d gui=NONE cterm=NONE -hi TabLineSel guifg=#282923 guibg=#bababa gui=bold cterm=bold -hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi ToolbarButton guifg=#74705d guibg=#f8f8f2 gui=bold,reverse cterm=bold,reverse -hi QuickFixLine guifg=#282923 guibg=#51aebe gui=NONE cterm=NONE -hi CursorLineNr guifg=#dadada guibg=NONE gui=bold cterm=bold -hi LineNr guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE -hi LineNrAbove guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE -hi LineNrBelow guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE -hi NonText guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE -hi EndOfBuffer guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE -hi SpecialKey guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE -hi FoldColumn guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE -hi Visual guifg=#a1efe4 guibg=#282923 gui=reverse cterm=reverse -hi VisualNOS guifg=#282923 guibg=#80beb5 gui=NONE cterm=NONE -hi Pmenu guifg=NONE guibg=#585858 gui=NONE cterm=NONE -hi PmenuThumb guifg=NONE guibg=#74705d gui=NONE cterm=NONE -hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi PmenuSel guifg=NONE guibg=#8a8a8a gui=NONE cterm=NONE -hi PmenuKind guifg=#80beb5 guibg=#585858 gui=NONE cterm=NONE -hi PmenuKindSel guifg=#80beb5 guibg=#8a8a8a gui=NONE cterm=NONE -hi PmenuExtra guifg=#bababa guibg=#585858 gui=NONE cterm=NONE -hi PmenuExtraSel guifg=#bababa guibg=#8a8a8a gui=NONE cterm=NONE -hi PmenuMatch guifg=#ffaf5f guibg=#585858 gui=NONE cterm=NONE -hi PmenuMatchSel guifg=#ffaf5f guibg=#8a8a8a gui=NONE cterm=NONE -hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi Error guifg=#f92672 guibg=#000000 gui=reverse cterm=reverse -hi ErrorMsg guifg=#f92672 guibg=#000000 gui=reverse cterm=reverse -hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold -hi MoreMsg guifg=#81af24 guibg=NONE gui=NONE cterm=NONE -hi Question guifg=#e6db74 guibg=NONE gui=NONE cterm=NONE -hi WarningMsg guifg=#f92672 guibg=NONE gui=NONE cterm=NONE -hi Todo guifg=#dadada guibg=NONE gui=bold cterm=bold -hi MatchParen guifg=#fd971f guibg=NONE gui=bold cterm=bold -hi Search guifg=#66d9ef guibg=#282923 gui=reverse cterm=reverse -hi IncSearch guifg=#ffaf5f guibg=#282923 gui=reverse cterm=reverse -hi CurSearch guifg=#ffaf5f guibg=#282923 gui=reverse cterm=reverse -hi WildMenu guifg=#282923 guibg=#e6db74 gui=bold cterm=bold -hi debugPC guifg=#282923 guibg=#51aebe gui=NONE cterm=NONE -hi debugBreakpoint guifg=#282923 guibg=#f92672 gui=NONE cterm=NONE -hi Cursor guifg=#000000 guibg=#dadada gui=NONE cterm=NONE -hi lCursor guifg=#282923 guibg=#5fff00 gui=NONE cterm=NONE -hi CursorLine guifg=NONE guibg=#3a392f gui=NONE cterm=NONE -hi CursorColumn guifg=NONE guibg=#3a392f gui=NONE cterm=NONE -hi Folded guifg=#bababa guibg=#414141 gui=NONE cterm=NONE -hi ColorColumn guifg=NONE guibg=#585858 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=#fd5ff0 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline -hi Constant guifg=#ae81ff guibg=NONE gui=NONE cterm=NONE -hi Type guifg=#fd971f guibg=NONE gui=bold cterm=bold -hi Character guifg=#a6e22e guibg=NONE gui=NONE cterm=NONE -hi Comment guifg=#74705d guibg=NONE gui=NONE cterm=NONE -hi String guifg=#e6db74 guibg=NONE gui=NONE cterm=NONE -hi Function guifg=#a6e22e guibg=NONE gui=NONE cterm=NONE -hi Identifier guifg=#66d9ef guibg=NONE gui=NONE cterm=NONE -hi PreProc guifg=#f92672 guibg=NONE gui=NONE cterm=NONE -hi Special guifg=#80beb5 guibg=NONE gui=NONE cterm=NONE -hi Statement guifg=#f92672 guibg=NONE gui=bold cterm=bold -hi Underlined guifg=#66d9ef guibg=NONE gui=underline cterm=underline -hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold -hi Debug guifg=#80beb5 guibg=NONE gui=NONE cterm=NONE -hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi Directory guifg=#a1efe4 guibg=NONE gui=bold cterm=bold -hi Conceal guifg=#8a8a8a 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 htmlBold guifg=#f8f8f2 guibg=NONE gui=bold cterm=bold -hi htmlItalic guifg=#f8f8f2 guibg=NONE gui=italic cterm=italic -hi markdownHeadingDelimiter guifg=#f8f8f2 guibg=NONE gui=NONE cterm=NONE -hi markdownH1Delimiter guifg=#f92672 guibg=NONE gui=NONE cterm=NONE -hi markdownH2Delimiter guifg=#e6db74 guibg=NONE gui=NONE cterm=NONE -hi markdownH4Delimiter guifg=#66d9ef guibg=NONE gui=NONE cterm=NONE -hi markdownH6Delimiter guifg=#a6e22e guibg=NONE gui=NONE cterm=NONE -hi markdownH3Delimiter guifg=#fd971f guibg=NONE gui=NONE cterm=NONE -hi markdownH5Delimiter guifg=#51aebe guibg=NONE gui=NONE cterm=NONE -if !s:italics - hi htmlItalic gui=NONE cterm=NONE + +hi Normal guifg=#f8f8f2 guibg=#282923 guisp=NONE gui=NONE ctermfg=255 ctermbg=235 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=#a6e22e guibg=NONE guisp=NONE gui=NONE ctermfg=112 ctermbg=NONE cterm=NONE term=NONE +hi ColorColumn guifg=NONE guibg=#585858 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE term=reverse +hi Comment guifg=#74705d guibg=NONE guisp=NONE gui=NONE ctermfg=244 ctermbg=NONE cterm=NONE term=bold +hi Conceal guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE +hi Constant guifg=#ae81ff guibg=NONE guisp=NONE gui=NONE ctermfg=141 ctermbg=NONE cterm=NONE term=NONE +hi CurSearch guifg=#ffaf5f guibg=#282923 guisp=NONE gui=reverse ctermfg=215 ctermbg=235 cterm=reverse term=reverse +hi CursorColumn guifg=NONE guibg=#3a392f guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=NONE +hi CursorLine guifg=NONE guibg=#3a392f guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 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=#80beb5 guibg=NONE guisp=NONE gui=NONE ctermfg=73 ctermbg=NONE cterm=NONE term=NONE +hi DiffAdd guifg=#5faf5f guibg=NONE guisp=NONE gui=reverse ctermfg=71 ctermbg=NONE cterm=reverse term=reverse +hi DiffChange guifg=#5f87af guibg=NONE guisp=NONE gui=reverse ctermfg=67 ctermbg=NONE cterm=reverse term=NONE +hi DiffDelete guifg=#af5f5f guibg=NONE guisp=NONE gui=reverse ctermfg=131 ctermbg=NONE cterm=reverse term=reverse +hi DiffText guifg=#af87af guibg=NONE guisp=NONE gui=reverse ctermfg=139 ctermbg=NONE cterm=reverse term=reverse +hi Directory guifg=#a1efe4 guibg=NONE guisp=NONE gui=bold ctermfg=116 ctermbg=NONE cterm=bold term=NONE +hi EndOfBuffer guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE +hi Error guifg=#f92672 guibg=#000000 guisp=NONE gui=reverse ctermfg=197 ctermbg=16 cterm=reverse term=bold,reverse +hi ErrorMsg guifg=#f92672 guibg=#000000 guisp=NONE gui=reverse ctermfg=197 ctermbg=16 cterm=reverse term=bold,reverse +hi FoldColumn guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE +hi Folded guifg=#bababa guibg=#414141 guisp=NONE gui=NONE ctermfg=250 ctermbg=238 cterm=NONE term=NONE +hi Function guifg=#a6e22e guibg=NONE guisp=NONE gui=NONE ctermfg=112 ctermbg=NONE cterm=NONE term=NONE +hi Identifier guifg=#66d9ef guibg=NONE guisp=NONE gui=NONE ctermfg=81 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=#ffaf5f guibg=#282923 guisp=NONE gui=reverse ctermfg=215 ctermbg=235 cterm=reverse term=bold,reverse,underline +hi LineNr guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE +hi LineNrAbove guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE +hi LineNrBelow guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE +hi MatchParen guifg=#fd971f guibg=NONE guisp=NONE gui=bold ctermfg=208 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=#81af24 guibg=NONE guisp=NONE gui=NONE ctermfg=106 ctermbg=NONE cterm=NONE term=NONE +hi NonText guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE +hi Pmenu guifg=NONE guibg=#585858 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE term=reverse +hi PmenuExtra guifg=#bababa guibg=#585858 guisp=NONE gui=NONE ctermfg=250 ctermbg=240 cterm=NONE term=NONE +hi PmenuExtraSel guifg=#bababa guibg=#8a8a8a guisp=NONE gui=NONE ctermfg=250 ctermbg=245 cterm=NONE term=NONE +hi PmenuKind guifg=#80beb5 guibg=#585858 guisp=NONE gui=NONE ctermfg=73 ctermbg=240 cterm=NONE term=NONE +hi PmenuKindSel guifg=#80beb5 guibg=#8a8a8a guisp=NONE gui=NONE ctermfg=73 ctermbg=245 cterm=NONE term=NONE +hi PmenuMatch guifg=#ffaf5f guibg=#585858 guisp=NONE gui=NONE ctermfg=215 ctermbg=240 cterm=NONE term=NONE +hi PmenuMatchSel guifg=#ffaf5f guibg=#8a8a8a guisp=NONE gui=NONE ctermfg=215 ctermbg=245 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=#8a8a8a guisp=NONE gui=NONE ctermfg=NONE ctermbg=245 cterm=NONE term=bold +hi PmenuThumb guifg=NONE guibg=#74705d guisp=NONE gui=NONE ctermfg=NONE ctermbg=244 cterm=NONE term=NONE +hi PreProc guifg=#f92672 guibg=NONE guisp=NONE gui=NONE ctermfg=197 ctermbg=NONE cterm=NONE term=NONE +hi Question guifg=#e6db74 guibg=NONE guisp=NONE gui=NONE ctermfg=185 ctermbg=NONE cterm=NONE term=standout +hi QuickFixLine guifg=#282923 guibg=#51aebe guisp=NONE gui=NONE ctermfg=235 ctermbg=141 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=#66d9ef guibg=#282923 guisp=NONE gui=reverse ctermfg=81 ctermbg=235 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=#80beb5 guibg=NONE guisp=NONE gui=NONE ctermfg=73 ctermbg=NONE cterm=NONE term=NONE +hi SpecialKey guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 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=#fd5ff0 gui=undercurl ctermfg=207 ctermbg=NONE cterm=underline term=underline +hi Statement guifg=#f92672 guibg=NONE guisp=NONE gui=bold ctermfg=197 ctermbg=NONE cterm=bold term=NONE +hi StatusLine guifg=#282923 guibg=#bababa guisp=NONE gui=NONE ctermfg=235 ctermbg=250 cterm=NONE term=bold,reverse +hi StatusLineNC guifg=#282923 guibg=#74705d guisp=NONE gui=NONE ctermfg=235 ctermbg=244 cterm=NONE term=bold,underline +hi String guifg=#e6db74 guibg=NONE guisp=NONE gui=NONE ctermfg=185 ctermbg=NONE cterm=NONE term=NONE +hi TabLine guifg=#282923 guibg=#74705d guisp=NONE gui=NONE ctermfg=235 ctermbg=244 cterm=NONE term=bold,underline +hi TabLineFill guifg=#282923 guibg=#74705d guisp=NONE gui=NONE ctermfg=235 ctermbg=244 cterm=NONE term=NONE +hi TabLineSel guifg=#282923 guibg=#bababa guisp=NONE gui=bold ctermfg=235 ctermbg=250 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=#484943 guisp=NONE gui=NONE ctermfg=253 ctermbg=237 cterm=NONE term=NONE +hi TitleBarNC guifg=#bababa guibg=#383933 guisp=NONE gui=NONE ctermfg=250 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=#74705d guibg=#f8f8f2 guisp=NONE gui=bold,reverse ctermfg=244 ctermbg=255 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=#fd971f guibg=NONE guisp=NONE gui=bold ctermfg=208 ctermbg=NONE cterm=bold term=NONE +hi Underlined guifg=#66d9ef guibg=NONE guisp=NONE gui=underline ctermfg=81 ctermbg=NONE cterm=underline term=underline +hi VertSplit guifg=#74705d guibg=#74705d guisp=NONE gui=NONE ctermfg=244 ctermbg=244 cterm=NONE term=NONE +hi Visual guifg=#a1efe4 guibg=#282923 guisp=NONE gui=reverse ctermfg=116 ctermbg=235 cterm=reverse term=reverse +hi VisualNOS guifg=#282923 guibg=#80beb5 guisp=NONE gui=NONE ctermfg=235 ctermbg=73 cterm=NONE term=NONE +hi WarningMsg guifg=#f92672 guibg=NONE guisp=NONE gui=NONE ctermfg=197 ctermbg=NONE cterm=NONE term=standout +hi WildMenu guifg=#282923 guibg=#e6db74 guisp=NONE gui=bold ctermfg=235 ctermbg=185 cterm=bold term=bold +hi debugBreakpoint guifg=#282923 guibg=#f92672 guisp=NONE gui=NONE ctermfg=235 ctermbg=197 cterm=NONE term=NONE +hi debugPC guifg=#282923 guibg=#51aebe guisp=NONE gui=NONE ctermfg=235 ctermbg=73 cterm=NONE term=NONE +hi htmlBold guifg=#f8f8f2 guibg=NONE guisp=NONE gui=bold ctermfg=255 ctermbg=NONE cterm=bold term=bold +hi htmlItalic guifg=#f8f8f2 guibg=NONE guisp=NONE gui=italic ctermfg=255 ctermbg=NONE cterm=underline term=underline +hi markdownH1Delimiter guifg=#f92672 guibg=NONE guisp=NONE gui=NONE ctermfg=197 ctermbg=NONE cterm=NONE term=NONE +hi markdownH2Delimiter guifg=#e6db74 guibg=NONE guisp=NONE gui=NONE ctermfg=185 ctermbg=NONE cterm=NONE term=NONE +hi markdownH3Delimiter guifg=#fd971f guibg=NONE guisp=NONE gui=NONE ctermfg=208 ctermbg=NONE cterm=NONE term=NONE +hi markdownH4Delimiter guifg=#66d9ef guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE term=NONE +hi markdownH5Delimiter guifg=#51aebe guibg=NONE guisp=NONE gui=NONE ctermfg=73 ctermbg=NONE cterm=NONE term=NONE +hi markdownH6Delimiter guifg=#a6e22e guibg=NONE guisp=NONE gui=NONE ctermfg=112 ctermbg=NONE cterm=NONE term=NONE +hi markdownHeadingDelimiter guifg=#f8f8f2 guibg=NONE guisp=NONE gui=NONE ctermfg=255 ctermbg=NONE cterm=NONE term=NONE + +if has('gui_running') || s:tgc + hi Cursor guifg=#000000 guibg=#dadada guisp=NONE gui=NONE cterm=NONE + hi lCursor guifg=#282923 guibg=#5fff00 guisp=NONE gui=NONE cterm=NONE endif -if s:t_Co >= 256 - hi! link CursorLineFold FoldColumn - hi! link CursorLineSign SignColumn - hi! link MessageWindow Pmenu - hi! link PopupNotification Todo - hi! link PopupSelected PmenuSel - hi! link StatusLineTerm StatusLine - hi! link StatusLineTermNC StatusLineNC - hi! link Terminal Normal - hi! link Delimiter PreProc - hi! link Operator PreProc - hi! link StorageClass PreProc - hi! link Structure PreProc - hi! link Define Identifier - hi! link Label String - hi! link markdownCode Comment - hi! link markdownCodeBlock markdownCode - hi! link markdownCodeDelimiter markdownCode - hi Normal ctermfg=255 ctermbg=235 cterm=NONE - hi StatusLine ctermfg=235 ctermbg=250 cterm=NONE - hi StatusLineNC ctermfg=235 ctermbg=244 cterm=NONE - hi VertSplit ctermfg=244 ctermbg=244 cterm=NONE - hi TabLine ctermfg=235 ctermbg=244 cterm=NONE - hi TabLineFill ctermfg=235 ctermbg=244 cterm=NONE - hi TabLineSel ctermfg=235 ctermbg=250 cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=244 ctermbg=255 cterm=bold,reverse - hi QuickFixLine ctermfg=235 ctermbg=141 cterm=NONE - hi CursorLineNr ctermfg=253 ctermbg=NONE cterm=bold - hi LineNr ctermfg=245 ctermbg=NONE cterm=NONE - hi LineNrAbove ctermfg=245 ctermbg=NONE cterm=NONE - hi LineNrBelow ctermfg=245 ctermbg=NONE cterm=NONE - hi NonText ctermfg=245 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=245 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=245 ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=245 ctermbg=NONE cterm=NONE - hi Visual ctermfg=116 ctermbg=235 cterm=reverse - hi VisualNOS ctermfg=235 ctermbg=73 cterm=NONE - hi Pmenu ctermfg=NONE ctermbg=240 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=244 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=NONE ctermbg=245 cterm=NONE - hi PmenuKind ctermfg=73 ctermbg=240 cterm=NONE - hi PmenuKindSel ctermfg=73 ctermbg=245 cterm=NONE - hi PmenuExtra ctermfg=250 ctermbg=240 cterm=NONE - hi PmenuExtraSel ctermfg=250 ctermbg=245 cterm=NONE - hi PmenuMatch ctermfg=215 ctermbg=240 cterm=NONE - hi PmenuMatchSel ctermfg=215 ctermbg=245 cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=197 ctermbg=16 cterm=reverse - hi ErrorMsg ctermfg=197 ctermbg=16 cterm=reverse - hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=106 ctermbg=NONE cterm=NONE - hi Question ctermfg=185 ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=197 ctermbg=NONE cterm=NONE - hi Todo ctermfg=253 ctermbg=NONE cterm=bold - hi MatchParen ctermfg=208 ctermbg=NONE cterm=bold - hi Search ctermfg=81 ctermbg=235 cterm=reverse - hi IncSearch ctermfg=215 ctermbg=235 cterm=reverse - hi CurSearch ctermfg=215 ctermbg=235 cterm=reverse - hi WildMenu ctermfg=235 ctermbg=185 cterm=bold - hi debugPC ctermfg=235 ctermbg=73 cterm=NONE - hi debugBreakpoint ctermfg=235 ctermbg=197 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE - hi Folded ctermfg=250 ctermbg=238 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=240 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=207 ctermbg=NONE cterm=underline - hi Constant ctermfg=141 ctermbg=NONE cterm=NONE - hi Type ctermfg=208 ctermbg=NONE cterm=bold - hi Character ctermfg=112 ctermbg=NONE cterm=NONE - hi Comment ctermfg=244 ctermbg=NONE cterm=NONE - hi String ctermfg=185 ctermbg=NONE cterm=NONE - hi Function ctermfg=112 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=81 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=197 ctermbg=NONE cterm=NONE - hi Special ctermfg=73 ctermbg=NONE cterm=NONE - hi Statement ctermfg=197 ctermbg=NONE cterm=bold - hi Underlined ctermfg=81 ctermbg=NONE cterm=underline - hi Title ctermfg=NONE ctermbg=NONE cterm=bold - hi Debug ctermfg=73 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Directory ctermfg=116 ctermbg=NONE cterm=bold - hi Conceal ctermfg=245 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 - hi htmlBold ctermfg=255 ctermbg=NONE cterm=bold - hi htmlItalic ctermfg=255 ctermbg=NONE cterm=underline - hi markdownHeadingDelimiter ctermfg=255 ctermbg=NONE cterm=NONE - hi markdownH1Delimiter ctermfg=197 ctermbg=NONE cterm=NONE - hi markdownH2Delimiter ctermfg=185 ctermbg=NONE cterm=NONE - hi markdownH4Delimiter ctermfg=81 ctermbg=NONE cterm=NONE - hi markdownH6Delimiter ctermfg=112 ctermbg=NONE cterm=NONE - hi markdownH3Delimiter ctermfg=208 ctermbg=NONE cterm=NONE - hi markdownH5Delimiter ctermfg=73 ctermbg=NONE cterm=NONE - unlet s:t_Co s:italics +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=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=white cterm=bold,reverse - hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE + hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi Character ctermfg=green ctermbg=NONE cterm=NONE + hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE + hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi CurSearch ctermfg=red ctermbg=black cterm=reverse + hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold + 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 DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse + hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse + hi Directory ctermfg=cyan ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Error ctermfg=red ctermbg=black cterm=reverse + hi ErrorMsg ctermfg=red ctermbg=black cterm=reverse + hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE + hi Function ctermfg=green ctermbg=NONE cterm=NONE + hi Identifier ctermfg=blue ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=red ctermbg=black cterm=reverse 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 MatchParen ctermfg=darkyellow 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 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 PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE + hi PmenuKindSel ctermfg=darkred 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=red ctermbg=black cterm=reverse - hi ErrorMsg ctermfg=red ctermbg=black cterm=reverse - hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE + hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE + hi PreProc ctermfg=red 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=darkyellow ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE + hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE 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 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 Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold - hi Character ctermfg=green ctermbg=NONE cterm=NONE - hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE - hi String ctermfg=yellow ctermbg=NONE cterm=NONE - hi Function ctermfg=green ctermbg=NONE cterm=NONE - hi Identifier ctermfg=blue ctermbg=NONE cterm=NONE - hi PreProc ctermfg=red ctermbg=NONE cterm=NONE - hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Statement ctermfg=red ctermbg=NONE cterm=bold - hi Underlined ctermfg=blue ctermbg=NONE cterm=underline + hi StatusLine ctermfg=black ctermbg=gray cterm=NONE + hi StatusLineNC ctermfg=black ctermbg=darkgray cterm=NONE + hi String ctermfg=yellow 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 Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Directory ctermfg=cyan ctermbg=NONE cterm=bold - hi Conceal ctermfg=darkgrey 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 + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=gray ctermbg=black cterm=NONE + hi Todo ctermfg=white ctermbg=NONE cterm=bold + hi ToolbarButton ctermfg=darkgray ctermbg=white cterm=bold,reverse + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold + hi Underlined ctermfg=blue 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 htmlBold ctermfg=white ctermbg=NONE cterm=bold hi htmlItalic ctermfg=white ctermbg=NONE cterm=underline - hi markdownHeadingDelimiter ctermfg=white ctermbg=NONE cterm=NONE hi markdownH1Delimiter ctermfg=red ctermbg=NONE cterm=NONE hi markdownH2Delimiter ctermfg=yellow ctermbg=NONE cterm=NONE - hi markdownH4Delimiter ctermfg=blue ctermbg=NONE cterm=NONE - hi markdownH6Delimiter ctermfg=green ctermbg=NONE cterm=NONE hi markdownH3Delimiter ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi markdownH4Delimiter ctermfg=blue ctermbg=NONE cterm=NONE hi markdownH5Delimiter ctermfg=darkblue ctermbg=NONE cterm=NONE - unlet s:t_Co s:italics + hi markdownH6Delimiter ctermfg=green ctermbg=NONE cterm=NONE + hi markdownHeadingDelimiter ctermfg=white ctermbg=NONE 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 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=darkyellow 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=gray ctermbg=NONE cterm=bold + hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE + hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold + 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 DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse + hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse + hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=gray ctermbg=NONE cterm=bold + hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse + hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse + hi FoldColumn ctermfg=gray ctermbg=NONE cterm=bold + hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE + hi Function ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Identifier ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE 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 MatchParen ctermfg=darkyellow ctermbg=NONE cterm=bold + hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE 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 PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE + hi PmenuKindSel ctermfg=darkred 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 PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE + hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE + hi PreProc ctermfg=darkred 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=darkyellow ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE + hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE 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 SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkcyan ctermbg=NONE cterm=bold + hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold 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 Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold - hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Comment ctermfg=gray ctermbg=NONE cterm=bold - hi String ctermfg=darkyellow ctermbg=NONE cterm=bold - hi Function ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkblue ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE - hi Special ctermfg=darkcyan ctermbg=NONE cterm=bold hi Statement ctermfg=darkred ctermbg=NONE cterm=bold - hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline + hi StatusLine ctermfg=gray ctermbg=black cterm=bold,reverse + hi StatusLineNC ctermfg=gray ctermbg=black cterm=reverse + hi String ctermfg=darkyellow ctermbg=NONE cterm=bold + 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 Title ctermfg=NONE ctermbg=NONE cterm=bold - hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold - hi Conceal ctermfg=gray 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 + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=gray ctermbg=black cterm=NONE + hi Todo ctermfg=gray ctermbg=NONE cterm=bold + hi ToolbarButton ctermfg=gray ctermbg=black cterm=reverse + 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=gray ctermbg=gray cterm=NONE + hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE + hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE + hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE + hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE + hi debugBreakpoint ctermfg=black ctermbg=darkcyan cterm=NONE + hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE hi htmlBold ctermfg=gray ctermbg=NONE cterm=bold hi htmlItalic ctermfg=gray ctermbg=NONE cterm=underline - hi markdownHeadingDelimiter ctermfg=gray ctermbg=NONE cterm=NONE hi markdownH1Delimiter ctermfg=darkred ctermbg=NONE cterm=NONE hi markdownH2Delimiter ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi markdownH4Delimiter ctermfg=darkblue ctermbg=NONE cterm=NONE - hi markdownH6Delimiter ctermfg=darkgreen ctermbg=NONE cterm=NONE hi markdownH3Delimiter ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi markdownH4Delimiter ctermfg=darkblue ctermbg=NONE cterm=NONE hi markdownH5Delimiter ctermfg=darkblue ctermbg=NONE cterm=NONE - unlet s:t_Co s:italics + hi markdownH6Delimiter ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi markdownHeadingDelimiter ctermfg=gray ctermbg=NONE 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 s:italics + hi Float 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 #282923 235 black -" Color: color08 #74705d 244 darkgray -" Color: color01 #c61e5c 125 darkred -" Color: color09 #f92672 197 red -" Color: color02 #81af24 106 darkgreen -" Color: color10 #a6e22e 112 green -" Color: color03 #fd971f 208 darkyellow -" Color: color11 #e6db74 185 yellow -" Color: color04 #51aebe 73 darkblue -" Color: color12 #66d9ef 81 blue -" Color: color05 #ae81ff 141 darkmagenta -" Color: color13 #fd5ff0 207 magenta -" Color: color06 #80beb5 73 darkcyan -" Color: color14 #a1efe4 116 cyan -" Color: color07 #bababa 250 gray -" Color: color15 #f8f8f2 255 white -" Color: colorLine #3a392f 237 darkgrey -" Color: colorB #585858 240 darkgrey -" Color: colorF #414141 238 darkgrey -" Color: colorNonT #8a8a8a 245 darkgrey -" Color: colorC #ffaf5f 215 red -" Color: colorlC #5fff00 82 green -" Color: colorV #1f3f5f 109 cyan -" Color: colorMP #fd971f 208 darkyellow -" 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 diff --git a/runtime/colors/wildcharm.vim b/runtime/colors/wildcharm.vim index 085ab52465..63f552956c 100644 --- a/runtime/colors/wildcharm.vim +++ b/runtime/colors/wildcharm.vim @@ -1,779 +1,560 @@ " Name: Wild Charm " Description: Vibrant and playful, at least one popular AI thinks it is. " Author: Maxim Kim -" Maintainer: Maxim Kim -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" Last Change: 2025 Oct 08 -" Generated by Colortemplate v2.2.3 +" Generated by Colortemplate v3.0.0-beta10 hi clear let g:colors_name = 'wildcharm' -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 -hi! link Terminal Normal -hi! link StatuslineTerm Statusline -hi! link StatuslineTermNC StatuslineNC +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 Todo -hi! link PopupSelected PmenuSel -hi! link CurSearch IncSearch -if &background ==# 'dark' - if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#d0d0d0', '#767676', '#ff5f87', '#00d75f', '#ffaf00', '#00afff', '#ff87ff', '#00d7d7', '#ffffff'] - endif - hi Normal guifg=#d0d0d0 guibg=#000000 gui=NONE cterm=NONE - hi Statusline guifg=#9e9e9e guibg=#000000 gui=bold,reverse cterm=bold,reverse - hi StatuslineNC guifg=#767676 guibg=#000000 gui=reverse cterm=reverse - hi VertSplit guifg=#767676 guibg=NONE gui=NONE cterm=NONE - hi TabLine guifg=#000000 guibg=#767676 gui=NONE cterm=NONE - hi TabLineFill guifg=NONE guibg=#000000 gui=NONE cterm=NONE - hi TabLineSel guifg=#000000 guibg=#9e9e9e gui=bold cterm=bold - hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE - hi QuickFixLine guifg=#000000 guibg=#ff87ff gui=NONE cterm=NONE - hi CursorLineNr guifg=#ffffff guibg=NONE gui=bold cterm=bold - hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE - hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE - hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE - hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE - hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE - hi EndOfBuffer guifg=#767676 guibg=NONE gui=NONE cterm=NONE - hi Pmenu guifg=#d0d0d0 guibg=#303030 gui=NONE cterm=NONE - hi PmenuSel guifg=#d0d0d0 guibg=#585858 gui=NONE cterm=NONE - hi PmenuThumb guifg=NONE guibg=#d0d0d0 gui=NONE cterm=NONE - hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuKind guifg=#ff5f87 guibg=#303030 gui=NONE cterm=NONE - hi PmenuKindSel guifg=#ff5f87 guibg=#585858 gui=NONE cterm=NONE - hi PmenuExtra guifg=#767676 guibg=#303030 gui=NONE cterm=NONE - hi PmenuExtraSel guifg=#767676 guibg=#585858 gui=NONE cterm=NONE - hi PmenuMatch guifg=#d787d7 guibg=#303030 gui=NONE cterm=NONE - hi PmenuMatchSel guifg=#d787d7 guibg=#585858 gui=NONE cterm=NONE - hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error guifg=#d7005f guibg=#ffffff gui=reverse cterm=reverse - hi ErrorMsg guifg=#d7005f guibg=#ffffff gui=reverse cterm=reverse - hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold - hi MoreMsg guifg=#00d75f guibg=NONE gui=NONE cterm=NONE - hi Question guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE - hi WarningMsg guifg=#ffaf00 guibg=NONE gui=NONE cterm=NONE - hi Todo guifg=#875fff guibg=#000000 gui=reverse cterm=reverse - hi Search guifg=#000000 guibg=#00d75f gui=NONE cterm=NONE - hi IncSearch guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE - hi WildMenu guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE - hi debugPC guifg=#0087d7 guibg=NONE gui=reverse cterm=reverse - hi debugBreakpoint guifg=#00afaf guibg=NONE gui=reverse cterm=reverse - hi Cursor guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE - hi lCursor guifg=#000000 guibg=#ff5fff gui=NONE cterm=NONE - hi Visual guifg=#5fd7ff guibg=#000000 gui=reverse cterm=reverse - hi VisualNOS guifg=#000000 guibg=#00afff gui=NONE cterm=NONE - hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE - hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE - hi Folded guifg=#767676 guibg=#303030 gui=NONE cterm=NONE - hi ColorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE - hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold - hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f87 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellCap guifg=NONE guibg=NONE guisp=#00afaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellLocal guifg=NONE guibg=NONE guisp=#00af5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellRare guifg=NONE guibg=NONE guisp=#ff87ff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE - hi Constant guifg=#ff5f87 guibg=NONE gui=NONE cterm=NONE - hi String guifg=#00d75f guibg=NONE gui=NONE cterm=NONE - hi Identifier guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE - hi Statement guifg=#00afff guibg=NONE gui=NONE cterm=NONE - hi Type guifg=#ffaf00 guibg=NONE gui=NONE cterm=NONE - hi PreProc guifg=#00d7d7 guibg=NONE gui=NONE cterm=NONE - hi Special guifg=#875fff 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=#00afff 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 DiffAdd guifg=#afffaf guibg=#5f875f gui=NONE cterm=NONE - hi DiffChange guifg=#d0d0d0 guibg=#5f5f5f gui=NONE cterm=NONE - hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE - hi DiffDelete guifg=#ffafaf guibg=#875f5f gui=NONE cterm=NONE - hi Added guifg=#00af5f guibg=NONE gui=NONE cterm=NONE - hi Changed guifg=#0087d7 guibg=NONE gui=NONE cterm=NONE - hi Removed guifg=#d7005f guibg=NONE gui=NONE cterm=NONE -else - " Light background - if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#000000', '#af0000', '#008700', '#af5f00', '#005faf', '#870087', '#008787', '#8a8a8a', '#808080', '#d70000', '#5faf5f', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff'] +hi! link PreInsert NonText +hi! link StatusLineTerm Statusline +hi! link StatusLineTermNC StatuslineNC +hi! link TabPanel Normal +hi! link TabPanelFill Normal +hi! link Terminal Normal + +if &background == 'dark' + let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#d0d0d0', '#767676', '#ff5f87', '#00d75f', '#ffaf00', '#00afff', '#ff87ff', '#00d7d7', '#ffffff'] + + hi Normal guifg=#d0d0d0 guibg=#000000 guisp=NONE gui=NONE ctermfg=252 ctermbg=16 cterm=NONE term=NONE + hi Added guifg=#00af5f guibg=NONE guisp=NONE gui=NONE ctermfg=35 ctermbg=NONE cterm=NONE term=NONE + hi Changed guifg=#0087d7 guibg=NONE guisp=NONE gui=NONE ctermfg=32 ctermbg=NONE cterm=NONE term=NONE + hi ColorColumn guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 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=#ff5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=204 ctermbg=NONE cterm=NONE term=NONE + hi CursorColumn guifg=NONE guibg=#262626 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=NONE + hi CursorLine guifg=NONE guibg=#262626 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=underline + hi CursorLineNr guifg=#ffffff guibg=NONE guisp=NONE gui=bold ctermfg=231 ctermbg=NONE cterm=bold term=bold + hi DiffAdd guifg=NONE guibg=#273923 guisp=NONE gui=NONE ctermfg=252 ctermbg=22 cterm=NONE term=reverse + hi DiffChange guifg=NONE guibg=#2f2f2f guisp=NONE gui=NONE ctermfg=252 ctermbg=236 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=252 ctermbg=23 cterm=NONE term=reverse + hi Directory guifg=#00afff guibg=NONE guisp=NONE gui=bold ctermfg=39 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=#d7005f guibg=#ffffff guisp=NONE gui=reverse ctermfg=161 ctermbg=231 cterm=reverse term=bold,reverse + hi ErrorMsg guifg=#d7005f guibg=#ffffff guisp=NONE gui=reverse ctermfg=161 ctermbg=231 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=#767676 guibg=#303030 guisp=NONE gui=NONE ctermfg=243 ctermbg=236 cterm=NONE term=NONE + hi Identifier guifg=#ff87ff guibg=NONE guisp=NONE gui=NONE ctermfg=213 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=#5f431f guisp=NONE gui=NONE ctermfg=214 ctermbg=16 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=#00d75f guibg=NONE guisp=NONE gui=NONE ctermfg=41 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=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=reverse + hi PmenuBorder guifg=#767676 guibg=#303030 guisp=NONE gui=NONE ctermfg=243 ctermbg=236 cterm=NONE term=NONE + hi PmenuExtra guifg=#767676 guibg=#303030 guisp=NONE gui=NONE ctermfg=243 ctermbg=236 cterm=NONE term=NONE + hi PmenuExtraSel guifg=#767676 guibg=#585858 guisp=NONE gui=NONE ctermfg=243 ctermbg=240 cterm=NONE term=NONE + hi PmenuKind guifg=#ff5f87 guibg=#303030 guisp=NONE gui=NONE ctermfg=204 ctermbg=236 cterm=NONE term=NONE + hi PmenuKindSel guifg=#ff5f87 guibg=#585858 guisp=NONE gui=NONE ctermfg=204 ctermbg=240 cterm=NONE term=NONE + hi PmenuMatch guifg=#d787d7 guibg=#303030 guisp=NONE gui=NONE ctermfg=176 ctermbg=236 cterm=NONE term=NONE + hi PmenuMatchSel guifg=#d787d7 guibg=#585858 guisp=NONE gui=NONE ctermfg=176 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 PmenuThumb guifg=NONE guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=NONE ctermbg=252 cterm=NONE term=NONE + hi PreProc guifg=#00d7d7 guibg=NONE guisp=NONE gui=NONE ctermfg=44 ctermbg=NONE cterm=NONE term=NONE + hi Question guifg=#ff87ff guibg=NONE guisp=NONE gui=NONE ctermfg=213 ctermbg=NONE cterm=NONE term=standout + hi QuickFixLine guifg=NONE guibg=#4f2f4f guisp=NONE gui=NONE ctermfg=252 ctermbg=53 cterm=NONE term=NONE + hi Removed guifg=#d7005f guibg=NONE guisp=NONE gui=NONE ctermfg=161 ctermbg=NONE cterm=NONE term=NONE + hi Search guifg=NONE guibg=#3a4a3a guisp=NONE gui=NONE ctermfg=41 ctermbg=16 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=#875fff guibg=NONE guisp=NONE gui=NONE ctermfg=99 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=#ff5f87 gui=undercurl ctermfg=161 ctermbg=NONE cterm=underline term=underline + hi SpellCap guifg=NONE guibg=NONE guisp=#00afaf gui=undercurl ctermfg=37 ctermbg=NONE cterm=underline term=underline + hi SpellLocal guifg=NONE guibg=NONE guisp=#00af5f gui=undercurl ctermfg=41 ctermbg=NONE cterm=underline term=underline + hi SpellRare guifg=NONE guibg=NONE guisp=#ff87ff gui=undercurl ctermfg=213 ctermbg=NONE cterm=underline term=underline + hi Statement guifg=#00afff guibg=NONE guisp=NONE gui=NONE ctermfg=39 ctermbg=NONE cterm=NONE term=NONE + hi StatusLine guifg=#9e9e9e guibg=#000000 guisp=NONE gui=bold,reverse ctermfg=247 ctermbg=16 cterm=bold,reverse term=bold,reverse + hi StatusLineNC guifg=#767676 guibg=#000000 guisp=NONE gui=reverse ctermfg=243 ctermbg=16 cterm=reverse term=bold,underline + hi String guifg=#00d75f guibg=NONE guisp=NONE gui=NONE ctermfg=41 ctermbg=NONE cterm=NONE term=NONE + hi TabLine guifg=#000000 guibg=#767676 guisp=NONE gui=NONE ctermfg=16 ctermbg=243 cterm=NONE term=bold,underline + hi TabLineFill guifg=#000000 guibg=#767676 guisp=NONE gui=NONE ctermfg=16 ctermbg=243 cterm=NONE term=NONE + hi TabLineSel guifg=#000000 guibg=#9e9e9e guisp=NONE gui=bold ctermfg=16 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=#ffffff guibg=#3c3c3c guisp=NONE gui=NONE ctermfg=231 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=#ffffff guibg=NONE guisp=NONE gui=bold ctermfg=231 ctermbg=NONE cterm=bold term=bold,reverse + hi ToolbarButton guifg=#000000 guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=16 ctermbg=252 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=#ffaf00 guibg=NONE guisp=NONE gui=NONE 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=#767676 guibg=#767676 guisp=NONE gui=NONE ctermfg=243 ctermbg=243 cterm=NONE term=NONE + hi Visual guifg=NONE guibg=#204060 guisp=NONE gui=NONE ctermfg=81 ctermbg=16 cterm=reverse term=reverse + hi VisualNOS guifg=#000000 guibg=#00afff guisp=NONE gui=NONE ctermfg=16 ctermbg=39 cterm=NONE term=NONE + hi WarningMsg guifg=#ffaf00 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=standout + hi WildMenu guifg=#000000 guibg=#ffaf00 guisp=NONE gui=NONE ctermfg=16 ctermbg=214 cterm=NONE term=bold + hi debugBreakpoint guifg=#00afaf guibg=NONE guisp=NONE gui=reverse ctermfg=37 ctermbg=NONE cterm=reverse term=reverse + hi debugPC guifg=#0087d7 guibg=NONE guisp=NONE gui=reverse ctermfg=32 ctermbg=NONE cterm=reverse term=reverse + + if has('gui_running') || s:tgc + hi Cursor guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE cterm=NONE + hi lCursor guifg=#000000 guibg=#ff5fff guisp=NONE gui=NONE cterm=NONE endif - hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE - hi Statusline guifg=#ffffff guibg=#5f5f5f gui=bold cterm=bold - hi StatuslineNC guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE - hi VertSplit guifg=#5f5f5f guibg=NONE gui=NONE cterm=NONE - hi TabLine guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE - hi TabLineFill guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi TabLineSel guifg=#5f5f5f guibg=#ffffff gui=bold,reverse cterm=bold,reverse - hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton guifg=#ffffff guibg=#5f5f5f gui=NONE cterm=NONE - hi QuickFixLine guifg=#ffffff guibg=#870087 gui=NONE cterm=NONE - hi CursorLineNr guifg=#000000 guibg=NONE gui=bold cterm=bold - hi LineNr guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE - hi NonText guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE - hi FoldColumn guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE - hi EndOfBuffer guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE - hi SpecialKey guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE - hi Pmenu guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE - hi PmenuSel guifg=#000000 guibg=#b2b2b2 gui=NONE cterm=NONE - hi PmenuThumb guifg=NONE guibg=#808080 gui=NONE cterm=NONE - hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuKind guifg=#d70000 guibg=#e4e4e4 gui=NONE cterm=NONE - hi PmenuKindSel guifg=#d70000 guibg=#b2b2b2 gui=NONE cterm=NONE - hi PmenuExtra guifg=#808080 guibg=#e4e4e4 gui=NONE cterm=NONE - hi PmenuExtraSel guifg=#808080 guibg=#b2b2b2 gui=NONE cterm=NONE - hi PmenuMatch guifg=#870087 guibg=#e4e4e4 gui=NONE cterm=NONE - hi PmenuMatchSel guifg=#870087 guibg=#b2b2b2 gui=NONE cterm=NONE - hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error guifg=#d70000 guibg=#ffffff gui=reverse cterm=reverse - hi ErrorMsg guifg=#d70000 guibg=#ffffff gui=reverse cterm=reverse - hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold - hi MoreMsg guifg=#008700 guibg=NONE gui=NONE cterm=NONE - hi Question guifg=#870087 guibg=NONE gui=NONE cterm=NONE - hi WarningMsg guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE - hi Todo guifg=#5f00d7 guibg=#ffffff gui=reverse cterm=reverse - hi Search guifg=#ffffff guibg=#008700 gui=NONE cterm=NONE - hi IncSearch guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE - hi WildMenu guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE - hi debugPC guifg=#005faf guibg=NONE gui=reverse cterm=reverse - hi debugBreakpoint guifg=#008787 guibg=NONE gui=reverse cterm=reverse - hi Cursor guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE - hi lCursor guifg=#000000 guibg=#ff00ff gui=NONE cterm=NONE - hi Visual guifg=#0087d7 guibg=#ffffff gui=reverse cterm=reverse - hi VisualNOS guifg=#ffffff guibg=#005faf gui=NONE cterm=NONE - hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE - hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE - hi Folded guifg=#808080 guibg=#e4e4e4 gui=NONE cterm=NONE - hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE - hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold - hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellCap guifg=NONE guibg=NONE guisp=#008787 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi SpellRare guifg=NONE guibg=NONE guisp=#af00af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE - hi Comment guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE - hi Constant guifg=#af0000 guibg=NONE gui=NONE cterm=NONE - hi String guifg=#008700 guibg=NONE gui=NONE cterm=NONE - hi Identifier guifg=#870087 guibg=NONE gui=NONE cterm=NONE - hi Statement guifg=#005faf guibg=NONE gui=NONE cterm=NONE - hi Type guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE - hi PreProc guifg=#008787 guibg=NONE gui=NONE cterm=NONE - hi Special guifg=#5f00d7 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=#005faf guibg=NONE gui=bold cterm=bold - hi Conceal guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE - hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd guifg=#005f00 guibg=#afd7af gui=NONE cterm=NONE - hi DiffChange guifg=#262626 guibg=#dadada gui=NONE cterm=NONE - hi DiffText guifg=#005f5f guibg=#afd7d7 gui=NONE cterm=NONE - hi DiffDelete guifg=#875f5f guibg=#ffd7d7 gui=NONE cterm=NONE - hi Added guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE - hi Changed guifg=#0087d7 guibg=NONE gui=NONE cterm=NONE - hi Removed guifg=#d70000 guibg=NONE gui=NONE cterm=NONE -endif -if s:t_Co >= 256 - hi! link Terminal Normal - hi! link StatuslineTerm Statusline - hi! link StatuslineTermNC StatuslineNC - hi! link LineNrAbove LineNr - hi! link LineNrBelow LineNr - hi! link MessageWindow PMenu - hi! link PopupNotification Todo - hi! link PopupSelected PmenuSel - hi! link CurSearch IncSearch - if &background ==# 'dark' - hi Normal ctermfg=252 ctermbg=16 cterm=NONE - hi Statusline ctermfg=247 ctermbg=16 cterm=bold,reverse - hi StatuslineNC ctermfg=243 ctermbg=16 cterm=reverse - hi VertSplit ctermfg=243 ctermbg=NONE cterm=NONE - hi TabLine ctermfg=16 ctermbg=243 cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=16 cterm=NONE - hi TabLineSel ctermfg=16 ctermbg=247 cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=16 ctermbg=252 cterm=NONE - hi QuickFixLine ctermfg=16 ctermbg=213 cterm=NONE - hi CursorLineNr ctermfg=231 ctermbg=NONE cterm=bold - hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE - hi NonText ctermfg=240 ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=243 ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=252 ctermbg=236 cterm=NONE - hi PmenuSel ctermfg=252 ctermbg=240 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=252 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuKind ctermfg=204 ctermbg=236 cterm=NONE - hi PmenuKindSel ctermfg=204 ctermbg=240 cterm=NONE - hi PmenuExtra ctermfg=243 ctermbg=236 cterm=NONE - hi PmenuExtraSel ctermfg=243 ctermbg=240 cterm=NONE - hi PmenuMatch ctermfg=176 ctermbg=236 cterm=NONE - hi PmenuMatchSel ctermfg=176 ctermbg=240 cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=161 ctermbg=231 cterm=reverse - hi ErrorMsg ctermfg=161 ctermbg=231 cterm=reverse - hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=41 ctermbg=NONE cterm=NONE - hi Question ctermfg=213 ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=214 ctermbg=NONE cterm=NONE - hi Todo ctermfg=99 ctermbg=16 cterm=reverse - hi Search ctermfg=16 ctermbg=41 cterm=NONE - hi IncSearch ctermfg=16 ctermbg=214 cterm=NONE - hi WildMenu ctermfg=16 ctermbg=214 cterm=NONE - hi debugPC ctermfg=32 ctermbg=NONE cterm=reverse - hi debugBreakpoint ctermfg=37 ctermbg=NONE cterm=reverse - hi Visual ctermfg=81 ctermbg=16 cterm=reverse - hi VisualNOS ctermfg=16 ctermbg=39 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=235 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=235 cterm=NONE - hi Folded ctermfg=243 ctermbg=236 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=236 cterm=NONE - hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold - hi SpellBad ctermfg=161 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=37 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=41 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=213 ctermbg=NONE cterm=underline - hi Comment ctermfg=243 ctermbg=NONE cterm=NONE - hi Constant ctermfg=204 ctermbg=NONE cterm=NONE - hi String ctermfg=41 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=213 ctermbg=NONE cterm=NONE - hi Statement ctermfg=39 ctermbg=NONE cterm=NONE - hi Type ctermfg=214 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=44 ctermbg=NONE cterm=NONE - hi Special ctermfg=99 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Title ctermfg=NONE ctermbg=NONE cterm=bold - hi Directory ctermfg=39 ctermbg=NONE cterm=bold - hi Conceal ctermfg=240 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=157 ctermbg=65 cterm=NONE - hi DiffChange ctermfg=252 ctermbg=59 cterm=NONE - hi DiffText ctermfg=159 ctermbg=66 cterm=NONE - hi DiffDelete ctermfg=217 ctermbg=95 cterm=NONE - hi Added ctermfg=35 ctermbg=NONE cterm=NONE - hi Changed ctermfg=32 ctermbg=NONE cterm=NONE - hi Removed ctermfg=161 ctermbg=NONE cterm=NONE - else - " Light background - hi Normal ctermfg=16 ctermbg=231 cterm=NONE - hi Statusline ctermfg=231 ctermbg=59 cterm=bold - hi StatuslineNC ctermfg=16 ctermbg=252 cterm=NONE - hi VertSplit ctermfg=59 ctermbg=NONE cterm=NONE - hi TabLine ctermfg=16 ctermbg=252 cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE - hi TabLineSel ctermfg=59 ctermbg=231 cterm=bold,reverse - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=231 ctermbg=59 cterm=NONE - hi QuickFixLine ctermfg=231 ctermbg=90 cterm=NONE - hi CursorLineNr ctermfg=16 ctermbg=NONE cterm=bold - hi LineNr ctermfg=249 ctermbg=NONE cterm=NONE - hi NonText ctermfg=249 ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=249 ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=249 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=249 ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=16 ctermbg=254 cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=249 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=240 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuKind ctermfg=160 ctermbg=254 cterm=NONE - hi PmenuKindSel ctermfg=160 ctermbg=249 cterm=NONE - hi PmenuExtra ctermfg=240 ctermbg=254 cterm=NONE - hi PmenuExtraSel ctermfg=240 ctermbg=249 cterm=NONE - hi PmenuMatch ctermfg=90 ctermbg=254 cterm=NONE - hi PmenuMatchSel ctermfg=90 ctermbg=249 cterm=NONE - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=160 ctermbg=231 cterm=reverse - hi ErrorMsg ctermfg=160 ctermbg=231 cterm=reverse - hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=28 ctermbg=NONE cterm=NONE - hi Question ctermfg=90 ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=130 ctermbg=NONE cterm=NONE - hi Todo ctermfg=56 ctermbg=231 cterm=reverse - hi Search ctermfg=231 ctermbg=28 cterm=NONE - hi IncSearch ctermfg=231 ctermbg=172 cterm=NONE - hi WildMenu ctermfg=231 ctermbg=172 cterm=NONE - hi debugPC ctermfg=25 ctermbg=NONE cterm=reverse - hi debugBreakpoint ctermfg=30 ctermbg=NONE cterm=reverse - hi Visual ctermfg=32 ctermbg=231 cterm=reverse - hi VisualNOS ctermfg=231 ctermbg=25 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE - hi Folded ctermfg=240 ctermbg=254 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE - hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold - hi SpellBad ctermfg=160 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=30 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=28 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=127 ctermbg=NONE cterm=underline - hi Comment ctermfg=245 ctermbg=NONE cterm=NONE - hi Constant ctermfg=124 ctermbg=NONE cterm=NONE - hi String ctermfg=28 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=90 ctermbg=NONE cterm=NONE - hi Statement ctermfg=25 ctermbg=NONE cterm=NONE - hi Type ctermfg=130 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=30 ctermbg=NONE cterm=NONE - hi Special ctermfg=56 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Title ctermfg=NONE ctermbg=NONE cterm=bold - hi Directory ctermfg=25 ctermbg=NONE cterm=bold - hi Conceal ctermfg=249 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=22 ctermbg=151 cterm=NONE - hi DiffChange ctermfg=235 ctermbg=253 cterm=NONE - hi DiffText ctermfg=23 ctermbg=152 cterm=NONE - hi DiffDelete ctermfg=95 ctermbg=224 cterm=NONE - hi Added ctermfg=71 ctermbg=NONE cterm=NONE - hi Changed ctermfg=32 ctermbg=NONE cterm=NONE - hi Removed ctermfg=160 ctermbg=NONE cterm=NONE + if s:tgc || s:t_Co >= 256 + if s:tgc + hi IncSearch cterm=NONE + hi QuickFixLine cterm=NONE + hi Search cterm=NONE + hi Visual cterm=NONE + endif + finish endif - unlet s:t_Co - finish -endif -if s:t_Co >= 16 - if &background ==# 'dark' + if s:t_Co >= 16 hi Normal ctermfg=grey ctermbg=black cterm=NONE - hi Statusline ctermfg=grey ctermbg=black cterm=bold,reverse - hi StatuslineNC ctermfg=darkgrey ctermbg=black cterm=reverse - hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi TabLine ctermfg=black ctermbg=darkgrey cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=black cterm=NONE - hi TabLineSel ctermfg=black ctermbg=grey cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE - hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE + hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE + hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE + hi Constant ctermfg=red ctermbg=NONE cterm=NONE + hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold + hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE + hi DiffChange ctermfg=black ctermbg=darkgray cterm=NONE + hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE + hi DiffText ctermfg=black ctermbg=darkcyan cterm=NONE + hi Directory ctermfg=blue ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=white cterm=reverse + hi ErrorMsg ctermfg=darkred ctermbg=white cterm=reverse + hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE + hi Folded ctermfg=black ctermbg=NONE cterm=bold + hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline + hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE hi NonText ctermfg=grey ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Pmenu ctermfg=black ctermbg=grey cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE - hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE - hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE + hi PmenuBorder ctermfg=NONE ctermbg=grey cterm=NONE hi PmenuExtra ctermfg=darkgrey ctermbg=grey cterm=NONE hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE + hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE + hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=darkred ctermbg=white cterm=reverse - hi ErrorMsg ctermfg=darkred ctermbg=white cterm=reverse - hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse + hi PreProc ctermfg=cyan ctermbg=NONE cterm=NONE hi Question ctermfg=magenta ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=yellow ctermbg=NONE cterm=NONE - hi Todo ctermfg=darkred ctermbg=black cterm=reverse - hi Search ctermfg=black ctermbg=green cterm=NONE - hi IncSearch ctermfg=black ctermbg=yellow cterm=NONE - hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE - hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse - hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi Visual ctermfg=cyan ctermbg=black cterm=reverse - hi VisualNOS ctermfg=black ctermbg=blue cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE - hi Folded ctermfg=black ctermbg=NONE cterm=bold - hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE - hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline + 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=darkred ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline hi SpellLocal ctermfg=green ctermbg=NONE cterm=underline hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline - hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Constant ctermfg=red ctermbg=NONE cterm=NONE - hi String ctermfg=green ctermbg=NONE cterm=NONE - hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE hi Statement ctermfg=blue ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse + hi StatusLineNC ctermfg=darkgrey ctermbg=black cterm=reverse + hi String ctermfg=green ctermbg=NONE cterm=NONE + hi TabLine ctermfg=black ctermbg=darkgrey cterm=NONE + hi TabLineFill ctermfg=black ctermbg=darkgrey cterm=NONE + hi TabLineSel ctermfg=black ctermbg=grey cterm=bold + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold + hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE hi Type ctermfg=yellow ctermbg=NONE cterm=NONE - hi PreProc ctermfg=cyan ctermbg=NONE cterm=NONE - hi Special ctermfg=darkred ctermbg=NONE cterm=NONE hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Title ctermfg=NONE ctermbg=NONE cterm=bold - hi Directory ctermfg=blue ctermbg=NONE cterm=bold - hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE - hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE - hi DiffText ctermfg=black ctermbg=cyan cterm=NONE - hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE + hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE + hi Visual ctermfg=cyan ctermbg=black cterm=reverse + hi VisualNOS ctermfg=black ctermbg=blue cterm=NONE + hi WarningMsg ctermfg=yellow ctermbg=NONE cterm=NONE + hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE + hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse + finish + endif + + if s:t_Co >= 8 + hi Normal ctermfg=grey ctermbg=black cterm=NONE hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE - else - " Light background - hi Normal ctermfg=black ctermbg=white cterm=NONE - hi Statusline ctermfg=white ctermbg=darkgrey cterm=bold - hi StatuslineNC ctermfg=black ctermbg=lightgrey cterm=NONE - hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi TabLine ctermfg=black ctermbg=lightgrey cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE - hi TabLineSel ctermfg=darkgrey ctermbg=white cterm=bold,reverse - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=NONE - hi QuickFixLine ctermfg=white ctermbg=darkmagenta 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 CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold - hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=black ctermbg=grey cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE - hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE - hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE - hi PmenuExtra ctermfg=darkgrey ctermbg=grey cterm=NONE - hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE - hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=red ctermbg=white cterm=reverse - hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse + hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE + hi DiffChange ctermfg=black ctermbg=darkblue cterm=NONE + hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE + hi DiffText ctermfg=black ctermbg=darkmagenta cterm=NONE + hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE + hi Error ctermfg=grey ctermbg=darkred cterm=NONE + hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE + hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE + hi Folded ctermfg=grey ctermbg=NONE cterm=bold + hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse + hi LineNr ctermfg=darkyellow 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=black ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuBorder ctermfg=darkgrey ctermbg=darkgrey cterm=NONE + 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=darkred cterm=reverse + hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold + hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse + hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Todo ctermfg=blue ctermbg=white cterm=reverse - hi Search ctermfg=white ctermbg=darkgreen cterm=NONE - hi IncSearch ctermfg=white ctermbg=yellow cterm=NONE - hi WildMenu ctermfg=white ctermbg=yellow cterm=NONE - hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse - hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi Visual ctermfg=blue ctermbg=white cterm=reverse - hi VisualNOS ctermfg=white ctermbg=darkblue cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE - hi Folded ctermfg=black ctermbg=NONE cterm=bold - hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE - hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline - hi SpellBad ctermfg=red ctermbg=NONE cterm=underline - hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline - hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline - hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE - hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE + hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE + hi Search ctermfg=darkgreen ctermbg=black cterm=reverse + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse + hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse + hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse + hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE + hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi TabLine ctermfg=black ctermbg=grey cterm=NONE + hi TabLineFill ctermfg=grey ctermbg=grey cterm=NONE + hi TabLineSel ctermfg=grey ctermbg=black cterm=bold,reverse + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=black cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold + hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Special ctermfg=blue ctermbg=NONE cterm=NONE hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Title ctermfg=NONE ctermbg=NONE cterm=bold - hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold - hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE - hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE - hi DiffText ctermfg=black ctermbg=cyan cterm=NONE - hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE - hi Added ctermfg=green ctermbg=NONE cterm=NONE - hi Changed ctermfg=blue ctermbg=NONE cterm=NONE - hi Removed ctermfg=red ctermbg=NONE cterm=NONE + hi VertSplit ctermfg=grey ctermbg=grey cterm=NONE + hi Visual ctermfg=darkblue ctermbg=black cterm=reverse + hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE + hi WarningMsg ctermfg=darkyellow 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 + finish + endif + + if s:t_Co >= 0 + hi CurSearch term=reverse + hi Cursor term=reverse + hi CursorIM term=NONE + hi CursorLineFold term=underline + hi CursorLineSign term=underline + 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 - unlet s:t_Co + finish endif -if s:t_Co >= 8 - if &background ==# 'dark' - hi Normal ctermfg=grey ctermbg=black cterm=NONE - hi Statusline ctermfg=grey ctermbg=black cterm=bold,reverse - hi StatuslineNC ctermfg=black ctermbg=grey cterm=NONE - hi VertSplit ctermfg=grey ctermbg=NONE cterm=NONE - hi TabLine ctermfg=grey ctermbg=black cterm=NONE - hi TabLineFill ctermfg=grey ctermbg=NONE cterm=NONE - hi TabLineSel ctermfg=grey ctermbg=black cterm=bold,reverse - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse - hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE +if &background == 'light' + let g:terminal_ansi_colors = ['#000000', '#af0000', '#008700', '#af5f00', '#005faf', '#870087', '#008787', '#8a8a8a', '#808080', '#d70000', '#5faf5f', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff'] + + hi Normal guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE + hi Added guifg=#5faf5f guibg=NONE guisp=NONE gui=NONE ctermfg=71 ctermbg=NONE cterm=NONE term=NONE + hi Changed guifg=#0087d7 guibg=NONE guisp=NONE gui=NONE ctermfg=32 ctermbg=NONE cterm=NONE term=NONE + hi ColorColumn guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=reverse + hi Comment guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=bold + hi Conceal guifg=#a8a8a8 guibg=NONE guisp=NONE gui=NONE ctermfg=248 ctermbg=NONE cterm=NONE term=NONE + hi Constant guifg=#af0000 guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE + hi CursorColumn guifg=NONE guibg=#eeeeee guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=NONE + hi CursorLine guifg=NONE guibg=#eeeeee guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=underline + hi CursorLineNr guifg=#000000 guibg=NONE guisp=NONE gui=bold ctermfg=16 ctermbg=NONE cterm=bold term=bold + hi DiffAdd guifg=NONE guibg=#dafada guisp=NONE gui=NONE ctermfg=16 ctermbg=151 cterm=NONE term=reverse + hi DiffChange guifg=NONE guibg=#e3e3e3 guisp=NONE gui=NONE ctermfg=16 ctermbg=253 cterm=NONE term=NONE + hi DiffDelete guifg=#808080 guibg=#ffd7d7 guisp=NONE gui=NONE ctermfg=240 ctermbg=224 cterm=NONE term=reverse + hi DiffText guifg=NONE guibg=#bfe7e7 guisp=NONE gui=NONE ctermfg=16 ctermbg=152 cterm=NONE term=reverse + hi Directory guifg=#005faf guibg=NONE guisp=NONE gui=bold ctermfg=25 ctermbg=NONE cterm=bold term=NONE + hi EndOfBuffer guifg=#a8a8a8 guibg=NONE guisp=NONE gui=NONE ctermfg=248 ctermbg=NONE cterm=NONE term=NONE + hi Error guifg=#af0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=124 ctermbg=231 cterm=reverse term=bold,reverse + hi ErrorMsg guifg=#d70000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=160 ctermbg=231 cterm=reverse term=bold,reverse + hi FoldColumn guifg=#a8a8a8 guibg=NONE guisp=NONE gui=NONE ctermfg=248 ctermbg=NONE cterm=NONE term=NONE + hi Folded guifg=#808080 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=240 ctermbg=254 cterm=NONE term=NONE + hi Identifier guifg=#870087 guibg=NONE guisp=NONE gui=NONE ctermfg=90 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=#fff0cf guisp=NONE gui=NONE ctermfg=172 ctermbg=231 cterm=reverse term=bold,reverse,underline + hi LineNr guifg=#a8a8a8 guibg=NONE guisp=NONE gui=NONE ctermfg=248 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=#008700 guibg=NONE guisp=NONE gui=NONE ctermfg=28 ctermbg=NONE cterm=NONE term=NONE + hi NonText guifg=#a8a8a8 guibg=NONE guisp=NONE gui=NONE ctermfg=248 ctermbg=NONE cterm=NONE term=NONE + hi Pmenu guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=reverse + hi PmenuBorder guifg=#808080 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=240 ctermbg=254 cterm=NONE term=NONE + hi PmenuExtra guifg=#808080 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=240 ctermbg=254 cterm=NONE term=NONE + hi PmenuExtraSel guifg=#808080 guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=240 ctermbg=252 cterm=NONE term=NONE + hi PmenuKind guifg=#d70000 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=160 ctermbg=254 cterm=NONE term=NONE + hi PmenuKindSel guifg=#d70000 guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=160 ctermbg=252 cterm=NONE term=NONE + hi PmenuMatch guifg=#870087 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=90 ctermbg=254 cterm=NONE term=NONE + hi PmenuMatchSel guifg=#870087 guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=90 ctermbg=252 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=#d0d0d0 guisp=NONE gui=NONE ctermfg=NONE ctermbg=252 cterm=NONE term=bold + hi PmenuThumb guifg=NONE guibg=#808080 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE term=NONE + hi PreProc guifg=#008787 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE + hi Question guifg=#870087 guibg=NONE guisp=NONE gui=NONE ctermfg=90 ctermbg=NONE cterm=NONE term=standout + hi QuickFixLine guifg=NONE guibg=#e7cfe7 guisp=NONE gui=NONE ctermfg=16 ctermbg=182 cterm=NONE term=NONE + hi Removed guifg=#d70000 guibg=NONE guisp=NONE gui=NONE ctermfg=160 ctermbg=NONE cterm=NONE term=NONE + hi Search guifg=NONE guibg=#e7f3e7 guisp=NONE gui=NONE ctermfg=28 ctermbg=231 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=#5f00d7 guibg=NONE guisp=NONE gui=NONE ctermfg=56 ctermbg=NONE cterm=NONE term=NONE + hi SpecialKey guifg=#a8a8a8 guibg=NONE guisp=NONE gui=NONE ctermfg=248 ctermbg=NONE cterm=NONE term=bold + hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=160 ctermbg=NONE cterm=underline term=underline + hi SpellCap guifg=NONE guibg=NONE guisp=#008787 gui=undercurl ctermfg=30 ctermbg=NONE cterm=underline term=underline + hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=28 ctermbg=NONE cterm=underline term=underline + hi SpellRare guifg=NONE guibg=NONE guisp=#af00af gui=undercurl ctermfg=127 ctermbg=NONE cterm=underline term=underline + hi Statement guifg=#005faf guibg=NONE guisp=NONE gui=NONE ctermfg=25 ctermbg=NONE cterm=NONE term=NONE + hi StatusLine guifg=#ffffff guibg=#5f5f5f guisp=NONE gui=bold ctermfg=231 ctermbg=59 cterm=bold term=bold,reverse + hi StatusLineNC guifg=#000000 guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=16 ctermbg=252 cterm=NONE term=bold,underline + hi String guifg=#008700 guibg=NONE guisp=NONE gui=NONE ctermfg=28 ctermbg=NONE cterm=NONE term=NONE + hi TabLine guifg=#000000 guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=16 ctermbg=252 cterm=NONE term=bold,underline + hi TabLineFill guifg=#d0d0d0 guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=252 ctermbg=252 cterm=NONE term=NONE + hi TabLineSel guifg=#5f5f5f guibg=#ffffff guisp=NONE gui=bold,reverse ctermfg=59 ctermbg=231 cterm=bold,reverse term=bold,reverse + hi Title guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE 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=#808080 guibg=#f5f5f5 guisp=NONE gui=NONE ctermfg=240 ctermbg=255 cterm=NONE term=NONE + hi Todo guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold,reverse + hi ToolbarButton guifg=#ffffff guibg=#5f5f5f guisp=NONE gui=NONE ctermfg=231 ctermbg=59 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=#af5f00 guibg=NONE guisp=NONE gui=NONE ctermfg=130 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=#d0d0d0 guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=252 ctermbg=252 cterm=NONE term=NONE + hi Visual guifg=NONE guibg=#bfdfff guisp=NONE gui=NONE ctermfg=32 ctermbg=231 cterm=reverse term=reverse + hi VisualNOS guifg=#ffffff guibg=#005faf guisp=NONE gui=NONE ctermfg=231 ctermbg=25 cterm=NONE term=NONE + hi WarningMsg guifg=#af5f00 guibg=NONE guisp=NONE gui=NONE ctermfg=130 ctermbg=NONE cterm=NONE term=standout + hi WildMenu guifg=#ffffff guibg=#d78700 guisp=NONE gui=NONE ctermfg=231 ctermbg=172 cterm=NONE term=bold + hi debugBreakpoint guifg=#008787 guibg=NONE guisp=NONE gui=reverse ctermfg=30 ctermbg=NONE cterm=reverse term=reverse + hi debugPC guifg=#005faf guibg=NONE guisp=NONE gui=reverse ctermfg=25 ctermbg=NONE cterm=reverse term=reverse + + if has('gui_running') || s:tgc + hi Cursor guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE cterm=NONE + hi lCursor guifg=#000000 guibg=#ff00ff guisp=NONE gui=NONE cterm=NONE + endif + + if s:tgc || s:t_Co >= 256 + if s:tgc + hi IncSearch cterm=NONE + hi QuickFixLine cterm=NONE + hi Search cterm=NONE + hi Visual cterm=NONE + endif + finish + endif + + if s:t_Co >= 16 + hi Normal ctermfg=black ctermbg=white cterm=NONE + hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE + hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE + hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold - hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi NonText ctermfg=black ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE - hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE + hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE + hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE + hi DiffText ctermfg=black ctermbg=cyan cterm=NONE + hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=white cterm=reverse + hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse + hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Folded ctermfg=black ctermbg=NONE cterm=bold + hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=yellow ctermbg=white cterm=reverse + hi LineNr ctermfg=darkgrey 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=darkgrey ctermbg=NONE cterm=NONE hi Pmenu ctermfg=black ctermbg=grey cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE + hi PmenuBorder ctermfg=black ctermbg=grey cterm=NONE + hi PmenuExtra ctermfg=darkgrey ctermbg=grey cterm=NONE + hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE - hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE - hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Error ctermfg=grey ctermbg=darkred cterm=NONE - hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE - hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold - hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + 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=darkcyan ctermbg=NONE cterm=NONE hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE + hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE + hi Search ctermfg=darkgreen ctermbg=white cterm=reverse + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=blue 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=darkgreen ctermbg=NONE cterm=underline + hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline + hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=white ctermbg=darkgrey cterm=bold + hi StatusLineNC ctermfg=black ctermbg=lightgrey cterm=NONE + hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi TabLine ctermfg=black ctermbg=lightgrey cterm=NONE + hi TabLineFill ctermfg=lightgrey ctermbg=lightgrey cterm=NONE + hi TabLineSel ctermfg=darkgrey ctermbg=white cterm=bold,reverse + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi TitleBar ctermfg=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=white cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold + hi ToolbarButton ctermfg=white ctermbg=darkgrey 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=lightgrey ctermbg=lightgrey cterm=NONE + hi Visual ctermfg=blue ctermbg=white cterm=reverse + hi VisualNOS ctermfg=white ctermbg=darkblue cterm=NONE hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Todo ctermfg=darkred ctermbg=black cterm=reverse - hi Search ctermfg=darkgreen ctermbg=black cterm=reverse - hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse - hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE - hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse + hi WildMenu ctermfg=white ctermbg=yellow cterm=NONE hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi Visual ctermfg=darkblue ctermbg=black cterm=reverse - hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline - hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE - hi Folded ctermfg=grey ctermbg=NONE cterm=bold + hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse + finish + endif + + if s:t_Co >= 8 + hi Normal ctermfg=black ctermbg=grey cterm=NONE + hi Added ctermfg=green ctermbg=NONE cterm=NONE + hi Changed ctermfg=blue ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE - hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse - hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse - hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse hi Comment ctermfg=NONE ctermbg=NONE cterm=bold - hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE - hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Title ctermfg=NONE ctermbg=NONE cterm=bold - hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE + hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE hi DiffChange ctermfg=black ctermbg=darkblue cterm=NONE - hi DiffText ctermfg=black ctermbg=darkmagenta cterm=NONE hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE - else - " Light background - hi Normal ctermfg=black ctermbg=grey cterm=NONE - hi Statusline ctermfg=grey ctermbg=black cterm=bold - hi StatuslineNC ctermfg=grey ctermbg=darkgrey cterm=NONE - hi VertSplit ctermfg=black ctermbg=NONE cterm=NONE - hi TabLine ctermfg=black ctermbg=grey cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE - hi TabLineSel ctermfg=grey ctermbg=black cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold - hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE - hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold - hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi NonText ctermfg=black ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE + hi DiffText ctermfg=black ctermbg=darkmagenta cterm=NONE + hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE - hi Pmenu ctermfg=grey ctermbg=black cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel ctermfg=NONE ctermbg=darkyellow cterm=NONE - hi PmenuKind ctermfg=darkred ctermbg=black cterm=NONE - hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE - hi PmenuExtra ctermfg=grey ctermbg=black cterm=NONE - hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE - hi PmenuMatch ctermfg=grey ctermbg=black cterm=bold - hi PmenuMatchSel ctermfg=NONE ctermbg=darkyellow cterm=bold - hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi Error ctermfg=white ctermbg=darkred cterm=NONE hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE + hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE + hi Folded ctermfg=black ctermbg=NONE cterm=bold + hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse + hi LineNr ctermfg=darkyellow 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=black ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuBorder ctermfg=darkgrey ctermbg=grey cterm=NONE + 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=darkred cterm=reverse + hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold + hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse + hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Todo ctermfg=blue ctermbg=black cterm=reverse + hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE + hi Removed ctermfg=red ctermbg=NONE cterm=NONE hi Search ctermfg=darkgreen ctermbg=black cterm=reverse - hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse - hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE - hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse - hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi Visual ctermfg=darkblue ctermbg=grey cterm=reverse - hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline - hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE - hi Folded ctermfg=black ctermbg=NONE cterm=bold - hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE hi SpellBad ctermfg=darkred ctermbg=black cterm=reverse hi SpellCap ctermfg=darkcyan ctermbg=black cterm=reverse hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse hi SpellRare ctermfg=darkmagenta ctermbg=black cterm=reverse - hi Comment ctermfg=NONE ctermbg=NONE cterm=bold - hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE - hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=grey ctermbg=black cterm=bold + hi StatusLineNC ctermfg=grey ctermbg=black cterm=NONE + hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi TabLine ctermfg=grey ctermbg=black cterm=NONE + hi TabLineFill ctermfg=black ctermbg=black cterm=NONE + hi TabLineSel ctermfg=black ctermbg=grey cterm=bold,reverse + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi TitleBar ctermfg=black ctermbg=white cterm=NONE + hi TitleBarNC ctermfg=darkgrey ctermbg=white cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold + hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Title ctermfg=NONE ctermbg=NONE cterm=bold - hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold - hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE - hi DiffChange ctermfg=black ctermbg=darkblue cterm=NONE - hi DiffText ctermfg=black ctermbg=darkmagenta cterm=NONE - hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE + hi VertSplit ctermfg=black ctermbg=black cterm=NONE + hi Visual ctermfg=darkblue ctermbg=grey cterm=reverse + hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE + hi WarningMsg ctermfg=darkyellow 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 + finish + endif + + if s:t_Co >= 0 + hi CurSearch term=reverse + hi Cursor term=reverse + hi CursorIM term=NONE + hi CursorLineFold term=underline + hi CursorLineSign term=underline + 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 - 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 - finish endif -" Background: any -" Background: dark -" Color: color00 #000000 16 black -" Color: color08 #767676 243 darkgrey -" Color: color01 #d7005f 161 darkred -" Color: color09 #ff5f87 204 red -" Color: color02 #00af5f 35 darkgreen -" Color: color10 #00d75f 41 green -" Color: color03 #d78700 172 darkyellow -" Color: color11 #ffaf00 214 yellow -" Color: color04 #0087d7 32 darkblue -" Color: color12 #00afff 39 blue -" Color: color05 #d787d7 176 darkmagenta -" Color: color13 #ff87ff 213 magenta -" Color: color06 #00afaf 37 darkcyan -" Color: color14 #00d7d7 44 cyan -" Color: color07 #d0d0d0 252 grey -" Color: color15 #ffffff 231 white -" Color: color16 #875fff 99 darkred -" Color: colorLine #262626 235 darkgrey -" Color: colorB #303030 236 darkgrey -" Color: colorNonT #585858 240 grey -" Color: colorTab #585858 240 grey -" Color: colorC #ffffff 231 white -" Color: colorlC #ff5fff 207 magenta -" Color: colorDim #878787 102 grey -" Color: colorMP #ff00af 199 magenta -" Color: colorV #5fd7ff 81 cyan -" Color: colorSt #9e9e9e 247 grey -" Color: diffAdd #5f875f 65 darkgreen -" Color: diffAddFg #afffaf 157 black -" Color: diffDelete #875f5f 95 darkred -" Color: diffDeleteFg #ffafaf 217 black -" Color: diffChange #5f5f5f 59 lightgray -" Color: diffChangeFg #d0d0d0 252 black -" Color: diffText #5f8787 66 cyan -" Color: diffTextFg #afffff 159 black -" Term colors: color00 color01 color02 color03 color04 color05 color06 color07 -" Term colors: color08 color09 color10 color11 color12 color13 color14 color15 -" Background: light -" Color: color00 #000000 16 black -" Color: color08 #808080 240 darkgrey -" Color: color01 #af0000 124 darkred -" Color: color09 #d70000 160 red -" Color: color02 #008700 28 darkgreen -" Color: color10 #5faf5f 71 green -" Color: color03 #af5f00 130 darkyellow -" Color: color11 #d78700 172 yellow -" Color: color04 #005faf 25 darkblue -" Color: color12 #0087d7 32 blue -" Color: color05 #870087 90 darkmagenta -" Color: color13 #af00af 127 magenta -" Color: color06 #008787 30 darkcyan -" Color: color14 #00afaf 37 cyan -" Color: color07 #8a8a8a 245 grey -" Color: color15 #ffffff 231 white -" Color: color16 #5f00d7 56 blue -" Color: colorCm #8a8a8a 245 darkgrey -" Color: colorLine #EEEEEE 255 grey -" Color: colorB #E4E4E4 254 grey -" Color: colorNonT #b2b2b2 249 darkgrey -" Color: colorTab #d0d0d0 252 lightgrey -" Color: colorC #000000 16 black -" Color: colorlC #FF00FF 201 magenta -" Color: colorV #0087af 31 darkcyan -" Color: colorDim #626262 241 darkgrey -" Color: colorSt #5f5f5f 59 darkgrey -" Color: colorMP #ff00af 199 magenta -" Color: diffAdd #afd7af 151 darkgreen -" Color: diffAddFg #005f00 22 black -" Color: diffDelete #ffd7d7 224 darkred -" Color: diffDeleteFg #875f5f 95 black -" Color: diffChange #dadada 253 lightgray -" Color: diffChangeFg #262626 235 black -" Color: diffText #afd7d7 152 cyan -" Color: diffTextFg #005f5f 23 black -" Term colors: color00 color01 color02 color03 color04 color05 color06 color07 -" Term colors: color08 color09 color10 color11 color12 color13 color14 color15 -" Background: any " vim: et ts=8 sw=2 sts=2 diff --git a/runtime/colors/zaibatsu.vim b/runtime/colors/zaibatsu.vim index abb02a0663..96d5a77fd5 100644 --- a/runtime/colors/zaibatsu.vim +++ b/runtime/colors/zaibatsu.vim @@ -1,100 +1,29 @@ " Name: zaibatsu " Description: "If you believe the journalists, he's the single wealthiest individual, period. As rich as some zaibatsu. But there's the catch, really: is he an individual? In the sense that you are, or I am? No." -- William Gibson, Count Zero " Author: Romain Lafourcade -" Maintainer: Romain Lafourcade -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = 'zaibatsu' -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 = ['#0e0024', '#d7005f', '#00af5f', '#ffaf00', '#5f5fff', '#d700ff', '#00afff', '#d7d5db', '#878092', '#ff5faf', '#00d700', '#ffd700', '#8787ff', '#ff87ff', '#00ffff', '#ffffff'] -endif -hi Normal guifg=#ffffff guibg=#0e0024 gui=NONE cterm=NONE -hi EndOfBuffer guifg=#afafff guibg=#0e0024 gui=NONE cterm=NONE -hi NonText guifg=#878092 guibg=#0e0024 gui=NONE cterm=NONE -hi SpellBad guifg=NONE guibg=NONE guisp=#ff5faf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl -hi SpellCap guifg=NONE guibg=NONE guisp=#87ff00 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl -hi SpellLocal guifg=NONE guibg=NONE guisp=#ffffff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl -hi SpellRare guifg=NONE guibg=NONE guisp=#ffafff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl -hi StatusLine guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE -hi StatusLineNC guifg=#0e0024 guibg=#afaab6 gui=NONE cterm=NONE -hi Pmenu guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE -hi PmenuSbar guifg=#d7d5db guibg=#d7d5db gui=NONE cterm=NONE -hi PmenuSel guifg=#0e0024 guibg=#afafff gui=NONE cterm=NONE -hi PmenuThumb guifg=#878092 guibg=#878092 gui=NONE cterm=NONE -hi PmenuExtra guifg=#878092 guibg=#ffffff gui=NONE cterm=NONE -hi! link PmenuExtraSel PmenuSel -hi PmenuKind guifg=#878092 guibg=#ffffff gui=NONE cterm=NONE -hi! link PmenuKindSel PmenuSel -hi PmenuMatch guifg=#d700ff guibg=#ffffff gui=NONE cterm=NONE -hi PmenuMatchSel guifg=#d700ff guibg=#afafff gui=NONE cterm=NONE -hi ColorColumn guifg=NONE guibg=#510039 gui=NONE cterm=NONE -hi CursorLine guifg=NONE guibg=#362b49 gui=NONE cterm=NONE -hi CursorColumn guifg=NONE guibg=#362b49 gui=NONE cterm=NONE -hi WildMenu guifg=#0e0024 guibg=#afafff gui=NONE cterm=NONE -hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi Cursor guifg=#0e0024 guibg=#ffff5f gui=NONE cterm=NONE -hi CursorIM guifg=#0e0024 guibg=#ffff5f gui=NONE cterm=NONE -hi Error guifg=#d70000 guibg=#ffffff gui=reverse cterm=reverse -hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE -hi FoldColumn guifg=#00afff guibg=NONE gui=NONE cterm=NONE -hi Folded guifg=#ffaf00 guibg=#0e0024 gui=reverse cterm=reverse -hi IncSearch guifg=#ffaf00 guibg=#0e0024 gui=reverse cterm=reverse -hi LineNr guifg=#afafff guibg=NONE gui=NONE cterm=NONE -hi MatchParen guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse -hi ModeMsg guifg=#0e0024 guibg=#87ff00 gui=NONE cterm=NONE -hi MoreMsg guifg=#87ffff guibg=NONE gui=NONE cterm=NONE -hi Question guifg=#87ff00 guibg=NONE gui=NONE cterm=NONE -hi QuickFixLine guifg=#ffafff guibg=#0e0024 gui=reverse cterm=reverse -hi Search guifg=#87ffff guibg=#0e0024 gui=reverse cterm=reverse -hi SignColumn guifg=#00afff guibg=NONE gui=NONE cterm=NONE -hi SpecialKey guifg=#878092 guibg=NONE gui=NONE cterm=NONE -hi ToolbarButton guifg=#ffffff guibg=#5e556d gui=NONE cterm=NONE -hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi VertSplit guifg=#afafff guibg=NONE gui=NONE cterm=NONE -hi Visual guifg=#0e0024 guibg=#5fd7ff gui=NONE cterm=NONE -hi VisualNOS guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE -hi WarningMsg guifg=#ffafff guibg=NONE gui=NONE cterm=NONE -hi debugBreakpoint guifg=#87ff00 guibg=#5f00d7 gui=reverse cterm=reverse -hi debugPC guifg=#87ffff guibg=#5f00d7 gui=reverse cterm=reverse -hi Directory guifg=#87ffff guibg=NONE gui=NONE cterm=NONE -hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi Comment guifg=#afafff guibg=NONE gui=NONE cterm=NONE -hi Constant guifg=#ffff5f guibg=NONE gui=NONE cterm=NONE -hi Identifier guifg=#87ffff guibg=NONE gui=NONE cterm=NONE -hi Ignore guifg=#878092 guibg=NONE gui=NONE cterm=NONE -hi PreProc guifg=#00afff guibg=NONE gui=NONE cterm=NONE -hi Special guifg=#87ff00 guibg=NONE gui=NONE cterm=NONE -hi Statement guifg=#ffafff guibg=NONE gui=NONE cterm=NONE -hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse -hi Type guifg=#ff5faf guibg=NONE gui=NONE cterm=NONE -hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline +let g:terminal_ansi_colors = ['#0e0024', '#d7005f', '#00af5f', '#ffaf00', '#5f5fff', '#d700ff', '#00afff', '#d7d5db', '#878092', '#ff5faf', '#00d700', '#ffd700', '#8787ff', '#ff87ff', '#00ffff', '#ffffff'] + +hi! link Boolean Constant +hi! link Character Constant +hi! link Conditional Statement hi! link CurSearch IncSearch hi! link CursorLineFold CursorLine hi! link CursorLineNr CursorLine hi! link CursorLineSign CursorLine -hi! link LineNrAbove LineNr -hi! link LineNrBelow LineNr -hi! link StatusLineTerm StatusLine -hi! link StatusLineTermNC StatusLineNC -hi! link TabLine StatusLineNC -hi! link TabLineFill StatusLineNC -hi! link TabLineSel StatusLine -hi! link Terminal Normal -hi! link lCursor Cursor -hi! link PopupSelected PmenuSel -hi! link Boolean Constant -hi! link Character Constant -hi! link Conditional Statement hi! link Define PreProc hi! link Delimiter Special hi! link Exception Statement @@ -103,473 +32,256 @@ 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 PmenuExtraSel PmenuSel +hi! link PmenuKindSel PmenuSel +hi! link PopupNotification Todo hi! link PreCondit PreProc 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=#87ff00 guibg=#362b49 gui=reverse cterm=reverse -hi DiffChange guifg=#afafff guibg=#362b49 gui=reverse cterm=reverse -hi DiffText guifg=#d7d5db guibg=#362b49 gui=reverse cterm=reverse -hi DiffDelete guifg=#ff5faf guibg=#362b49 gui=reverse cterm=reverse +hi! link Typedef Type +hi! link lCursor Cursor -if s:t_Co >= 256 - hi Normal ctermfg=231 ctermbg=16 cterm=NONE - hi EndOfBuffer ctermfg=147 ctermbg=16 cterm=NONE - hi NonText ctermfg=103 ctermbg=16 cterm=NONE - hi SpellBad ctermfg=205 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=118 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=231 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=219 ctermbg=NONE cterm=underline - hi StatusLine ctermfg=16 ctermbg=231 cterm=NONE - hi StatusLineNC ctermfg=16 ctermbg=146 cterm=NONE - hi Pmenu ctermfg=16 ctermbg=231 cterm=NONE - hi PmenuSbar ctermfg=189 ctermbg=189 cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=147 cterm=NONE - hi PmenuThumb ctermfg=103 ctermbg=103 cterm=NONE - hi PmenuExtra ctermfg=103 ctermbg=231 cterm=NONE - hi! link PmenuExtraSel PmenuSel - hi PmenuKind ctermfg=103 ctermbg=231 cterm=NONE - hi! link PmenuKindSel PmenuSel - hi PmenuMatch ctermfg=165 ctermbg=231 cterm=NONE - hi PmenuMatchSel ctermfg=165 ctermbg=147 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=52 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE - hi WildMenu ctermfg=16 ctermbg=147 cterm=NONE - hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE - hi Cursor ctermfg=16 ctermbg=227 cterm=NONE - hi CursorIM ctermfg=16 ctermbg=227 cterm=NONE - hi Error ctermfg=160 ctermbg=231 cterm=reverse - hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE - hi FoldColumn ctermfg=39 ctermbg=NONE cterm=NONE - hi Folded ctermfg=214 ctermbg=16 cterm=reverse - hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse - hi LineNr ctermfg=147 ctermbg=NONE cterm=NONE - hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse - hi ModeMsg ctermfg=16 ctermbg=118 cterm=NONE - hi MoreMsg ctermfg=123 ctermbg=NONE cterm=NONE - hi Question ctermfg=118 ctermbg=NONE cterm=NONE - hi QuickFixLine ctermfg=219 ctermbg=16 cterm=reverse - hi Search ctermfg=123 ctermbg=16 cterm=reverse - hi SignColumn ctermfg=39 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=103 ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=231 ctermbg=60 cterm=NONE - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi VertSplit ctermfg=147 ctermbg=NONE cterm=NONE - hi Visual ctermfg=16 ctermbg=81 cterm=NONE - hi VisualNOS ctermfg=16 ctermbg=231 cterm=NONE - hi WarningMsg ctermfg=219 ctermbg=NONE cterm=NONE - hi debugBreakpoint ctermfg=118 ctermbg=56 cterm=reverse - hi debugPC ctermfg=123 ctermbg=56 cterm=reverse - hi Directory ctermfg=123 ctermbg=NONE cterm=NONE - hi Title ctermfg=NONE ctermbg=NONE cterm=NONE - hi Comment ctermfg=147 ctermbg=NONE cterm=NONE - hi Constant ctermfg=227 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=123 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=103 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=39 ctermbg=NONE cterm=NONE - hi Special ctermfg=118 ctermbg=NONE cterm=NONE - hi Statement ctermfg=219 ctermbg=NONE cterm=NONE - hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse - hi Type ctermfg=205 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi! link CurSearch IncSearch - hi! link CursorLineFold CursorLine - hi! link CursorLineNr CursorLine - hi! link CursorLineSign CursorLine - hi! link LineNrAbove LineNr - hi! link LineNrBelow LineNr - hi! link StatusLineTerm StatusLine - hi! link StatusLineTermNC StatusLineNC - hi! link TabLine StatusLineNC - hi! link TabLineFill StatusLineNC - hi! link TabLineSel StatusLine - hi! link Terminal Normal - hi! link lCursor Cursor - hi! link PopupSelected PmenuSel - 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 Terminal Normal - hi! link MessageWindow Pmenu - hi! link PopupNotification Todo - hi DiffAdd ctermfg=118 ctermbg=237 cterm=reverse - hi DiffChange ctermfg=147 ctermbg=237 cterm=reverse - hi DiffText ctermfg=189 ctermbg=237 cterm=reverse - hi DiffDelete ctermfg=205 ctermbg=237 cterm=reverse - unlet s:t_Co +hi Normal guifg=#ffffff guibg=#0e0024 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=NONE +hi ColorColumn guifg=NONE guibg=#510039 guisp=NONE gui=NONE ctermfg=NONE ctermbg=52 cterm=NONE term=reverse +hi Comment guifg=#afafff guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE term=bold +hi Conceal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE +hi Constant guifg=#ffff5f guibg=NONE guisp=NONE gui=NONE ctermfg=227 ctermbg=NONE cterm=NONE term=NONE +hi Cursor guifg=#0e0024 guibg=#ffff5f guisp=NONE gui=NONE ctermfg=16 ctermbg=227 cterm=NONE term=reverse +hi CursorColumn guifg=NONE guibg=#362b49 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=NONE +hi CursorIM guifg=#0e0024 guibg=#ffff5f guisp=NONE gui=NONE ctermfg=16 ctermbg=227 cterm=NONE term=NONE +hi CursorLine guifg=NONE guibg=#362b49 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=underline +hi DiffAdd guifg=#87ff00 guibg=#362b49 guisp=NONE gui=reverse ctermfg=118 ctermbg=237 cterm=reverse term=reverse +hi DiffChange guifg=#afafff guibg=#362b49 guisp=NONE gui=reverse ctermfg=147 ctermbg=237 cterm=reverse term=NONE +hi DiffDelete guifg=#ff5faf guibg=#362b49 guisp=NONE gui=reverse ctermfg=205 ctermbg=237 cterm=reverse term=reverse +hi DiffText guifg=#d7d5db guibg=#362b49 guisp=NONE gui=reverse ctermfg=189 ctermbg=237 cterm=reverse term=reverse +hi Directory guifg=#87ffff guibg=NONE guisp=NONE gui=NONE ctermfg=123 ctermbg=NONE cterm=NONE term=NONE +hi EndOfBuffer guifg=#afafff guibg=#0e0024 guisp=NONE gui=NONE ctermfg=147 ctermbg=16 cterm=NONE term=NONE +hi Error guifg=#d70000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=160 ctermbg=231 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=#00afff guibg=NONE guisp=NONE gui=NONE ctermfg=39 ctermbg=NONE cterm=NONE term=NONE +hi Folded guifg=#ffaf00 guibg=#0e0024 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 cterm=reverse term=NONE +hi Identifier guifg=#87ffff guibg=NONE guisp=NONE gui=NONE ctermfg=123 ctermbg=NONE cterm=NONE term=NONE +hi Ignore guifg=#878092 guibg=NONE guisp=NONE gui=NONE ctermfg=103 ctermbg=NONE cterm=NONE term=NONE +hi IncSearch guifg=#ffaf00 guibg=#0e0024 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 cterm=reverse term=bold,reverse,underline +hi LineNr guifg=#afafff guibg=NONE guisp=NONE gui=NONE ctermfg=147 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=#0e0024 guibg=#87ff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=118 cterm=NONE term=bold +hi MoreMsg guifg=#87ffff guibg=NONE guisp=NONE gui=NONE ctermfg=123 ctermbg=NONE cterm=NONE term=NONE +hi NonText guifg=#878092 guibg=#0e0024 guisp=NONE gui=NONE ctermfg=103 ctermbg=16 cterm=NONE term=NONE +hi Pmenu guifg=#0e0024 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=reverse +hi PmenuExtra guifg=#878092 guibg=#ffffff guisp=NONE gui=NONE ctermfg=103 ctermbg=231 cterm=NONE term=NONE +hi PmenuKind guifg=#878092 guibg=#ffffff guisp=NONE gui=NONE ctermfg=103 ctermbg=231 cterm=NONE term=NONE +hi PmenuMatch guifg=#d700ff guibg=#ffffff guisp=NONE gui=NONE ctermfg=165 ctermbg=231 cterm=NONE term=NONE +hi PmenuMatchSel guifg=#d700ff guibg=#afafff guisp=NONE gui=NONE ctermfg=165 ctermbg=147 cterm=NONE term=NONE +hi PmenuSbar guifg=#d7d5db guibg=#d7d5db guisp=NONE gui=NONE ctermfg=189 ctermbg=189 cterm=NONE term=reverse +hi PmenuSel guifg=#0e0024 guibg=#afafff guisp=NONE gui=NONE ctermfg=16 ctermbg=147 cterm=NONE term=bold +hi PmenuThumb guifg=#878092 guibg=#878092 guisp=NONE gui=NONE ctermfg=103 ctermbg=103 cterm=NONE term=NONE +hi PreProc guifg=#00afff guibg=NONE guisp=NONE gui=NONE ctermfg=39 ctermbg=NONE cterm=NONE term=NONE +hi Question guifg=#87ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=118 ctermbg=NONE cterm=NONE term=standout +hi QuickFixLine guifg=#ffafff guibg=#0e0024 guisp=NONE gui=reverse ctermfg=219 ctermbg=16 cterm=reverse term=NONE +hi Search guifg=#87ffff guibg=#0e0024 guisp=NONE gui=reverse ctermfg=123 ctermbg=16 cterm=reverse term=reverse +hi SignColumn guifg=#00afff guibg=NONE guisp=NONE gui=NONE ctermfg=39 ctermbg=NONE cterm=NONE term=reverse +hi Special guifg=#87ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=118 ctermbg=NONE cterm=NONE term=NONE +hi SpecialKey guifg=#878092 guibg=NONE guisp=NONE gui=NONE ctermfg=103 ctermbg=NONE cterm=NONE term=bold +hi SpellBad guifg=NONE guibg=NONE guisp=#ff5faf gui=undercurl ctermfg=205 ctermbg=NONE cterm=underline term=underline +hi SpellCap guifg=NONE guibg=NONE guisp=#87ff00 gui=undercurl ctermfg=118 ctermbg=NONE cterm=underline term=underline +hi SpellLocal guifg=NONE guibg=NONE guisp=#ffffff gui=undercurl ctermfg=231 ctermbg=NONE cterm=underline term=underline +hi SpellRare guifg=NONE guibg=NONE guisp=#ffafff gui=undercurl ctermfg=219 ctermbg=NONE cterm=underline term=underline +hi Statement guifg=#ffafff guibg=NONE guisp=NONE gui=NONE ctermfg=219 ctermbg=NONE cterm=NONE term=NONE +hi StatusLine guifg=#0e0024 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=bold,reverse +hi StatusLineNC guifg=#0e0024 guibg=#afaab6 guisp=NONE gui=NONE ctermfg=16 ctermbg=146 cterm=NONE term=bold,underline +hi Title guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE +hi TitleBar guifg=#ffffff guibg=#2e2044 guisp=NONE gui=NONE ctermfg=231 ctermbg=237 cterm=NONE term=NONE +hi TitleBarNC guifg=#afaab6 guibg=#1e1034 guisp=NONE gui=NONE ctermfg=146 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=#5e556d guisp=NONE gui=NONE ctermfg=231 ctermbg=60 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=#ff5faf guibg=NONE guisp=NONE gui=NONE ctermfg=205 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=#afafff guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE term=NONE +hi Visual guifg=#0e0024 guibg=#5fd7ff guisp=NONE gui=NONE ctermfg=16 ctermbg=81 cterm=NONE term=reverse +hi VisualNOS guifg=#0e0024 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE +hi WarningMsg guifg=#ffafff guibg=NONE guisp=NONE gui=NONE ctermfg=219 ctermbg=NONE cterm=NONE term=standout +hi WildMenu guifg=#0e0024 guibg=#afafff guisp=NONE gui=NONE ctermfg=16 ctermbg=147 cterm=NONE term=bold +hi debugBreakpoint guifg=#87ff00 guibg=#5f00d7 guisp=NONE gui=reverse ctermfg=118 ctermbg=56 cterm=reverse term=reverse +hi debugPC guifg=#87ffff guibg=#5f00d7 guisp=NONE gui=reverse ctermfg=123 ctermbg=56 cterm=reverse term=reverse + +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=blue ctermbg=black cterm=NONE - hi NonText ctermfg=darkgray ctermbg=black 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 StatusLine ctermfg=white ctermbg=black cterm=reverse - hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=reverse - hi Pmenu ctermfg=black ctermbg=white cterm=NONE - hi PmenuSbar ctermfg=gray ctermbg=gray cterm=NONE - hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE - hi PmenuThumb ctermfg=darkgray ctermbg=darkgray cterm=NONE - hi PmenuExtra ctermfg=darkgray ctermbg=white cterm=NONE hi! link PmenuExtraSel PmenuSel - hi PmenuKind ctermfg=darkgray ctermbg=white cterm=NONE hi! link PmenuKindSel PmenuSel - hi PmenuMatch ctermfg=black ctermbg=white cterm=bold - hi PmenuMatchSel ctermfg=white ctermbg=blue cterm=bold + hi Normal ctermfg=white ctermbg=black cterm=NONE hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE - hi WildMenu ctermfg=white ctermbg=blue cterm=NONE + hi Comment ctermfg=blue ctermbg=NONE cterm=NONE hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE hi Cursor ctermfg=black ctermbg=yellow cterm=NONE + hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse + hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse + hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse + hi DiffText ctermfg=grey ctermbg=black cterm=reverse + hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE hi Error ctermfg=red ctermbg=white cterm=reverse hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Folded ctermfg=darkyellow ctermbg=black cterm=reverse + hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse hi LineNr ctermfg=blue ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse hi ModeMsg ctermfg=black ctermbg=green cterm=NONE hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE + hi NonText ctermfg=darkgray ctermbg=black cterm=NONE + hi Pmenu ctermfg=black ctermbg=white cterm=NONE + hi PmenuExtra ctermfg=darkgray ctermbg=white cterm=NONE + hi PmenuKind ctermfg=darkgray ctermbg=white cterm=NONE + hi PmenuMatch ctermfg=black ctermbg=white cterm=bold + hi PmenuMatchSel ctermfg=white ctermbg=blue cterm=bold + hi PmenuSbar ctermfg=gray ctermbg=gray cterm=NONE + hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE + hi PmenuThumb ctermfg=darkgray ctermbg=darkgray cterm=NONE + hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Question ctermfg=green ctermbg=NONE cterm=NONE hi QuickFixLine ctermfg=magenta ctermbg=black cterm=reverse hi Search ctermfg=cyan ctermbg=black cterm=reverse hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Special ctermfg=green ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=darkgray 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=magenta ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=white ctermbg=black cterm=reverse + hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=reverse + hi Title ctermfg=NONE ctermbg=NONE cterm=NONE + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=gray ctermbg=black cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse hi ToolbarButton ctermfg=white ctermbg=darkgray cterm=NONE 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=blue ctermbg=NONE cterm=NONE hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE hi VisualNOS ctermfg=black ctermbg=white cterm=NONE hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE + hi WildMenu ctermfg=white ctermbg=blue 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=NONE ctermbg=NONE cterm=NONE - hi Comment ctermfg=blue ctermbg=NONE cterm=NONE - hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE - hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE - hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Special ctermfg=green ctermbg=NONE cterm=NONE - hi Statement ctermfg=magenta 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! link CurSearch IncSearch - hi! link CursorLineFold CursorLine - hi! link CursorLineNr CursorLine - hi! link CursorLineSign CursorLine - hi! link LineNrAbove LineNr - hi! link LineNrBelow LineNr - hi! link StatusLineTerm StatusLine - hi! link StatusLineTermNC StatusLineNC - hi! link TabLine StatusLineNC - hi! link TabLineFill StatusLineNC - hi! link TabLineSel StatusLine - hi! link Terminal Normal - hi! link lCursor Cursor - hi! link PopupSelected PmenuSel - 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 Terminal Normal - hi! link MessageWindow Pmenu - hi! link PopupNotification Todo - hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse - hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse - hi DiffText ctermfg=grey ctermbg=black cterm=reverse - hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse - unlet s:t_Co finish endif if s:t_Co >= 8 - hi Normal ctermfg=gray ctermbg=black cterm=NONE - hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE - hi NonText ctermfg=darkgray ctermbg=black 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 StatusLine ctermfg=white ctermbg=black cterm=reverse - hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=bold,reverse - hi Pmenu ctermfg=black ctermbg=white cterm=NONE - hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE - hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE - hi PmenuThumb ctermfg=blue ctermbg=blue cterm=NONE hi! link PmenuExtra Pmenu hi! link PmenuExtraSel PmenuSel hi! link PmenuKind Pmenu hi! link PmenuKindSel PmenuSel - hi PmenuMatch ctermfg=black ctermbg=white cterm=bold - hi PmenuMatchSel ctermfg=white ctermbg=blue cterm=bold + hi Normal ctermfg=gray ctermbg=black cterm=NONE hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE - hi WildMenu ctermfg=white ctermbg=blue cterm=NONE + hi Comment ctermfg=blue ctermbg=NONE cterm=NONE hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE hi Cursor ctermfg=black ctermbg=yellow cterm=NONE + hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse + hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse + hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse + hi DiffText ctermfg=grey ctermbg=black cterm=reverse + hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE hi Error ctermfg=red ctermbg=white cterm=reverse hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Folded ctermfg=darkyellow ctermbg=black cterm=reverse + hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE + hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse hi LineNr ctermfg=blue ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse hi ModeMsg ctermfg=black ctermbg=green cterm=NONE hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE + hi NonText ctermfg=darkgray ctermbg=black cterm=NONE + hi Pmenu ctermfg=black ctermbg=white cterm=NONE + hi PmenuMatch ctermfg=black ctermbg=white cterm=bold + hi PmenuMatchSel ctermfg=white ctermbg=blue cterm=bold + hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE + hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE + hi PmenuThumb ctermfg=blue ctermbg=blue cterm=NONE + hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Question ctermfg=green ctermbg=NONE cterm=NONE hi QuickFixLine ctermfg=magenta ctermbg=black cterm=reverse hi Search ctermfg=cyan ctermbg=black cterm=reverse hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Special ctermfg=green ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=darkgray 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=magenta ctermbg=NONE cterm=NONE + hi StatusLine ctermfg=white ctermbg=black cterm=reverse + hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=bold,reverse + hi Title ctermfg=NONE ctermbg=NONE cterm=NONE + hi TitleBar ctermfg=white ctermbg=black cterm=NONE + hi TitleBarNC ctermfg=gray ctermbg=black cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse hi ToolbarButton ctermfg=white ctermbg=darkgray cterm=NONE 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=blue ctermbg=NONE cterm=NONE hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE hi VisualNOS ctermfg=black ctermbg=white cterm=NONE hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE + hi WildMenu ctermfg=white ctermbg=blue 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=NONE ctermbg=NONE cterm=NONE - hi Comment ctermfg=blue ctermbg=NONE cterm=NONE - hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE - hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE - hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Special ctermfg=green ctermbg=NONE cterm=NONE - hi Statement ctermfg=magenta 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! link CurSearch IncSearch - hi! link CursorLineFold CursorLine - hi! link CursorLineNr CursorLine - hi! link CursorLineSign CursorLine - hi! link LineNrAbove LineNr - hi! link LineNrBelow LineNr - hi! link StatusLineTerm StatusLine - hi! link StatusLineTermNC StatusLineNC - hi! link TabLine StatusLineNC - hi! link TabLineFill StatusLineNC - hi! link TabLineSel StatusLine - hi! link Terminal Normal - hi! link lCursor Cursor - hi! link PopupSelected PmenuSel - 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 Terminal Normal - hi! link MessageWindow Pmenu - hi! link PopupNotification Todo - hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse - hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse - hi DiffText ctermfg=grey ctermbg=black cterm=reverse - hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse - 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 CurSearch term=reverse + hi CursorLineFold 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 CursorLineSign term=underline + 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 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 Terminal term=NONE finish endif -" Background: dark -" Color: background #0e0024 16 black -" Color: darkred #510039 52 darkred -" Color: darkgreen #5faf00 70 darkgreen -" Color: darkyellow #ffaf00 214 darkyellow -" Color: darkblue #5f00d7 56 darkblue -" Color: darkmagenta #d700ff 165 darkmagenta -" Color: darkcyan #00afff 39 darkcyan -" Color: red #ff5faf 205 red -" Color: green #87ff00 118 green -" Color: yellow #ffff5f 227 yellow -" Color: blue #afafff 147 blue -" Color: magenta #ffafff 219 magenta -" Color: cyan #87ffff 123 cyan -" Color: white #ffffff 231 white -" Color: neutral1 #D7D5DB 189 gray -" Color: neutral2 #AFAAB6 146 gray -" Color: neutral3 #878092 103 darkgray -" Color: neutral4 #5E556D 60 darkgray -" Color: neutral5 #362B49 237 darkgray -" Color: error #d70000 160 red -" Color: visual #5FD7FF 81 darkcyan -" Color: Xdarkred #d7005f ~ -" Color: Xdarkgreen #00af5f ~ -" Color: Xdarkblue #5f5fff ~ -" Color: Xdarkwhite #d7d7d7 ~ -" Color: Xgrey #878787 ~ -" Color: Xbrightgreen #00d700 ~ -" Color: Xbrightyellow #ffd700 ~ -" Color: Xbrightblue #8787ff ~ -" Color: Xbrightmagenta #ff87ff ~ -" Color: Xbrightcyan #00ffff ~ -" Term colors: background -" Term colors: Xdarkred -" Term colors: Xdarkgreen -" Term colors: darkyellow -" Term colors: Xdarkblue -" Term colors: darkmagenta -" Term colors: darkcyan -" Term colors: neutral1 -" Term colors: neutral3 -" Term colors: red -" Term colors: Xbrightgreen -" Term colors: Xbrightyellow -" Term colors: Xbrightblue -" Term colors: Xbrightmagenta -" Term colors: Xbrightcyan -" Term colors: white -" Color: bgDiffA #5F875F 65 darkgreen -" 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 diff --git a/runtime/colors/zellner.vim b/runtime/colors/zellner.vim index 5b0a72caa4..dc24f9b3a6 100644 --- a/runtime/colors/zellner.vim +++ b/runtime/colors/zellner.vim @@ -2,420 +2,260 @@ " Description: Light background colorscheme. " Author: Original author Ron Aaron " Maintainer: Original maintainer Ron Aaron -" Website: https://github.com/vim/colorschemes +" URL: https://github.com/vim/colorschemes " License: Same as Vim -" Last Change: 2025 Jan 07 +" 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 = 'zellner' -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', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#a9a9a9', '#ff0000', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#000000'] -if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#ffffff', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#a9a9a9', '#ff0000', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#000000'] -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 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! link PopupSelected PmenuSel -hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE -hi Folded guifg=#00008b guibg=#d3d3d3 gui=NONE cterm=NONE -hi CursorLine guifg=NONE guibg=#e5e5e5 gui=NONE cterm=NONE -hi CursorColumn guifg=NONE guibg=#e5e5e5 gui=NONE cterm=NONE -hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=bold -hi QuickFixLine guifg=#ffffff guibg=#6a5acd gui=NONE cterm=NONE -hi EndOfBuffer guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE -hi StatusLine guifg=#ffff00 guibg=#a9a9a9 gui=NONE cterm=NONE -hi StatusLineNC guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE -hi StatusLineTerm guifg=#ffffff guibg=#006400 gui=NONE cterm=NONE -hi StatusLineTermNC guifg=#ffffff guibg=#0000ff gui=NONE cterm=NONE -hi VertSplit guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE -hi Pmenu guifg=#000000 guibg=#dadada gui=NONE cterm=NONE -hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi PmenuSbar guifg=NONE guibg=#ffffff gui=NONE cterm=NONE -hi PmenuThumb guifg=NONE guibg=#a9a9a9 gui=NONE cterm=NONE -hi PmenuMatch guifg=#a52a2a guibg=#dadada gui=NONE cterm=NONE -hi PmenuMatchSel guifg=#a52a2a guibg=#ffff00 gui=NONE cterm=NONE -hi TabLine guifg=#000000 guibg=#a9a9a9 gui=underline cterm=underline -hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse -hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold -hi ToolbarLine guifg=NONE guibg=#d3d3d3 gui=NONE cterm=NONE -hi ToolbarButton guifg=NONE guibg=#a9a9a9 gui=bold cterm=bold -hi NonText guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE -hi SpecialKey guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE -hi Visual guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi VisualNOS guifg=NONE guibg=#ff0000 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 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 ErrorMsg guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse -hi WarningMsg guifg=#a020f0 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=#ff00ff guibg=NONE gui=bold cterm=bold -hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi MatchParen guifg=#ffffff guibg=#ff00ff gui=NONE cterm=NONE -hi Search guifg=#ffffff guibg=#a020f0 gui=NONE cterm=NONE -hi IncSearch guifg=#000000 guibg=NONE gui=reverse cterm=reverse -hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE -hi ColorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE -hi Cursor guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE -hi lCursor guifg=#000000 guibg=#ff00ff 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=#878700 guibg=NONE guisp=#878700 gui=undercurl cterm=underline -hi SpellRare guifg=#008787 guibg=NONE guisp=#008787 gui=undercurl cterm=underline -hi Comment guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE -hi Constant guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE -hi Identifier guifg=#0000ff guibg=NONE gui=NONE cterm=NONE -hi Statement guifg=#a52a2a guibg=NONE gui=NONE cterm=NONE -hi PreProc guifg=#a020f0 guibg=NONE gui=NONE cterm=NONE -hi Type guifg=#0000ff guibg=NONE gui=NONE cterm=NONE -hi Special guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE -hi Tag guifg=#006400 guibg=NONE gui=NONE cterm=NONE -hi Directory guifg=#0000ff guibg=NONE gui=bold cterm=bold -hi Conceal guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE -hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi Title guifg=#a020f0 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 MessageWindow Pmenu - hi! link PopupNotification Todo - hi! link PopupSelected PmenuSel - hi Normal ctermfg=16 ctermbg=231 cterm=NONE - hi Folded ctermfg=18 ctermbg=252 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE - hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=bold - hi QuickFixLine ctermfg=231 ctermbg=62 cterm=NONE - hi EndOfBuffer ctermfg=248 ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=226 ctermbg=248 cterm=NONE - hi StatusLineNC ctermfg=231 ctermbg=16 cterm=NONE - hi StatusLineTerm ctermfg=231 ctermbg=22 cterm=NONE - hi StatusLineTermNC ctermfg=231 ctermbg=21 cterm=NONE - hi VertSplit ctermfg=231 ctermbg=16 cterm=NONE - hi Pmenu ctermfg=16 ctermbg=253 cterm=NONE - hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=231 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=248 cterm=NONE - hi PmenuMatch ctermfg=124 ctermbg=253 cterm=NONE - hi PmenuMatchSel ctermfg=124 ctermbg=226 cterm=NONE - hi TabLine ctermfg=16 ctermbg=248 cterm=underline - hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse - hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=252 cterm=NONE - hi ToolbarButton ctermfg=NONE ctermbg=248 cterm=bold - hi NonText ctermfg=248 ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=248 ctermbg=NONE cterm=NONE - hi Visual ctermfg=16 ctermbg=226 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 SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE - hi Underlined ctermfg=62 ctermbg=NONE cterm=underline - hi Error ctermfg=196 ctermbg=231 cterm=reverse - hi ErrorMsg ctermfg=196 ctermbg=231 cterm=reverse - hi WarningMsg ctermfg=129 ctermbg=231 cterm=NONE - hi MoreMsg ctermfg=16 ctermbg=231 cterm=bold - hi ModeMsg ctermfg=16 ctermbg=231 cterm=bold - hi Question ctermfg=201 ctermbg=NONE cterm=bold - hi Todo ctermfg=16 ctermbg=226 cterm=NONE - hi MatchParen ctermfg=231 ctermbg=201 cterm=NONE - hi Search ctermfg=231 ctermbg=129 cterm=NONE - hi IncSearch ctermfg=16 ctermbg=NONE cterm=reverse - hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=255 cterm=NONE - hi Cursor ctermfg=231 ctermbg=16 cterm=NONE - hi lCursor ctermfg=16 ctermbg=201 cterm=NONE - hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=21 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=100 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=30 ctermbg=NONE cterm=underline - hi Comment ctermfg=196 ctermbg=NONE cterm=NONE - hi Constant ctermfg=201 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=21 ctermbg=NONE cterm=NONE - hi Statement ctermfg=124 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=129 ctermbg=NONE cterm=NONE - hi Type ctermfg=21 ctermbg=NONE cterm=NONE - hi Special ctermfg=201 ctermbg=NONE cterm=NONE - hi Tag ctermfg=22 ctermbg=NONE cterm=NONE - hi Directory ctermfg=21 ctermbg=NONE cterm=bold - hi Conceal ctermfg=248 ctermbg=NONE cterm=NONE - hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Title ctermfg=129 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=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE +hi ColorColumn guifg=NONE guibg=#eeeeee guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=reverse +hi Comment guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=bold +hi Conceal guifg=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=248 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=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=reverse +hi CursorColumn guifg=NONE guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=NONE +hi CursorLine guifg=NONE guibg=#e5e5e5 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=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=21 ctermbg=NONE cterm=bold term=NONE +hi EndOfBuffer guifg=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=248 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=#00008b guibg=NONE guisp=NONE gui=NONE ctermfg=18 ctermbg=NONE cterm=NONE term=NONE +hi Folded guifg=#00008b guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=18 ctermbg=252 cterm=NONE term=NONE +hi Identifier guifg=#0000ff guibg=NONE guisp=NONE gui=NONE ctermfg=21 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=NONE guisp=NONE gui=reverse ctermfg=16 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=#ff00ff guisp=NONE gui=NONE ctermfg=231 ctermbg=201 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=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=248 ctermbg=NONE cterm=NONE term=NONE +hi Pmenu guifg=#000000 guibg=#dadada guisp=NONE gui=NONE ctermfg=16 ctermbg=253 cterm=NONE term=reverse +hi PmenuMatch guifg=#a52a2a guibg=#dadada guisp=NONE gui=NONE ctermfg=124 ctermbg=253 cterm=NONE term=NONE +hi PmenuMatchSel guifg=#a52a2a guibg=#ffff00 guisp=NONE gui=NONE ctermfg=124 ctermbg=226 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=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold +hi PmenuThumb guifg=NONE guibg=#a9a9a9 guisp=NONE gui=NONE ctermfg=NONE ctermbg=248 cterm=NONE term=NONE +hi PreProc guifg=#a020f0 guibg=NONE guisp=NONE gui=NONE ctermfg=129 ctermbg=NONE cterm=NONE term=NONE +hi Question guifg=#ff00ff guibg=NONE guisp=NONE gui=bold ctermfg=201 ctermbg=NONE cterm=bold term=standout +hi QuickFixLine guifg=#ffffff guibg=#6a5acd guisp=NONE gui=NONE ctermfg=231 ctermbg=62 cterm=NONE term=NONE +hi Search guifg=#ffffff guibg=#a020f0 guisp=NONE gui=NONE ctermfg=231 ctermbg=129 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=#ff00ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE +hi SpecialKey guifg=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=248 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=#878700 guibg=NONE guisp=#878700 gui=undercurl ctermfg=100 ctermbg=NONE cterm=underline term=underline +hi SpellRare guifg=#008787 guibg=NONE guisp=#008787 gui=undercurl ctermfg=30 ctermbg=NONE cterm=underline term=underline +hi Statement guifg=#a52a2a guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE +hi StatusLine guifg=#ffff00 guibg=#a9a9a9 guisp=NONE gui=NONE ctermfg=226 ctermbg=248 cterm=NONE term=bold,reverse +hi StatusLineNC guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=bold,underline +hi StatusLineTerm guifg=#ffffff guibg=#006400 guisp=NONE gui=NONE ctermfg=231 ctermbg=22 cterm=NONE term=bold,reverse +hi StatusLineTermNC guifg=#ffffff guibg=#0000ff guisp=NONE gui=NONE ctermfg=231 ctermbg=21 cterm=NONE term=bold,underline +hi TabLine guifg=#000000 guibg=#a9a9a9 guisp=NONE gui=underline ctermfg=16 ctermbg=248 cterm=underline term=bold,underline +hi TabLineFill guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=NONE +hi TabLineSel guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=bold,reverse +hi Tag guifg=#006400 guibg=NONE guisp=NONE gui=NONE ctermfg=22 ctermbg=NONE cterm=NONE term=NONE +hi Title guifg=#a020f0 guibg=NONE guisp=NONE gui=bold ctermfg=129 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=NONE guibg=#a9a9a9 guisp=NONE gui=bold ctermfg=NONE ctermbg=248 cterm=bold term=bold,reverse +hi ToolbarLine guifg=NONE guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=NONE ctermbg=252 cterm=NONE term=reverse +hi Type guifg=#0000ff guibg=NONE guisp=NONE gui=NONE ctermfg=21 ctermbg=NONE cterm=NONE term=NONE +hi Underlined guifg=#6a5acd guibg=NONE guisp=NONE gui=underline ctermfg=62 ctermbg=NONE cterm=underline term=underline +hi VertSplit guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=NONE +hi Visual guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=reverse +hi VisualNOS guifg=NONE guibg=#ff0000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=196 cterm=NONE term=NONE +hi WarningMsg guifg=#a020f0 guibg=#ffffff guisp=NONE gui=NONE ctermfg=129 ctermbg=231 cterm=NONE 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=#ff00ff guisp=NONE gui=NONE ctermfg=16 ctermbg=201 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 Folded ctermfg=darkblue ctermbg=NONE cterm=bold - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi ColorColumn ctermfg=NONE ctermbg=grey cterm=NONE + hi Comment ctermfg=red ctermbg=NONE cterm=NONE + hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE + hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE + hi Cursor ctermfg=white ctermbg=black cterm=NONE hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorLineNr ctermfg=darkred ctermbg=NONE cterm=bold - hi QuickFixLine ctermfg=white ctermbg=blue 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=blue ctermbg=NONE cterm=bold hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Error ctermfg=red ctermbg=white cterm=reverse + hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse + hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold + hi Identifier ctermfg=blue ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=black ctermbg=NONE cterm=reverse + hi LineNr ctermfg=darkred 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=grey 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=yellow cterm=bold + hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE + hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE + hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi Question ctermfg=magenta ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=white ctermbg=blue cterm=NONE + hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=magenta ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=red ctermbg=NONE cterm=underline + hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=underline + hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline + hi Statement ctermfg=darkred ctermbg=NONE cterm=NONE hi StatusLine ctermfg=yellow ctermbg=darkgrey cterm=NONE hi StatusLineNC ctermfg=white ctermbg=black cterm=NONE hi StatusLineTerm ctermfg=white ctermbg=darkgreen cterm=NONE hi StatusLineTermNC ctermfg=white ctermbg=blue cterm=NONE - hi VertSplit ctermfg=white ctermbg=black cterm=NONE - hi Pmenu ctermfg=black ctermbg=grey cterm=NONE - hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE - hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold hi TabLine ctermfg=black ctermbg=grey cterm=underline hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse hi TabLineSel ctermfg=black ctermbg=white cterm=bold - hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE + hi Tag ctermfg=darkgreen ctermbg=NONE 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=yellow cterm=NONE hi ToolbarButton ctermfg=NONE ctermbg=grey cterm=bold - hi NonText ctermfg=grey ctermbg=NONE cterm=NONE - hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE + hi Type ctermfg=blue ctermbg=NONE cterm=NONE + hi Underlined ctermfg=blue ctermbg=NONE cterm=underline + hi VertSplit ctermfg=white ctermbg=black cterm=NONE hi Visual ctermfg=black ctermbg=yellow cterm=NONE hi VisualNOS ctermfg=NONE ctermbg=red cterm=NONE - hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=darkblue ctermbg=NONE 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 ErrorMsg 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 Question ctermfg=magenta ctermbg=NONE cterm=bold - hi Todo ctermfg=black ctermbg=yellow cterm=NONE - hi MatchParen ctermfg=white ctermbg=magenta cterm=NONE - hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE - hi IncSearch ctermfg=black ctermbg=NONE cterm=reverse hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE - hi ColorColumn ctermfg=NONE ctermbg=grey cterm=NONE - hi Cursor ctermfg=white ctermbg=black cterm=NONE hi lCursor ctermfg=black ctermbg=magenta cterm=NONE - hi SpellBad ctermfg=red ctermbg=NONE cterm=underline - hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=underline - hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline - hi Comment ctermfg=red ctermbg=NONE cterm=NONE - hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE - hi Identifier ctermfg=blue ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkred ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Type ctermfg=blue ctermbg=NONE cterm=NONE - hi Special ctermfg=magenta ctermbg=NONE cterm=NONE - hi Tag ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Directory ctermfg=blue ctermbg=NONE cterm=bold - hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE - 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=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=black ctermbg=gray cterm=NONE - hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + 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=darkmagenta 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=NONE cterm=underline hi CursorLineNr ctermfg=darkred ctermbg=NONE cterm=bold - hi QuickFixLine ctermfg=gray ctermbg=darkblue 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=darkblue ctermbg=NONE cterm=bold hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=bold + hi Error ctermfg=darkred ctermbg=black cterm=reverse + hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse + hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold + hi Identifier ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi IncSearch ctermfg=gray ctermbg=NONE cterm=reverse + hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=black ctermbg=darkmagenta cterm=NONE + hi ModeMsg ctermfg=gray ctermbg=black cterm=bold + hi MoreMsg ctermfg=gray ctermbg=black cterm=bold + hi NonText ctermfg=gray 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=darkmagenta cterm=NONE + hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold + hi Question ctermfg=darkmagenta ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=gray ctermbg=darkblue cterm=NONE + hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE + hi SignColumn ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Special ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse + hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=reverse + hi SpellLocal ctermfg=darkyellow ctermbg=darkblue cterm=reverse + hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi Statement ctermfg=darkred ctermbg=NONE cterm=bold hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse hi StatusLineTerm ctermfg=black ctermbg=gray cterm=bold,reverse hi StatusLineTermNC ctermfg=black ctermbg=gray cterm=reverse - hi VertSplit ctermfg=black ctermbg=gray 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=darkmagenta cterm=NONE - hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold - hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold hi TabLine ctermfg=black ctermbg=gray cterm=reverse hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse hi TabLineSel ctermfg=gray ctermbg=black cterm=bold,reverse - hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Tag ctermfg=darkgreen ctermbg=NONE 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 NonText ctermfg=gray ctermbg=NONE cterm=bold - hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi Type ctermfg=darkblue ctermbg=NONE cterm=bold + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi VertSplit ctermfg=black ctermbg=gray cterm=reverse hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline - hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE - hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE - hi SignColumn ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline - hi Error ctermfg=darkred ctermbg=black cterm=reverse - hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse hi WarningMsg ctermfg=darkmagenta ctermbg=black cterm=NONE - hi MoreMsg ctermfg=gray ctermbg=black cterm=bold - hi ModeMsg ctermfg=gray ctermbg=black cterm=bold - hi Question ctermfg=darkmagenta ctermbg=NONE cterm=bold - hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE - hi MatchParen ctermfg=black ctermbg=darkmagenta cterm=NONE - hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE - hi IncSearch ctermfg=gray ctermbg=NONE cterm=reverse hi WildMenu ctermfg=gray ctermbg=darkyellow cterm=NONE - hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE - hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse - hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=reverse - hi SpellLocal ctermfg=darkyellow ctermbg=darkblue cterm=reverse - hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE - hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkblue ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkred ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold - hi Type ctermfg=darkblue ctermbg=NONE cterm=bold - hi Special ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold - hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE - 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=magenta 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 Function term=NONE + hi Number term=NONE + hi Terminal term=NONE finish endif -" Background: light -" Color: comment #ff0000 196 red -" Color: constant #ff00ff 201 magenta -" Color: identifier #0000ff 21 blue -" Color: statement #a52a2a 124 darkred -" Color: preproc #a020f0 129 darkmagenta -" Color: type #0000ff 21 blue -" Color: special #ff00ff 201 magenta -" Color: tag #006400 22 darkgreen -" Color: fg0 #000000 16 black -" Color: bg0 #ffffff 231 white -" Color: bg1 #a9a9a9 248 grey -" Color: status #a9a9a9 248 darkgrey -" Color: visual #ffff00 226 yellow -" Color: folded #d3d3d3 252 black -" Color: folded_fg #00008b 18 darkblue -" Color: cursorline #e5e5e5 254 black -" Color: pmenu #dadada 253 grey -" Color: wildmenu #ffff00 226 yellow -" Color: error #ff0000 196 red -" Color: linenr #a52a2a 124 darkred -" Color: colorcolumn #eeeeee 255 grey -" 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 -" 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 diff --git a/runtime/compiler/context.vim b/runtime/compiler/context.vim index 093943e22d..c3780d461b 100644 --- a/runtime/compiler/context.vim +++ b/runtime/compiler/context.vim @@ -6,6 +6,7 @@ vim9script # Contributors: Enno Nagel # Last Change: 2024 Mar 29 # 2024 Apr 03 by The Vim Project (removed :CompilerSet definition) +# 2025 Mar 11 by The Vim Project (add comment for Dispatch) if exists("g:current_compiler") finish @@ -15,6 +16,7 @@ import autoload '../autoload/context.vim' g:current_compiler = 'context' +# CompilerSet makeprg=context if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) || (!filereadable('Makefile') && !filereadable('makefile')) var makeprg = join(context.ConTeXtCmd(shellescape(expand('%:p:t'))), ' ') diff --git a/runtime/compiler/gleam_build.vim b/runtime/compiler/gleam_build.vim new file mode 100644 index 0000000000..c2b1679b3c --- /dev/null +++ b/runtime/compiler/gleam_build.vim @@ -0,0 +1,25 @@ +" Vim compiler file +" Language: Gleam +" Maintainer: Kirill Morozov +" Based On: https://github.com/gleam-lang/gleam.vim +" Last Change: 2025 Apr 21 + +if exists('current_compiler') + finish +endif +let current_compiler = "gleam_build" + +CompilerSet makeprg=gleam\ build + +" Example error message: +" +" error: Unknown variable +" ┌─ /home/michael/root/projects/tutorials/gleam/try/code/src/main.gleam:19:18 +" │ +" 19 │ Ok(tuple(name, spot)) +" │ ^^^^ did you mean `sport`? +" +" The name `spot` is not in scope here. +CompilerSet errorformat=%Eerror:\ %m,%Wwarning:\ %m,%C\ %#┌─%#\ %f:%l:%c\ %#-%# + +" vim: sw=2 sts=2 et diff --git a/runtime/compiler/hare.vim b/runtime/compiler/hare.vim index 33edb3a281..88f36a9e20 100644 --- a/runtime/compiler/hare.vim +++ b/runtime/compiler/hare.vim @@ -1,29 +1,35 @@ -" Vim compiler file. -" Compiler: Hare -" Maintainer: Amelia Clarke -" Last Change: 2024-05-23 -" Upstream: https://git.sr.ht/~sircmpwn/hare.vim +vim9script -if exists('current_compiler') +# Vim compiler file. +# Compiler: Hare +# Maintainer: Amelia Clarke +# Last Change: 2025 Sep 06 +# Upstream: https://git.sr.ht/~sircmpwn/hare.vim + +if exists('g:current_compiler') finish endif -let current_compiler = 'hare' - -let s:cpo_save = &cpo -set cpo&vim if filereadable('Makefile') || filereadable('makefile') CompilerSet makeprg=make else - CompilerSet makeprg=hare\ build + const makeprg = 'hare build ' + .. get(b:, 'hare_makeprg_params', get(g:, 'hare_makeprg_params', '-q')) + execute 'CompilerSet makeprg=' .. escape(makeprg, ' "\|') endif CompilerSet errorformat= - \%f:%l:%c:\ syntax\ error:\ %m, - \%f:%l:%c:\ error:\ %m, + \%o:%l:%v:\ syntax\ error:\ %m, + \%o:%l:%v:\ error:\ %m, + \Error:\ %m, \%-G%.%# -let &cpo = s:cpo_save -unlet s:cpo_save +augroup HareQuickFix + autocmd! + autocmd QuickFixCmdPost make hare#QuickFixPaths() + autocmd QuickFixCmdPost lmake hare#QuickFixPaths() +augroup END + +g:current_compiler = 'hare' -" vim: et sts=2 sw=2 ts=8 +# vim: et sts=2 sw=2 ts=8 tw=80 diff --git a/runtime/compiler/javac.vim b/runtime/compiler/javac.vim index 53cd772ed8..d4f24cd210 100644 --- a/runtime/compiler/javac.vim +++ b/runtime/compiler/javac.vim @@ -2,6 +2,7 @@ " Compiler: Java Development Kit Compiler " Maintainer: Doug Kearns " Last Change: 2024 Nov 19 (enable local javac_makeprg_params) +" 2025 Mar 11 (add comment for Dispatch) if exists("current_compiler") finish @@ -11,6 +12,7 @@ let current_compiler = "javac" let s:cpo_save = &cpo set cpo&vim +" CompilerSet makeprg=javac execute $'CompilerSet makeprg=javac\ {escape(get(b:, 'javac_makeprg_params', get(g:, 'javac_makeprg_params', '')), ' \|"')}' CompilerSet errorformat=%E%f:%l:\ error:\ %m, diff --git a/runtime/compiler/pandoc.vim b/runtime/compiler/pandoc.vim index 5d90a518c9..40d2d02633 100644 --- a/runtime/compiler/pandoc.vim +++ b/runtime/compiler/pandoc.vim @@ -2,6 +2,7 @@ " Compiler: Pandoc " Maintainer: Konfekt " Last Change: 2024 Nov 19 +" 2025 May 15 Update the title regex for CompilerSet #17321 " " Expects output file extension, say `:make html` or `:make pdf`. " Passes additional arguments to pandoc, say `:make html --self-contained`. @@ -51,7 +52,7 @@ endfunction execute 'CompilerSet makeprg=pandoc'..escape( \ ' --standalone'.. - \ (s:PandocFiletype(&filetype) ==# 'markdown' && (getline(1) =~# '^%\s\+\S\+' || (search('^title:\s+\S+', 'cnw') > 0)) ? + \ (s:PandocFiletype(&filetype) ==# 'markdown' && (getline(1) =~# '^%\s\+\S\+' || (search('^title:\s\+\S\+', 'cnw') > 0)) ? \ '' : ' --metadata title=%:t:r:S').. \ ' '..s:PandocLang().. \ ' --from='..s:PandocFiletype(&filetype).. diff --git a/runtime/compiler/phpstan.vim b/runtime/compiler/phpstan.vim new file mode 100644 index 0000000000..7d1592be8f --- /dev/null +++ b/runtime/compiler/phpstan.vim @@ -0,0 +1,12 @@ +" Vim compiler file +" Compiler: PHPStan +" Maintainer: Dietrich Moerman +" Last Change: 2025 Jul 17 + +if exists("current_compiler") + finish +endif +let current_compiler = "phpstan" + +CompilerSet makeprg=composer\ exec\ --\ phpstan\ analyse\ -v\ --no-progress\ --error-format=raw +CompilerSet errorformat=%f:%l:%m,%-G%.%# diff --git a/runtime/compiler/powershell.vim b/runtime/compiler/powershell.vim index 3d37d7c847..d5dd692096 100644 --- a/runtime/compiler/powershell.vim +++ b/runtime/compiler/powershell.vim @@ -6,6 +6,7 @@ " 2024 Apr 03 by the Vim Project (removed :CompilerSet definition) " 2024 Apr 05 by the Vim Project (avoid leaving behind g:makeprg) " 2024 Nov 19 by the Vim Project (properly escape makeprg setting) +" 2025 Mar 11 by the Vim Project (add comment for Dispatch) if exists("current_compiler") finish @@ -50,6 +51,8 @@ let s:makeprg = g:ps1_makeprg_cmd .. ' %:p:S' " + CategoryInfo : ObjectNotFound: (Write-Ouput:String) [], CommandNotFoundException " + FullyQualifiedErrorId : CommandNotFoundException +" CompilerSet makeprg=pwsh +" CompilerSet makeprg=powershell execute 'CompilerSet makeprg=' .. escape(s:makeprg, ' \|"') " Showing error in context with underlining. diff --git a/runtime/compiler/svelte-check.vim b/runtime/compiler/svelte-check.vim new file mode 100644 index 0000000000..bfffe28108 --- /dev/null +++ b/runtime/compiler/svelte-check.vim @@ -0,0 +1,21 @@ +" Vim compiler file +" Compiler: svelte-check +" Maintainer: @Konfekt +" Last Change: 2025 Feb 27 + +if exists("current_compiler") | finish | endif +let current_compiler = "svelte-check" + +CompilerSet makeprg=npx\ svelte-check\ --output\ machine +CompilerSet errorformat=%*\\d\ %t%*\\a\ \"%f\"\ %l:%c\ \"%m\", +CompilerSet errorformat+=%-G%*\\d\ START\ %.%#, +CompilerSet errorformat+=%-G%*\\d\ COMPLETED\ %.%#, +CompilerSet errorformat+=%-G%.%# + +" " Fall-back for versions of svelte-check that don't support --output machine +" " before May 2020 https://github.com/sveltejs/language-tools/commit/9f7a90379d287a41621a5e78af5b010a8ab810c3 +" " which is before the first production release 1.1.31 of Svelte-Check +" CompilerSet makeprg=npx\ svelte-check +" CompilerSet errorformat=%A%f:%l:%c, +" CompilerSet errorformat+=%C%t%*\\a\\:\ %m, +" CompilerSet errorformat+=%-G%.%#, diff --git a/runtime/compiler/tex.vim b/runtime/compiler/tex.vim index bc1623729a..529f7f7710 100644 --- a/runtime/compiler/tex.vim +++ b/runtime/compiler/tex.vim @@ -6,6 +6,7 @@ " 2024 Apr 03 by the Vim Project (removed :CompilerSet definition) " 2024 Apr 05 by the Vim Project (avoid leaving behind g:makeprg) " 2024 Nov 19 by the Vim Project (properly escape makeprg setting) +" 2025 Mar 11 by the Vim Project (add comment for Dispatch) if exists("current_compiler") finish @@ -28,6 +29,7 @@ if exists('b:tex_ignore_makefile') || exists('g:tex_ignore_makefile') || let current_compiler = "latex" endif let s:makeprg=current_compiler .. ' -interaction=nonstopmode' + " CompilerSet makeprg=latex execute 'CompilerSet makeprg=' .. escape(s:makeprg, ' \|"') else let current_compiler = 'make' diff --git a/runtime/compiler/tsc.vim b/runtime/compiler/tsc.vim index 76f525baa6..9922cd7dfa 100644 --- a/runtime/compiler/tsc.vim +++ b/runtime/compiler/tsc.vim @@ -2,6 +2,7 @@ " Compiler: TypeScript Compiler " Maintainer: Doug Kearns " Last Change: 2024 Apr 03 +" 2025 Mar 11 by The Vim Project (add comment for Dispatch, add tsc_makeprg variable) if exists("current_compiler") finish @@ -11,9 +12,9 @@ let current_compiler = "tsc" let s:cpo_save = &cpo set cpo&vim +" CompilerSet makeprg=tsc " CompilerSet makeprg=npx\ tsc - -CompilerSet makeprg=tsc +execute $'CompilerSet makeprg={escape(get(b:, 'tsc_makeprg', get(g:, 'tsc_makeprg', 'tsc')), ' \|"')}' CompilerSet errorformat=%f\ %#(%l\\,%c):\ %trror\ TS%n:\ %m, \%trror\ TS%n:\ %m, \%-G%.%# diff --git a/runtime/compiler/typst.vim b/runtime/compiler/typst.vim index 13699f4675..f127401725 100644 --- a/runtime/compiler/typst.vim +++ b/runtime/compiler/typst.vim @@ -1,9 +1,9 @@ " Vim compiler file " Language: Typst -" Previous Maintainer: Gregory Anders -" Maintainer: Luca Saccarola -" Last Change: 2024 Dec 09 -" Based on: https://github.com/kaarmu/typst.vim +" Previous Maintainer: Luca Saccarola +" Maintainer: This runtime file is looking for a new maintainer. +" Based On: https://github.com/kaarmu/typst.vim +" Last Change: 2025 Aug 05 if exists('current_compiler') finish @@ -13,4 +13,5 @@ let current_compiler = get(g:, 'typst_cmd', 'typst') " With `--diagnostic-format` we can use the default errorformat let s:makeprg = [current_compiler, 'compile', '--diagnostic-format', 'short', '%:S'] +" CompilerSet makeprg=typst execute 'CompilerSet makeprg=' . join(s:makeprg, '\ ') diff --git a/runtime/defaults.vim b/runtime/defaults.vim index 38b03da11d..5c7100edc2 100644 --- a/runtime/defaults.vim +++ b/runtime/defaults.vim @@ -1,7 +1,7 @@ " The default vimrc file. " " Maintainer: The Vim Project -" Last Change: 2024 Dec 01 +" Last Change: 2025 Sep 10 " Former Maintainer: Bram Moolenaar " " This is loaded if no vimrc file was found. @@ -33,9 +33,6 @@ silent! while 0 set nocompatible silent! endwhile -set ruler " show the cursor position all the time -set showcmd " display incomplete commands - set ttimeout " time out for key codes set ttimeoutlen=100 " wait up to 100ms after Esc for special key @@ -107,6 +104,7 @@ if 1 \ let line = line("'\"") \ | if line >= 1 && line <= line("$") && &filetype !~# 'commit' \ && index(['xxd', 'gitrebase', 'tutor'], &filetype) == -1 + \ && !&diff \ | execute "normal! g`\"" \ | endif diff --git a/runtime/doc/Make_all.mak b/runtime/doc/Make_all.mak index 8f86099fb3..b146ead5e9 100644 --- a/runtime/doc/Make_all.mak +++ b/runtime/doc/Make_all.mak @@ -154,6 +154,7 @@ DOCS = \ vim9class.txt \ visual.txt \ vietnamese.txt \ + wayland.txt \ windows.txt \ workshop.txt @@ -311,6 +312,7 @@ HTMLS = \ vim9.html \ vim9class.html \ visual.html \ + wayland.html \ windows.html \ workshop.html diff --git a/runtime/doc/Make_mvc.mak b/runtime/doc/Make_mvc.mak index 064aa3ebf3..8dc09a35fa 100644 --- a/runtime/doc/Make_mvc.mak +++ b/runtime/doc/Make_mvc.mak @@ -1,16 +1,20 @@ # # Makefile for the Vim documentation on Windows # -# 20.03.24, Restorer, +# 2024-03-20, Restorer, +# + +# included common tools +!INCLUDE ..\..\src\auto\nmake\tools.mak # Common components -!INCLUDE Make_all.mak +!INCLUDE .\Make_all.mak # TODO: to think about what to use instead of awk. PowerShell? #AWK = -# Correct the following line for the where executable file vim is installed. +# Correct the following line for the where executable file Vim is installed. # Please do not put the path in quotes. VIMPROG = ..\..\src\vim.exe @@ -18,16 +22,6 @@ VIMPROG = ..\..\src\vim.exe # Please do not put the path in quotes. ICONV_PATH = D:\Programs\GetText\bin -# In case some package like GnuWin32, UnixUtils -# or something similar is installed on the system. -# If the "touch" program is installed on the system, but it is not registered -# in the %PATH% environment variable, then specify the full path to this file. -!IF EXIST ("touch.exe") -TOUCH = touch.exe %1 -!ELSE -TOUCH = if exist %1 ( copy /b %1+,, ) else ( type nul >%1 ) -!ENDIF - # In case some package like GnuWin32, UnixUtils, gettext # or something similar is installed on the system. # If the "iconv" program is installed on the system, but it is not registered @@ -38,11 +32,6 @@ ICONV = iconv.exe ICONV = "$(ICONV_PATH)\iconv.exe" !ENDIF -RM = del /q -PS = PowerShell.exe - -PSFLAGS = -NoLogo -NoProfile -Command - .SUFFIXES : .SUFFIXES : .c .o .txt .html @@ -53,7 +42,8 @@ all : tags perlhtml $(CONVERTED) tags : doctags $(DOCS) doctags.exe $(DOCS) | sort /L C /O tags $(PS) $(PSFLAGS) \ - (Get-Content -Raw tags ^| Get-Unique ^| %%{$$_ -replace \"`r\", \"\"}) \ + (Get-Content -Raw tags ^| Get-Unique ^| %%{$$_ \ + -replace \"`r\", \"\"}) \ ^| New-Item -Path . -Name tags -ItemType file -Force doctags : doctags.c @@ -63,7 +53,7 @@ doctags : doctags.c # Use Vim to generate the tags file. Can only be used when Vim has been # compiled and installed. Supports multiple languages. vimtags : $(DOCS) - @"$(VIMPROG)" --clean -esX -V1 -u doctags.vim + @ "$(VIMPROG)" --clean -esX -V1 -u doctags.vim # TODO: #html: noerrors tags $(HTMLS) @@ -104,99 +94,96 @@ clean : arabic.txt : - <nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimdiff-da.UTF-8.1 : vimdiff-da.1 @@ -214,8 +202,9 @@ vimdiff-da.UTF-8.1 : vimdiff-da.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimtutor-da.UTF-8.1 : vimtutor-da.1 @@ -224,8 +213,9 @@ vimtutor-da.UTF-8.1 : vimtutor-da.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vim-de.UTF-8.1 : vim-de.1 @@ -234,8 +224,9 @@ vim-de.UTF-8.1 : vim-de.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF evim-fr.UTF-8.1 : evim-fr.1 @@ -244,8 +235,9 @@ evim-fr.UTF-8.1 : evim-fr.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vim-fr.UTF-8.1 : vim-fr.1 @@ -254,8 +246,9 @@ vim-fr.UTF-8.1 : vim-fr.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimdiff-fr.UTF-8.1 : vimdiff-fr.1 @@ -264,8 +257,9 @@ vimdiff-fr.UTF-8.1 : vimdiff-fr.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimtutor-fr.UTF-8.1 : vimtutor-fr.1 @@ -274,8 +268,9 @@ vimtutor-fr.UTF-8.1 : vimtutor-fr.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF xxd-fr.UTF-8.1 : xxd-fr.1 @@ -284,8 +279,9 @@ xxd-fr.UTF-8.1 : xxd-fr.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF evim-it.UTF-8.1 : evim-it.1 @@ -294,8 +290,9 @@ evim-it.UTF-8.1 : evim-it.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vim-it.UTF-8.1 : vim-it.1 @@ -304,8 +301,9 @@ vim-it.UTF-8.1 : vim-it.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimdiff-it.UTF-8.1 : vimdiff-it.1 @@ -314,8 +312,9 @@ vimdiff-it.UTF-8.1 : vimdiff-it.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimtutor-it.UTF-8.1 : vimtutor-it.1 @@ -324,8 +323,9 @@ vimtutor-it.UTF-8.1 : vimtutor-it.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF xxd-it.UTF-8.1 : xxd-it.1 @@ -334,8 +334,9 @@ xxd-it.UTF-8.1 : xxd-it.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28591)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28591)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF evim-pl.UTF-8.1 : evim-pl.1 @@ -344,8 +345,9 @@ evim-pl.UTF-8.1 : evim-pl.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28592)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vim-pl.UTF-8.1 : vim-pl.1 @@ -354,8 +356,9 @@ vim-pl.UTF-8.1 : vim-pl.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28592)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimdiff-pl.UTF-8.1 : vimdiff-pl.1 @@ -364,8 +367,9 @@ vimdiff-pl.UTF-8.1 : vimdiff-pl.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28592)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimtutor-pl.UTF-8.1 : vimtutor-pl.1 @@ -374,8 +378,9 @@ vimtutor-pl.UTF-8.1 : vimtutor-pl.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28592)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF xxd-pl.UTF-8.1 : xxd-pl.1 @@ -384,8 +389,9 @@ xxd-pl.UTF-8.1 : xxd-pl.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28592)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28592)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF evim-ru.UTF-8.1 : evim-ru.1 @@ -394,8 +400,9 @@ evim-ru.UTF-8.1 : evim-ru.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(20866)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vim-ru.UTF-8.1 : vim-ru.1 @@ -404,8 +411,9 @@ vim-ru.UTF-8.1 : vim-ru.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(20866)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimdiff-ru.UTF-8.1 : vimdiff-ru.1 @@ -414,8 +422,9 @@ vimdiff-ru.UTF-8.1 : vimdiff-ru.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(20866)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimtutor-ru.UTF-8.1 : vimtutor-ru.1 @@ -424,8 +433,9 @@ vimtutor-ru.UTF-8.1 : vimtutor-ru.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(20866)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF xxd-ru.UTF-8.1 : xxd-ru.1 @@ -434,8 +444,9 @@ xxd-ru.UTF-8.1 : xxd-ru.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(20866)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(20866)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF evim-tr.UTF-8.1 : evim-tr.1 @@ -444,8 +455,9 @@ evim-tr.UTF-8.1 : evim-tr.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28599)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vim-tr.UTF-8.1 : vim-tr.1 @@ -454,8 +466,9 @@ vim-tr.UTF-8.1 : vim-tr.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28599)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimdiff-tr.UTF-8.1 : vimdiff-tr.1 @@ -464,8 +477,9 @@ vimdiff-tr.UTF-8.1 : vimdiff-tr.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28599)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF vimtutor-tr.UTF-8.1 : vimtutor-tr.1 @@ -474,8 +488,9 @@ vimtutor-tr.UTF-8.1 : vimtutor-tr.1 !ELSE # Conversion to UTF-8 encoding without BOM and with UNIX-like line ending $(PS) $(PSFLAGS) \ - [IO.File]::ReadAllText(\"$?\", [Text.Encoding]::GetEncoding(28599)) ^| \ - 1>nul New-Item -Force -Path . -ItemType file -Name $@ + [IO.File]::ReadAllText(\"$?\", \ + [Text.Encoding]::GetEncoding(28599)) ^| \ + 1>nul New-Item -Path . -Name $@ -ItemType file -Force !ENDIF -# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0 ft=make: +# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=79 ft=make: diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 82b5680812..01b2c3e83f 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -141,6 +141,11 @@ os_risc.txt: os_win32.txt: touch $@ +pi_netrw.txt: ../pack/dist/opt/netrw/doc/netrw.txt + cp ../pack/dist/opt/netrw/doc/netrw.txt $@.tmp + sed -e '1s/$$/ *pi_netrw.txt*/' $@.tmp > $@ && \ + rm -f $@.tmp + vietnamese.txt: touch $@ diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index dde27c4d92..f96309688b 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 9.1. Last change: 2025 Feb 08 +*autocmd.txt* For Vim version 9.1. Last change: 2025 Sep 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -130,6 +130,10 @@ exception is that "" is expanded when the autocmd is defined. Example: :au BufNewFile,BufRead *.html so :h/html.vim Here Vim expands to the name of the file containing this line. +However, works differently in a function, in which case it's better to +use `:execute` with +

An H2 header

+



+
+ +

Paragraph #1. +

+ +

Paragraph #2. + +

+ + +

Paragraph #1. +

    +
  • Item a.
  • Item b.
  • +
  • Item c. +
+

Paragraph #2. +

+
+ +
+
A quick brown fox jumps over the lazy dog +
Woof! +
+
A quick brown fox jumps over the lazy dog +
Woof! +
+
+ +
Thread #1 +
Thread #2 +
+
+ +

+ + +

+ + + ++ + +
Some Caption
Header #1Header #2Header #3 +
Column #1Column #2Column #3 +
Column #1Column #2Column #3 +
Column #1Column #2Column #3 +
Column #1Column #2Column #3 +
+ +
+
	
+<div class="block">
+<blockquote><pre><code>
+</code></pre></blockquote></div>
+
+ +

Paragraph #3.

Paragraph #4.

Paragraph #5. + +

Paragraph #6.

Paragraph #7.

Paragraph #8.

Paragraph #9.

+ +

Paragraph #10. +

+ +

Paragraph #11.

Paragraph #12.

Paragraph #13.

Paragraph #14.

+ +

Paragraph #15. +

Paragraph #16. + + diff --git a/runtime/syntax/testdir/input/html_fold_syntax.html b/runtime/syntax/testdir/input/html_fold_syntax.html new file mode 100644 index 0000000000..73579aa9a9 --- /dev/null +++ b/runtime/syntax/testdir/input/html_fold_syntax.html @@ -0,0 +1,105 @@ + + + + + +A folding syntax test + + + +



+

An H2 header

+



+
+ +

Paragraph #1. +

+ +

Paragraph #2.

+ +
+ + +

Paragraph #1.

+
    +
  • Item a.
  • Item b.
  • +
  • Item c.
  • +
+

Paragraph #2. +

+
+ +
+
A quick brown fox jumps over the lazy dog
+
Woof! +
+
A quick brown fox jumps over the lazy dog
+
Woof!
+
+
+ +
Thread #1 +
Thread #2 +
+
+ +

+ + +

+ + + + + + + + + + + +
Some Caption
Header #1Header #2Header #3
Column #1Column #2Column #3
Column #1Column #2Column #3
Column #1Column #2Column #3
Column #1Column #2Column #3
+ +
+
	
+<div class="block">
+<blockquote><pre><code>
+</code></pre></blockquote></div>
+
+ +

Paragraph #3.

Paragraph #4.

Paragraph #5.

+ +

Paragraph #6.

Paragraph #7.

Paragraph #8.

Paragraph #9.

+ +

Paragraph #10. +

+ +

Paragraph #11.

Paragraph #12.

Paragraph #13.

Paragraph #14.

+ +

Paragraph #15. +

Paragraph #16. + + diff --git a/runtime/syntax/testdir/input/java_comments_html.java b/runtime/syntax/testdir/input/java_comments_html.java index eeffef5b79..74e0e1515f 100644 --- a/runtime/syntax/testdir/input/java_comments_html.java +++ b/runtime/syntax/testdir/input/java_comments_html.java @@ -1,9 +1,9 @@ // VIM_TEST_SETUP unlet! g:java_no_tab_space_error g:java_ignore_javadoc // VIM_TEST_SETUP unlet! g:java_no_trail_space_error -// VIM_TEST_SETUP let [g:java_space_errors,g:java_comment_strings]=[1,1] -// VIM_TEST_SETUP let g:java_ignore_markdown = 1 - - +// VIM_TEST_SETUP unlet! g:java_consent_to_html_syntax_folding +// VIM_TEST_SETUP let[g:java_space_errors,g:java_comment_strings]=[1,1] +// VIM_TEST_SETUP let[g:java_ignore_markdown,g:html_syntax_folding]=[1,1] +// VIM_TEST_SETUP let g:markdown_fenced_languages = ["java"] diff --git a/runtime/syntax/testdir/input/java_comments_markdown.java b/runtime/syntax/testdir/input/java_comments_markdown.java index fa369719d8..c6be7312b0 100644 --- a/runtime/syntax/testdir/input/java_comments_markdown.java +++ b/runtime/syntax/testdir/input/java_comments_markdown.java @@ -2,9 +2,9 @@ // VIM_TEST_SETUP unlet! g:java_no_trail_space_error // VIM_TEST_SETUP let[g:java_space_errors,g:java_comment_strings]=[1,1] // VIM_TEST_SETUP let[g:java_ignore_html,g:markdown_syntax_conceal]=[1,1] - - - +// VIM_TEST_SETUP let g:html_syntax_folding = 1 +// VIM_TEST_SETUP let g:java_consent_to_html_syntax_folding = 1 +// VIM_TEST_SETUP let g:markdown_fenced_languages = ["java"] // VIM_TEST_SETUP defer execute('match Visual /\%>21l\s\+$/') diff --git a/runtime/syntax/testdir/input/java_contextual_keywords.java b/runtime/syntax/testdir/input/java_contextual_keywords.java index 3fb9576d26..c38854d31f 100644 --- a/runtime/syntax/testdir/input/java_contextual_keywords.java +++ b/runtime/syntax/testdir/input/java_contextual_keywords.java @@ -1,4 +1,4 @@ -// VIM_TEST_SETUP :highlight link javaConceptKind NonText +// VIM_TEST_SETUP highlight link javaConceptKind NonText diff --git a/runtime/syntax/testdir/input/java_enfoldment.java b/runtime/syntax/testdir/input/java_enfoldment.java index 4bfa5d65c0..ecf763905f 100644 --- a/runtime/syntax/testdir/input/java_enfoldment.java +++ b/runtime/syntax/testdir/input/java_enfoldment.java @@ -1,9 +1,29 @@ -// VIM_TEST_SETUP setlocal foldenable foldcolumn=2 foldmethod=syntax +// VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax // VIM_TEST_SETUP let g:java_foldtext_show_first_or_second_line = 1 +// VIM_TEST_SETUP let g:java_highlight_java_lang = 1 +// VIM_TEST_SETUP let g:java_ignore_folding = "x" +// VIM_TEST_SETUP let g:java_lookbehind_byte_counts = {'javaBlock': -1} + + + + + // VIM_TEST_SETUP highlight link javaBlockOtherStart Structure // VIM_TEST_SETUP highlight link javaBlockStart Todo + +/***/ import java.lang.Comparable; /* +import java.lang.Object; +import java.lang.String; +*/ +import java.lang.String; + +import java.lang.Comparable; /***/ +import java.lang.Object; // // +import java.lang.String; /***/ + +import java.util.function.Function; @SuppressWarnings({ """ bespoke @@ -24,11 +44,14 @@ """ }) class FoldingTests { - interface Foldenable + interface Foldable { } static { + String import⁠$ = """ +import java.lang.String; +"""; new Object() { { { @@ -58,12 +81,12 @@ interface Foldenable } } /*\\\*/ { - (new java.util.function.Function() { + (new Function() { /** * {@inheritDoc} */ public Object apply(Object o) { return o; }; }).apply( - (new java.util.function.Function() { + (new Function() { /** {@inheritDoc} */ public Object apply(Object o) { return o; }; @@ -118,5 +141,5 @@ void noOp8() { // { // } -/* 122|..........................................................................................*/ interface Foldenable { +/* 120|..........................................................................................*/ interface Foldable { } diff --git a/runtime/syntax/testdir/input/java_generics.java b/runtime/syntax/testdir/input/java_generics.java index c9b001a406..35f978e0ae 100644 --- a/runtime/syntax/testdir/input/java_generics.java +++ b/runtime/syntax/testdir/input/java_generics.java @@ -1,7 +1,12 @@ // VIM_TEST_SETUP let g:java_highlight_functions = 'style' // VIM_TEST_SETUP let g:java_highlight_generics = 1 +// VIM_TEST_SETUP let g:java_highlight_java_lang = 1 + + // VIM_TEST_SETUP hi link javaGenericsC1 Todo // VIM_TEST_SETUP hi link javaGenericsC2 Error +// VIM_TEST_SETUP hi link javaWildcardBound Error + import java.math.BigInteger; import java.util.function.Consumer; @@ -109,6 +114,23 @@ static long toDecimal(Num x) }, x.radix()); } + static Class eitherComparableOrIterable(Object o) + { + final boolean comparable; + return ((comparable = o instanceof Comparable) ^ + o instanceof Iterable) + ? (comparable) + ? Comparable.class + : Iterable.class + : java.lang.Class.class; + } + + , + B, U extends java.util.function.Supplier> U convert(T o) + { + throw new UnsupportedOperationException("TODO"); + } + @java.lang.annotation.Target( java.lang.annotation.ElementType.TYPE_USE) @interface Taggable diff --git a/runtime/syntax/testdir/input/java_generics_signature.java b/runtime/syntax/testdir/input/java_generics_signature.java index 505e70e06d..37617143a4 100644 --- a/runtime/syntax/testdir/input/java_generics_signature.java +++ b/runtime/syntax/testdir/input/java_generics_signature.java @@ -1,8 +1,13 @@ // VIM_TEST_SETUP let g:java_highlight_functions = 'style' // VIM_TEST_SETUP let g:java_highlight_signature = 1 // VIM_TEST_SETUP let g:java_highlight_generics = 1 +// VIM_TEST_SETUP let g:java_highlight_java_lang = 1 + // VIM_TEST_SETUP hi link javaGenericsC1 Todo // VIM_TEST_SETUP hi link javaGenericsC2 Error +// VIM_TEST_SETUP hi link javaWildcardBound Error + + import java.math.BigInteger; import java.util.function.Consumer; import java.util.function.Function; @@ -109,6 +114,23 @@ static long toDecimal(Num x) }, x.radix()); } + static Class eitherComparableOrIterable(Object o) + { + final boolean comparable; + return ((comparable = o instanceof Comparable) ^ + o instanceof Iterable) + ? (comparable) + ? Comparable.class + : Iterable.class + : java.lang.Class.class; + } + + , + B, U extends java.util.function.Supplier> U convert(T o) + { + throw new UnsupportedOperationException("TODO"); + } + @java.lang.annotation.Target( java.lang.annotation.ElementType.TYPE_USE) @interface Taggable diff --git a/runtime/syntax/testdir/input/java_method_references.java b/runtime/syntax/testdir/input/java_method_references.java index d9cdf42248..640ab1edb0 100644 --- a/runtime/syntax/testdir/input/java_method_references.java +++ b/runtime/syntax/testdir/input/java_method_references.java @@ -183,4 +183,10 @@ static Function stringer() return T::toString; /* "e" */ } } + + static { + ((Supplier>)((Supplier)()->new + C2().new C21(new + C1< Object >((C1)null)))::getClass).get(); + } } diff --git a/runtime/syntax/testdir/input/java_method_references_signature.java b/runtime/syntax/testdir/input/java_method_references_signature.java index a154b12c9a..61e4c0da3a 100644 --- a/runtime/syntax/testdir/input/java_method_references_signature.java +++ b/runtime/syntax/testdir/input/java_method_references_signature.java @@ -183,4 +183,10 @@ static Function stringer() return T::toString; /* "e" */ } } + + static { + ((Supplier>)((Supplier)()->new + C2().new C21(new + C1< Object >((C1)null)))::getClass).get(); + } } diff --git a/runtime/syntax/testdir/input/java_methods_indent2.java b/runtime/syntax/testdir/input/java_methods_indent2.java index 3754cc4d5e..1b2e8632f6 100644 --- a/runtime/syntax/testdir/input/java_methods_indent2.java +++ b/runtime/syntax/testdir/input/java_methods_indent2.java @@ -1,6 +1,6 @@ // VIM_TEST_SETUP let g:java_highlight_functions = 'indent2' +// VIM_TEST_SETUP let g:java_highlight_generics = 1 // VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8 - import java.lang.annotation.ElementType; import java.lang.annotation.Target; @@ -67,8 +67,8 @@ private > Indent2MethodsTests(T t) { } protected static final synchronized strictfp void ascii$99_() { ascii$98_(); } - @SuppressWarnings("strictfp") - protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( + @SuppressWarnings("strictfp") protected + static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( java.util.function.Function<β, Τʬ<α>[][]> ƒ) { return @@ -77,6 +77,14 @@ private > Indent2MethodsTests(T t) { } public static Class classLock() { return Indent2MethodsTests.class; } + public > java.util.List filter( + java.util.function.Predicate filter, + java.util.List cs) + { + return cs.stream().filter(filter) + .collect(java.util.stream.Collectors.toUnmodifiableList()); + } + @Override @SuppressWarnings("cast") public String toString() { return (String) "Indent2MethodsTests"; } } diff --git a/runtime/syntax/testdir/input/java_methods_indent2_signature.java b/runtime/syntax/testdir/input/java_methods_indent2_signature.java index 05e633bf25..8303e23542 100644 --- a/runtime/syntax/testdir/input/java_methods_indent2_signature.java +++ b/runtime/syntax/testdir/input/java_methods_indent2_signature.java @@ -67,8 +67,8 @@ interface Stylable<Α> protected static final synchronized strictfp void ascii$99_() { ascii$98_(); } - @SuppressWarnings("strictfp") - protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( + @SuppressWarnings("strictfp") protected + static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( java.util.function.Function<β, Τʬ<α>[][]> ƒ) { return diff --git a/runtime/syntax/testdir/input/java_methods_indent4.java b/runtime/syntax/testdir/input/java_methods_indent4.java index 8fc05c04be..cc3314976a 100644 --- a/runtime/syntax/testdir/input/java_methods_indent4.java +++ b/runtime/syntax/testdir/input/java_methods_indent4.java @@ -1,6 +1,6 @@ // VIM_TEST_SETUP let g:java_highlight_functions = 'indent4' +// VIM_TEST_SETUP let g:java_highlight_generics = 1 // VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8 - import java.lang.annotation.ElementType; import java.lang.annotation.Target; @@ -67,8 +67,8 @@ private > Indent4MethodsTests(T t) { } protected static final synchronized strictfp void ascii$99_() { ascii$98_(); } - @SuppressWarnings("strictfp") - protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( + @SuppressWarnings("strictfp") protected + static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( java.util.function.Function<β, Τʬ<α>[][]> ƒ) { return @@ -77,6 +77,14 @@ private > Indent4MethodsTests(T t) { } public static Class classLock() { return Indent4MethodsTests.class; } + public > java.util.List filter( + java.util.function.Predicate filter, + java.util.List cs) + { + return cs.stream().filter(filter) + .collect(java.util.stream.Collectors.toUnmodifiableList()); + } + @Override @SuppressWarnings("cast") public String toString() { return (String) "Indent4MethodsTests"; } } diff --git a/runtime/syntax/testdir/input/java_methods_indent4_signature.java b/runtime/syntax/testdir/input/java_methods_indent4_signature.java index f21d95d0c5..eace2683d7 100644 --- a/runtime/syntax/testdir/input/java_methods_indent4_signature.java +++ b/runtime/syntax/testdir/input/java_methods_indent4_signature.java @@ -67,8 +67,8 @@ interface Stylable<Α> protected static final synchronized strictfp void ascii$99_() { ascii$98_(); } - @SuppressWarnings("strictfp") - protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( + @SuppressWarnings("strictfp") protected + static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( java.util.function.Function<β, Τʬ<α>[][]> ƒ) { return diff --git a/runtime/syntax/testdir/input/java_methods_indent8.java b/runtime/syntax/testdir/input/java_methods_indent8.java index d27830c878..aadf9759e8 100644 --- a/runtime/syntax/testdir/input/java_methods_indent8.java +++ b/runtime/syntax/testdir/input/java_methods_indent8.java @@ -1,6 +1,6 @@ // VIM_TEST_SETUP let g:java_highlight_functions = 'indent8' +// VIM_TEST_SETUP let g:java_highlight_generics = 1 // VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8 - import java.lang.annotation.ElementType; import java.lang.annotation.Target; @@ -67,8 +67,8 @@ private > Indent8MethodsTests(T t) { } protected static final synchronized strictfp void ascii$99_() { ascii$98_(); } - @SuppressWarnings("strictfp") - protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( + @SuppressWarnings("strictfp") protected + static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( java.util.function.Function<β, Τʬ<α>[][]> ƒ) { return @@ -77,6 +77,14 @@ private > Indent8MethodsTests(T t) { } public static Class classLock() { return Indent8MethodsTests.class; } + public > java.util.List filter( + java.util.function.Predicate filter, + java.util.List cs) + { + return cs.stream().filter(filter) + .collect(java.util.stream.Collectors.toUnmodifiableList()); + } + @Override @SuppressWarnings("cast") public String toString() { return (String) "Indent8MethodsTests"; } } diff --git a/runtime/syntax/testdir/input/java_methods_indent8_signature.java b/runtime/syntax/testdir/input/java_methods_indent8_signature.java index 8d8219690b..677ce5a032 100644 --- a/runtime/syntax/testdir/input/java_methods_indent8_signature.java +++ b/runtime/syntax/testdir/input/java_methods_indent8_signature.java @@ -67,8 +67,8 @@ interface Stylable<Α> protected static final synchronized strictfp void ascii$99_() { ascii$98_(); } - @SuppressWarnings("strictfp") - protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( + @SuppressWarnings("strictfp") protected + static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( java.util.function.Function<β, Τʬ<α>[][]> ƒ) { return diff --git a/runtime/syntax/testdir/input/java_methods_style.java b/runtime/syntax/testdir/input/java_methods_style.java index e2e7d3877d..f9a6f5771d 100644 --- a/runtime/syntax/testdir/input/java_methods_style.java +++ b/runtime/syntax/testdir/input/java_methods_style.java @@ -1,6 +1,6 @@ // VIM_TEST_SETUP let g:java_highlight_functions = 'style' +// VIM_TEST_SETUP let g:java_highlight_generics = 1 // VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8 - import java.lang.annotation.ElementType; import java.lang.annotation.Target; @@ -67,8 +67,8 @@ private > StyleMethodsTests(T t) { } protected static final synchronized strictfp void ascii$99_() { ascii$98_(); } - @SuppressWarnings("strictfp") - protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( + @SuppressWarnings("strictfp") protected + static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( java.util.function.Function<β, Τʬ<α>[][]> ƒ) { return @@ -77,6 +77,14 @@ private > StyleMethodsTests(T t) { } public static Class classLock() { return StyleMethodsTests.class; } + public > java.util.List filter( + java.util.function.Predicate filter, + java.util.List cs) + { + return cs.stream().filter(filter) + .collect(java.util.stream.Collectors.toUnmodifiableList()); + } + @Override @SuppressWarnings("cast") public String toString() { return (String) "StyleMethodsTests"; } } diff --git a/runtime/syntax/testdir/input/java_methods_style_signature.java b/runtime/syntax/testdir/input/java_methods_style_signature.java index 8e3b4d64b3..28a2f8887c 100644 --- a/runtime/syntax/testdir/input/java_methods_style_signature.java +++ b/runtime/syntax/testdir/input/java_methods_style_signature.java @@ -67,8 +67,8 @@ interface Stylable<Α> protected static final synchronized strictfp void ascii$99_() { ascii$98_(); } - @SuppressWarnings("strictfp") - protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( + @SuppressWarnings("strictfp") protected + static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_( java.util.function.Function<β, Τʬ<α>[][]> ƒ) { return diff --git a/runtime/syntax/testdir/input/java_previews_455.java b/runtime/syntax/testdir/input/java_previews_455.java index b9c2070e1c..bdffa23f74 100644 --- a/runtime/syntax/testdir/input/java_previews_455.java +++ b/runtime/syntax/testdir/input/java_previews_455.java @@ -1,4 +1,4 @@ -// VIM_TEST_SETUP let g:java_syntax_previews = [455] +// VIM_TEST_SETUP let g:java_syntax_previews = [455, 488, 507] diff --git a/runtime/syntax/testdir/input/java_unfoldment.java b/runtime/syntax/testdir/input/java_unfoldment.java index 92dd949d77..fb3a96f8e0 100644 --- a/runtime/syntax/testdir/input/java_unfoldment.java +++ b/runtime/syntax/testdir/input/java_unfoldment.java @@ -1,9 +1,29 @@ -// VIM_TEST_SETUP setlocal nofoldenable +// VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax +// VIM_TEST_SETUP let g:java_highlight_java_lang = 1 +// VIM_TEST_SETUP let g:java_ignore_folding = "bcdi" +// VIM_TEST_SETUP let g:java_lookbehind_byte_counts = {'javaBlock': -1} // VIM_TEST_SETUP let g:java_mark_braces_in_parens_as_errors = 1 + + + + + // VIM_TEST_SETUP highlight link javaBlockOtherStart Structure // VIM_TEST_SETUP highlight link javaBlockStart Todo + +/***/ import java.lang.Comparable; /* +import java.lang.Object; +import java.lang.String; +*/ +import java.lang.String; + +import java.lang.Comparable; /***/ +import java.lang.Object; // // +import java.lang.String; /***/ + +import java.util.function.Function; @SuppressWarnings({ """ bespoke @@ -24,11 +44,14 @@ """ }) class UnfoldingTests { - interface Unfoldenable + interface Unfoldable { } static { + String import⁠$ = """ +import java.lang.String; +"""; new Object() { { { @@ -58,12 +81,12 @@ interface Unfoldenable } } /*\\\*/ { - (new java.util.function.Function() { + (new Function() { /** * {@inheritDoc} */ public Object apply(Object o) { return o; }; }).apply( - (new java.util.function.Function() { + (new Function() { /** {@inheritDoc} */ public Object apply(Object o) { return o; }; @@ -118,5 +141,5 @@ void noOp8() { // { // } -/* 122|........................................................................................*/ interface Unfoldenable { +/* 120|........................................................................................*/ interface Unfoldable { } diff --git a/runtime/syntax/testdir/input/python2_strings.py b/runtime/syntax/testdir/input/python2_strings.py new file mode 100644 index 0000000000..a5625b7d65 --- /dev/null +++ b/runtime/syntax/testdir/input/python2_strings.py @@ -0,0 +1,82 @@ +# String literals +# https://docs.python.org/2/reference/lexical_analysis.html#string-literals + +# Strings: Source encoding, no Unicode escape sequences +test = 'String with escapes \' and \" and \t' +test = "String with escapes \040 and \xFF" +test = 'String with literal \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = "String with escaped \\ backslash and ignored \ +newline" +test = '''String with quotes ' and " +and escapes \t and \040 and \xFF +and literal \u00A1 and \U00010605''' +test = """String with quotes ' and " +and escapes \t and \040 and \xFF +and literal \u00A1 and \U00010605""" + +# Raw strings +test = r'Raw string with literal \' and \" and \t' +test = R"Raw string with literal \040 and \xFF" +test = r'Raw string with literal \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = R"Raw string with literal \\ backslashes and literal \ +newline" +test = r'''Raw string with quotes ' and " +and literal \t and \040 and \xFF +and literal \u00A1 and \U00010605''' +test = R"""Raw string with quotes ' and " +and literal \t and \040 and \xFF +and literal \u00A1 and \U00010605""" + +# B-strings: Prefix is allowed but ignored (https://peps.python.org/pep-3112) +test = b'String with escapes \' and \" and \t' +test = B"String with escapes \040 and \xFF" +test = b'String with literal \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = B"String with escaped \\ backslash and ignored \ +newline" +test = b'''String with quotes ' and " +and escapes \t and \040 and \xFF +and literal \u00A1 and \U00010605''' +test = B"""String with quotes ' and " +and escapes \t and \040 and \xFF +and literal \u00A1 and \U00010605""" + +# Raw b-strings +test = br'Raw string with literal \' and \" and \t' +test = bR"Raw string with literal \040 and \xFF" +test = Br'Raw string with literal \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = BR"Raw string with literal \\ backslashes and literal \ +newline" +test = br'''Raw string with quotes ' and " +and literal \t and \040 and \xFF +and literal \u00A1 and \U00010605''' +test = BR"""Raw string with quotes ' and " +and literal \t and \040 and \xFF +and literal \u00A1 and \U00010605""" + +# Unicode strings +test = u'String with escapes \' and \" and \t' +test = U"String with escapes \040 and \xFF" +test = u'String with escapes \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = U"String with escaped \\ backslash and ignored \ +newline" +test = u'''String with quotes ' and " +and escapes \t and \040 and \xFF +and escapes \u00A1 and \U00010605''' +test = U"""String with quotes ' and " +and escapes \t and \040 and \xFF +and escapes \u00A1 and \U00010605""" + +# Raw Unicode strings: Only Unicode escape sequences +test = ur'Raw Unicode string with literal \' and \" and \t' +test = uR"Raw Unicode string with literal \040 and \xFF" +test = Ur'Raw Unicode string with escapes \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = UR"Raw Unicode string with literal \\ backslashes and literal \ +newline" +test = ur'''Raw Unicode string with quotes ' and " +and literal \t and \040 and \xFF +and escapes \u00A1 and \U00010605''' +test = UR"""Raw Unicode string with quotes ' and " +and literal \t and \040 and \xFF +and escapes \u00A1 and \U00010605""" + +# vim: syntax=python2 diff --git a/runtime/syntax/testdir/input/python_ellipsis.py b/runtime/syntax/testdir/input/python_ellipsis.py new file mode 100644 index 0000000000..ac8ecc3932 --- /dev/null +++ b/runtime/syntax/testdir/input/python_ellipsis.py @@ -0,0 +1,46 @@ +# Ellipsis Literal +# https://docs.python.org/3/library/constants.html#Ellipsis + +# Placeholders +... + ... +x = ... +y = ... # Comment +class C: ... +lambda: ... + +# Annotations +numbers: Tuple[int, ...] + +# Doctests +"""A doctest + +>>> class A: +... def __init__(self): +... ... +>>> class B: ... +>>> x = ... +>>> raise ValueError('multi\n line\ndetail') +Traceback (most recent call last): + ... +ValueError: multi + line +detail +>>> print(list(range(20))) # doctest: +ELLIPSIS +[0, 1, ..., 18, 19] +>>> exec(s) #doctest: +ELLIPSIS +-3.21716034272e-0...7 +""" + +class C: + """ + >>> class C: + ... def __init__(self): + ... ... + """ + +# Numpy +x[..., 0] + +# Issue #18263 (Python highlighting ellipsis, false positive) +a = ".." # comment diff --git a/runtime/syntax/testdir/input/python_strings_bytes.py b/runtime/syntax/testdir/input/python_strings_bytes.py new file mode 100644 index 0000000000..95e619e216 --- /dev/null +++ b/runtime/syntax/testdir/input/python_strings_bytes.py @@ -0,0 +1,208 @@ +# String and Bytes literals +# https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals + +# Strings +test = 'String with escapes \' and \" and \t' +test = "String with escapes \040 and \xFF" +test = 'String with escapes \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = "String with escaped \\ backslash and ignored \ +newline" +test = '''String with quotes ' and " +and escapes \t and \040 and \xFF +and escapes \u00A1 and \U00010605''' +test = """String with quotes ' and " +and escapes \t and \040 and \xFF +and escapes \u00A1 and \U00010605""" + +# Raw strings +test = r'Raw string with literal \' and \" and \t' +test = R"Raw string with literal \040 and \xFF" +test = r'Raw string with literal \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = R"Raw string with literal \\ backslashes and literal \ +newline" +test = r'''Raw string with quotes ' and " +and literal \t and \040 and \xFF +and literal \u00A1 and \U00010605''' +test = R"""Raw string with quotes ' and " +and literal \t and \040 and \xFF +and literal \u00A1 and \U00010605""" + +# Unicode literals: Prefix is allowed but ignored (https://peps.python.org/pep-0414) +test = u'String with escapes \' and \" and \t' +test = U"String with escapes \040 and \xFF" +test = u'String with escapes \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = U"String with escaped \\ backslash and ignored \ +newline" +test = u'''String with quotes ' and " +and escapes \t and \040 and \xFF +and escapes \u00A1 and \U00010605''' +test = U"""String with quotes ' and " +and escapes \t and \040 and \xFF +and escapes \u00A1 and \U00010605""" + +# Raw Unicode literals are not allowed +test = ur'Invalid string with \' and \" and \t' +test = uR"Invalid string with \040 and \xFF" +test = Ur'Invalid string with \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = UR"Invalid string with \\ backslashes and literal \ +newline" +test = ru'Invalid string with \' and \" and \t' +test = rU"Invalid string with \040 and \xFF" +test = Ru'Invalid string with \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = RU"Invalid string with \\ backslashes and literal \ +newline" +test = ur'''Invalid string with ' and " +and \t and \040 and \xFF +and \u00A1 and \U00010605''' +test = RU"""Invalid string with ' and " +and \t and \040 and \xFF +and \u00A1 and \U00010605""" + +# Formatted string literals (f-strings) +# https://docs.python.org/3/reference/lexical_analysis.html#f-strings +test = f'F-string with escapes \' and \" and \t and fields {foo} and {bar}' +test = F"F-string with escapes \040 and \xFF and fields {foo} and {bar}" +test = f'F-string with escapes \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK} and fields {foo} and {bar}' +test = F"F-string with literal {{field}} and fields {foo} and {bar}" +test = f'''F-string with quotes ' and " +and escapes \t and \040 and \xFF +and escapes \u00A1 and \U00010605 +and fields {1}, {2} and {1 + + + 2}''' +test = F"""F-string with quotes ' and " +and escapes \t and \040 and \xFF +and escapes \u00A1 and \U00010605 +and fields {1}, {2} and {1 + + + 2}""" + +# Raw formatted string literals +test = fr'Raw f-string with literal \' and \" and \t and fields {foo} and {bar}' +test = fR"Raw f-string with literal \040 and \xFF and fields {foo} and {bar}" +test = Fr'Raw f-string with literal \u00A1 and \U00010605 and fields \N{FIELD, NOT, ESCAPE} and {foo} and {bar}' +test = FR"Raw f-string with literal {{field}} and fields {foo} and {bar}" +test = rf'Raw f-string with literal \' and \" and \t and fields {foo} and {bar}' +test = rF"Raw f-string with literal \040 and \xFF and fields {foo} and {bar}" +test = Rf'Raw f-string with literal \u00A1 and \U00010605 and fields \N{FIELD, NOT, ESCAPE} and {foo} and {bar}' +test = RF"Raw f-string with literal {{field}} and fields {foo} and {bar}" +test = fr'''Raw f-string with quotes ' and " +and literal \t and \040 and \xFF +and literal \u00A1 and \U00010605 +and fields {1}, {2} and {1 + + + 2}''' +test = RF"""Raw f-string with quotes ' and " +and literal \t and \040 and \xFF +and literal \u00A1 and \U00010605 +and fields {1}, {2} and {1 + + + 2}""" + +# F-string replacement fields +test = f"String is { + "one plus " + "two plus " + "three"}" +test = f"Number is { + 1 + + 2 + + 3}" +test = f"Float is {1.23}" +test = f"abc{a # This is a comment } + + 1}" +test = f"def{a # So is this : + + 2}" +test = f"ghi{a # And this " + + 3}" +test = f"He said his name is {name!r}." +test = f"He said his name is {repr(name)}." +test = f"result: {value:{width}}" +test = f"result: {value:{width}.{precision}}" +test = f"result: {value:{ + width + }.{ + precision + }}" +test = f"result: {value:{width:d}.{precision!s}}" +test = f"result: {value:{options}{width}{grouping}{precision}{type}}" +test = f"{number:#0x}" +test = f"{number:+#0x}" +test = f"{number:<+#0x}" +test = f"{number: <+#0x}" +test = f"{number:<#0x}" +test = f"{number: <#0x}" +test = f"{string=}" +test = f"{string=!r}" +test = f"{string=:20}" +test = f"{string=!r:20}" +test = f"{ string = }" +test = f"{ string = !r}" +test = f"{ string = !r }" +test = f"{ string = :20}" +test = f"{ string = !r:20}" +test = f"{ string = !r :20}" +test = f"abc {a["x"]} def" +test = f"List contains:\n{"\n".join(a)}" +test = f"Today's date is {datetime.now()}" +test = f"Today's formatted date is {datetime.now():%Y-%m-%d %H:%M:%S}" +test = f"Date is {datetime.datetime(2010, 7, 4, 12, 15, 58)}" +test = f"Formatted date is {datetime.datetime(2010, 7, 4, 12, 15, 58):%Y-%m-%d %H:%M:%S}" +test = f"Lambda returns {(lambda x: x**2)}" +test = f"Zero padded lambda returns {(lambda x: x**2):09}" +test = f"Space padded lambda returns {(lambda x: x**2):{width}}" +test = f"List copy is {items[:]}" +test = f"List slice is {items[1:]}" +test = f"List slice is {items[:9]}" +test = f"List elements are {items[:2:]}" +test = f"Padded list copy is {items[:]:99}" +test = f"Left-aligned list slice is {items[1:]:<99}" +test = f"Right aligned list slice is {items[:9]:>99}" +test = f"Center-aligned list elements are {items[:2:]:^99}" +test = f"Expression is {x == 1}" +test = f"Expression is {x != 1}" +test = f"Expression is {(x := 1)}" +test = f"Debug expression is {x == 1=}" +test = f"Debug expression is {x != 1=}" +test = f"Debug expression is {(x := 1)=}" +test = f"List comprehension returns { [x**2 for x in range(10)] }" +test = f"List comprehension returns { [ + x**2 for x in range(10) + ] }" +test = f"Padded list comprehension returns { [x**2 for x in range(10)] :99}" +test = f"Dict comprehension returns { {x: x**2 for x in range(10)} }" +test = f"Dict comprehension returns { { + x: x**2 for x in range(10) + } }" +test = f"Padded dict comprehension returns { {x: x**2 for x in range(10)} :99}" + +# Bytes +test = b'Bytes with escapes \' and \" and \t' +test = B"Bytes with escapes \040 and \xFF" +test = b'Bytes with SyntaxWarning \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = B"Bytes with escaped \\ backslash and ignored \ +newline" +test = b'''Bytes with quotes ' and " +and escapes \t and \040 and \xFF +and SyntaxWarning \u00A1 and \U00010605''' +test = B"""Bytes with quotes ' and " +and escapes \t and \040 and \xFF +and SyntaxWarning \u00A1 and \U00010605""" + +# Raw bytes +test = br'Raw bytes with literal \' and \" and \t' +test = bR"Raw bytes with literal \040 and \xFF" +test = Br'Raw bytes with literal \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = BR"Raw bytes with literal \\ backslashes and literal \ +newline" +test = rb'Raw bytes with literal \' and \" and \t' +test = rB"Raw bytes with literal \040 and \xFF" +test = Rb'Raw bytes with literal \u00A1 and \U00010605 and \N{INVERTED EXCLAMATION MARK}' +test = RB"Raw bytes with literal \\ backslashes and literal \ +newline" +test = br'''Raw bytes with quotes ' and " +and literal \t and \040 and \xFF +and literal \u00A1 and \U00010605''' +test = RB"""Raw bytes with quotes ' and " +and literal \t and \040 and \xFF +and literal \u00A1 and \U00010605""" diff --git a/runtime/syntax/testdir/input/python_type.py b/runtime/syntax/testdir/input/python_type.py new file mode 100644 index 0000000000..513b97fbd8 --- /dev/null +++ b/runtime/syntax/testdir/input/python_type.py @@ -0,0 +1,8 @@ +# Builtin +type() + +# Statement +type Point = tuple[float, float] + +# Should not match +typename = '' diff --git a/runtime/syntax/testdir/input/setup/html_fold_expr.vim b/runtime/syntax/testdir/input/setup/html_fold_expr.vim new file mode 100644 index 0000000000..e8daae0e74 --- /dev/null +++ b/runtime/syntax/testdir/input/setup/html_fold_expr.vim @@ -0,0 +1,2 @@ +let g:html_expr_folding = 1 +filetype plugin on diff --git a/runtime/syntax/testdir/input/setup/java_module_info.vim b/runtime/syntax/testdir/input/setup/java_module_info.vim index b7b818f822..2711c1a9a0 100644 --- a/runtime/syntax/testdir/input/setup/java_module_info.vim +++ b/runtime/syntax/testdir/input/setup/java_module_info.vim @@ -28,5 +28,3 @@ autocmd_add([{ cmd: 'RestoreFilename()', once: true, }]) - -g:java_syntax_previews = [476] diff --git a/runtime/syntax/testdir/input/setup/vim9_block.vim b/runtime/syntax/testdir/input/setup/vim9_blocks.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim9_block.vim rename to runtime/syntax/testdir/input/setup/vim9_blocks.vim diff --git a/runtime/syntax/testdir/input/setup/vim9_comment.vim b/runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim9_comment.vim rename to runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim diff --git a/runtime/syntax/testdir/input/setup/vim9_expr.vim b/runtime/syntax/testdir/input/setup/vim9_comments.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim9_expr.vim rename to runtime/syntax/testdir/input/setup/vim9_comments.vim diff --git a/runtime/syntax/testdir/input/setup/vim9_ex_enum.vim b/runtime/syntax/testdir/input/setup/vim9_ex_enum.vim new file mode 100644 index 0000000000..ebd90ede92 --- /dev/null +++ b/runtime/syntax/testdir/input/setup/vim9_ex_enum.vim @@ -0,0 +1 @@ +hi link vimVar Identifier diff --git a/runtime/syntax/testdir/input/setup/vim9_ex_enum2.vim b/runtime/syntax/testdir/input/setup/vim9_ex_enum2.vim new file mode 100644 index 0000000000..ebd90ede92 --- /dev/null +++ b/runtime/syntax/testdir/input/setup/vim9_ex_enum2.vim @@ -0,0 +1 @@ +hi link vimVar Identifier diff --git a/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comment_errors.vim b/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comment_errors.vim index c039651170..9dee81d648 100644 --- a/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comment_errors.vim +++ b/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comment_errors.vim @@ -1,2 +1,2 @@ highlight link vimVar Identifier -highlight link vimFuncScope Special +highlight link vimFunctionScope Special diff --git a/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comments.vim b/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comments.vim index c039651170..9dee81d648 100644 --- a/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comments.vim +++ b/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comments.vim @@ -1,2 +1,2 @@ highlight link vimVar Identifier -highlight link vimFuncScope Special +highlight link vimFunctionScope Special diff --git a/runtime/syntax/testdir/input/setup/vim9_ex_import.vim b/runtime/syntax/testdir/input/setup/vim9_ex_import.vim new file mode 100644 index 0000000000..ebd90ede92 --- /dev/null +++ b/runtime/syntax/testdir/input/setup/vim9_ex_import.vim @@ -0,0 +1 @@ +hi link vimVar Identifier diff --git a/runtime/syntax/testdir/input/setup/vim9_ex_let_heredoc.vim b/runtime/syntax/testdir/input/setup/vim9_ex_let_heredoc.vim new file mode 100644 index 0000000000..3a0ec2dae5 --- /dev/null +++ b/runtime/syntax/testdir/input/setup/vim9_ex_let_heredoc.vim @@ -0,0 +1,2 @@ +highlight link vimVar Identifier + diff --git a/runtime/syntax/testdir/input/setup/vim9_lambda.vim b/runtime/syntax/testdir/input/setup/vim9_expressions.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim9_lambda.vim rename to runtime/syntax/testdir/input/setup/vim9_expressions.vim diff --git a/runtime/syntax/testdir/input/setup/vim_comment.vim b/runtime/syntax/testdir/input/setup/vim9_lambdas.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim_comment.vim rename to runtime/syntax/testdir/input/setup/vim9_lambdas.vim diff --git a/runtime/syntax/testdir/input/setup/vim_expr.vim b/runtime/syntax/testdir/input/setup/vim_comments.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim_expr.vim rename to runtime/syntax/testdir/input/setup/vim_comments.vim diff --git a/runtime/syntax/testdir/input/setup/vim_ex_def.vim b/runtime/syntax/testdir/input/setup/vim_ex_def.vim index c039651170..9dee81d648 100644 --- a/runtime/syntax/testdir/input/setup/vim_ex_def.vim +++ b/runtime/syntax/testdir/input/setup/vim_ex_def.vim @@ -1,2 +1,2 @@ highlight link vimVar Identifier -highlight link vimFuncScope Special +highlight link vimFunctionScope Special diff --git a/runtime/syntax/testdir/input/setup/vim_ex_def_fold.vim b/runtime/syntax/testdir/input/setup/vim_ex_def_fold.vim index c039651170..9dee81d648 100644 --- a/runtime/syntax/testdir/input/setup/vim_ex_def_fold.vim +++ b/runtime/syntax/testdir/input/setup/vim_ex_def_fold.vim @@ -1,2 +1,2 @@ highlight link vimVar Identifier -highlight link vimFuncScope Special +highlight link vimFunctionScope Special diff --git a/runtime/syntax/testdir/input/setup/vim_ex_function.vim b/runtime/syntax/testdir/input/setup/vim_ex_function.vim index c039651170..9dee81d648 100644 --- a/runtime/syntax/testdir/input/setup/vim_ex_function.vim +++ b/runtime/syntax/testdir/input/setup/vim_ex_function.vim @@ -1,2 +1,2 @@ highlight link vimVar Identifier -highlight link vimFuncScope Special +highlight link vimFunctionScope Special diff --git a/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comment_errors.vim b/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comment_errors.vim index c039651170..9dee81d648 100644 --- a/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comment_errors.vim +++ b/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comment_errors.vim @@ -1,2 +1,2 @@ highlight link vimVar Identifier -highlight link vimFuncScope Special +highlight link vimFunctionScope Special diff --git a/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comments.vim b/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comments.vim index c039651170..9dee81d648 100644 --- a/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comments.vim +++ b/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comments.vim @@ -1,2 +1,2 @@ highlight link vimVar Identifier -highlight link vimFuncScope Special +highlight link vimFunctionScope Special diff --git a/runtime/syntax/testdir/input/setup/vim_ex_function_fold.vim b/runtime/syntax/testdir/input/setup/vim_ex_function_fold.vim index c039651170..9dee81d648 100644 --- a/runtime/syntax/testdir/input/setup/vim_ex_function_fold.vim +++ b/runtime/syntax/testdir/input/setup/vim_ex_function_fold.vim @@ -1,2 +1,2 @@ highlight link vimVar Identifier -highlight link vimFuncScope Special +highlight link vimFunctionScope Special diff --git a/runtime/syntax/testdir/input/setup/vim_ex_import.vim b/runtime/syntax/testdir/input/setup/vim_ex_import.vim new file mode 100644 index 0000000000..ebd90ede92 --- /dev/null +++ b/runtime/syntax/testdir/input/setup/vim_ex_import.vim @@ -0,0 +1 @@ +hi link vimVar Identifier diff --git a/runtime/syntax/testdir/input/setup/vim_ex_redir.vim b/runtime/syntax/testdir/input/setup/vim_ex_redir.vim new file mode 100644 index 0000000000..6193cc4e58 --- /dev/null +++ b/runtime/syntax/testdir/input/setup/vim_ex_redir.vim @@ -0,0 +1,2 @@ +highlight link vimVar Identifier +highlight link vimRedirFile String diff --git a/runtime/syntax/testdir/input/setup/vim_ex_syntax.vim b/runtime/syntax/testdir/input/setup/vim_ex_syntax.vim index c039651170..9dee81d648 100644 --- a/runtime/syntax/testdir/input/setup/vim_ex_syntax.vim +++ b/runtime/syntax/testdir/input/setup/vim_ex_syntax.vim @@ -1,2 +1,2 @@ highlight link vimVar Identifier -highlight link vimFuncScope Special +highlight link vimFunctionScope Special diff --git a/runtime/syntax/testdir/input/setup/vim_lambda.vim b/runtime/syntax/testdir/input/setup/vim_expressions.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim_lambda.vim rename to runtime/syntax/testdir/input/setup/vim_expressions.vim diff --git a/runtime/syntax/testdir/input/setup/vim_object_methods.vim b/runtime/syntax/testdir/input/setup/vim_lambdas.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim_object_methods.vim rename to runtime/syntax/testdir/input/setup/vim_lambdas.vim diff --git a/runtime/syntax/testdir/input/sh_09.sh b/runtime/syntax/testdir/input/sh_09.sh index e736e06b64..ad22bfb400 100644 --- a/runtime/syntax/testdir/input/sh_09.sh +++ b/runtime/syntax/testdir/input/sh_09.sh @@ -16,4 +16,5 @@ ( cd ${HOME} ; $pwd ) | wc -c ( cd ${HOME} ) | wc -c ((n=1+2)) +# this is a syntax error, "let" is not a keyword in dash let n=1+2 diff --git a/runtime/syntax/testdir/input/sh_10.sh b/runtime/syntax/testdir/input/sh_10.sh deleted file mode 100644 index be463c3da0..0000000000 --- a/runtime/syntax/testdir/input/sh_10.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/ksh - -# This script is a test file for ksh93 shared-state -# command substitutions (subshares) and mksh value -# substitutions (valsubs). - -# ====== -# Below is subshare syntax supported by both ksh93 and mksh. -print ${ echo one } -print ${ echo two -} -print ${ -echo three } -print ${ echo 'four'; } -print ${ echo 'five' ;} -print ${ echo 'six' -} -print ${ echo 'seven' } -echo ${ print 'eight' } -typeset nine=${ pwd; } - -# ====== -# Value substitutions of the form ${|command} are only -# supported by mksh, not ksh93. -if ! command eval '((.sh.version >= 20070703))' 2>/dev/null; then - valsubfunc() { - REPLY=$1 - } - echo ${|valsubfunc ten} - print "${|valsubfunc eleven;}" - printf '%s' "${|valsubfunc twelve }" - unlucky=${|valsubfunc thirteen -} - typeset notafloat=${|valsubfunc notanumber } - print $unlucky $notanumber - ${|echo foo} - ${|echo bar -} -fi - -# ====== -# Shared-state command substitutions using the syntax ${ /tmp/strfile -echo ${= 20070703))' 2>/dev/null; then + valsubfunc() { + REPLY=$1 + } + echo ${|valsubfunc ten} + print "${|valsubfunc eleven;}" + printf '%s' "${|valsubfunc twelve }" + unlucky=${|valsubfunc thirteen +} + typeset notafloat=${|valsubfunc notanumber } + print $unlucky $notanumber + ${|echo foo} + ${|echo bar +} +fi + +# ====== +# Shared-state command substitutions using the syntax ${ /tmp/strfile +echo ${= 20070703))' 2>/dev/null; then + valsubfunc() { + REPLY=$1 + } + echo ${|valsubfunc ten} + print "${|valsubfunc eleven;}" + printf '%s' "${|valsubfunc twelve }" + unlucky=${|valsubfunc thirteen +} + typeset notafloat=${|valsubfunc notanumber } + print $unlucky $notanumber + ${|echo foo} + ${|echo bar +} +fi + +# ====== +# Shared-state command substitutions using the syntax ${ /tmp/strfile +echo ${= 20070703))' 2>/dev/null; then + valsubfunc() { + REPLY=$1 + } + echo ${|valsubfunc ten} + print "${|valsubfunc eleven;}" + printf '%s' "${|valsubfunc twelve }" + unlucky=${|valsubfunc thirteen +} + typeset notafloat=${|valsubfunc notanumber } + print $unlucky $notanumber + ${|echo foo} + ${|echo bar +} +fi + +# ====== +# Shared-state command substitutions using the syntax ${ /tmp/strfile +echo ${= 20070703))' 2>/dev/null; then + valsubfunc() { + REPLY=$1 + } + echo ${|valsubfunc ten} + print "${|valsubfunc eleven;}" + printf '%s' "${|valsubfunc twelve }" + unlucky=${|valsubfunc thirteen +} + typeset notafloat=${|valsubfunc notanumber } + print $unlucky $notanumber + ${|echo foo} + ${|echo bar +} +fi + +# ====== +# Shared-state command substitutions using the syntax ${ /tmp/strfile +echo ${= 20070703))' 2>/dev/null; then + valsubfunc() { + REPLY=$1 + } + echo ${|valsubfunc ten} + print "${|valsubfunc eleven;}" + printf '%s' "${|valsubfunc twelve }" + unlucky=${|valsubfunc thirteen +} + typeset notafloat=${|valsubfunc notanumber } + print $unlucky $notanumber + ${|echo foo} + ${|echo bar +} +fi + +# ====== +# Shared-state command substitutions using the syntax ${ /tmp/strfile +echo ${= 20070703))' 2>/dev/null; then + valsubfunc() { + REPLY=$1 + } + echo ${|valsubfunc ten} + print "${|valsubfunc eleven;}" + printf '%s' "${|valsubfunc twelve }" + unlucky=${|valsubfunc thirteen +} + typeset notafloat=${|valsubfunc notanumber } + print $unlucky $notanumber + ${|echo foo} + ${|echo bar +} +fi + +# ====== +# Shared-state command substitutions using the syntax ${ /tmp/strfile +echo ${ 11 +echo ${bar[1][1]} # => 11 diff --git a/runtime/syntax/testdir/input/sh_mksh.ksh b/runtime/syntax/testdir/input/sh_mksh.ksh new file mode 100644 index 0000000000..c346ceed1e --- /dev/null +++ b/runtime/syntax/testdir/input/sh_mksh.ksh @@ -0,0 +1,146 @@ +#!/bin/mksh + +# Rendering namespace variables +echo ${.foo.bar[adsf]} ${foo.bar[1][2]} ${foo.bar[1][az]} ${.foo.bar[1][2]} +echo ${.foo[var]} ${.foo.bar[1]} ${.foo.bar[*]} ${foo.bar##baz} ${.foo.bar##baz} +echo ${.foo.bar[3]##baz} ${.foo.bar[z]##baz} ${sh.version/V/b} ${.sh.version/V/b} +echo ${foo/%bar/foo} ${foo/#bar/foo} ${foo.bar/%bar/foo} ${foo.bar[d]/#bar/foo} +echo ${.foo/%barfoo} ${.foo.bar/#bar/foo} ${.bar.foo/%bar/foo} ${.bar/#bar/foo} +echo ${foo/%barfoo} ${foo/bar/foo} ${barfoo//bar/foo} ${bar/#bar/foo} +echo ${.sh.version^^} ${.sh.version,,} ${KSH_VERSION^} ${KSH_VERSION,} + +# 'alarm' builtin (present in ksh93u+, ksh93v- and the 93u+m dev branch). +alarm --man +# The fds and pids builtins. These ksh93 builtins have existed since 2005-05-22 +# and 2008-06-02, respectively. However, these were not readily enabled; in +# 93u+m these can be enabled with the builtin command if libcmd.so is present, +# either via 'builtin -f' or (in more recent commits) with a regular invocation +# of the 'builtin' built-in. +# cf. https://github.com/ksh93/ksh/commit/f15e2c41 +builtin fds pids +fds; pids + +# Unix commands which are provided by ksh as builtins via libcmd.so +basename +cat +chgrp +chmod +chown +cksum +cmp +comm +cp +cut +date +dirname +egrep # Obsolescent +expr +fgrep # Obsolescent +fmt +fold +getconf +grep +head +iconv # 93v- +id +join +ln +logname +ls # 93v- +md5sum +mkdir +mkfifo +mktemp +mv +od # 93v- +paste +pathchk +readlink # 93v- +realpath # 93v- +rev +rm +rmdir +sha1sum # 93v- +sha256sum # 93v- +sha2sum # 93v- +sha384sum # 93v- +sha512sum # 93v- +stty +sum +sync +tail +tee +tr # 93v- +tty +uname +uniq +vmstate # Obsolescent; only available in 93v- and older +wc +xargs # 93v- +xgrep # 93v- + +# SHA command not provided as a builtin but included here for completeness +sha224sum + +# poll builtin (93v-) +poll --man + +# mkservice and eloop (rarely provided; requires SHOPT_MKSERVICE) +mkservice --man; eloop --help + +# some mksh builtins +bind; rename + +# ;& and ;;& in case statements +case x in + bar) false ${baz:1} ;& + foo) true ${foo:0:0} ;;& + *) print ${$bar} ;; # 93v- +esac + +# Below is subshare syntax supported by both ksh93 and mksh. +print ${ echo one } +print ${ echo two +} +print ${ +echo three } +print ${ echo 'four'; } +print ${ echo 'five' ;} +print ${ echo 'six' +} +print ${ echo 'seven' } +echo ${ print 'eight' } +typeset nine=${ pwd; } + +# Value substitutions of the form ${|command} are only +# supported by mksh, not ksh93. +if ! command eval '((.sh.version >= 20070703))' 2>/dev/null; then + valsubfunc() { + REPLY=$1 + } + echo ${|valsubfunc ten} + print "${|valsubfunc eleven;}" + printf '%s' "${|valsubfunc twelve }" + unlucky=${|valsubfunc thirteen +} + typeset notafloat=${|valsubfunc notanumber } + print $unlucky $notanumber + ${|echo foo} + ${|echo bar +} +fi + +# ====== +# Shared-state command substitutions using the syntax ${ /tmp/strfile +echo ${ + + + + + {{ page_title | default(value="Tera Test") }} + {% if include_styles %} + + {% endif %} + + +
+ {# Header Section with variable interpolation #} +
+

{{ header_text | upper }}

+ {% if subheader %} +

{{ subheader }}

+ {% endif %} +
+ + {# Navigation example with for loop #} + + + {# Main content section with various template features #} +
+ {# Conditionals #} + {% if user %} +
+

Welcome back, {{ user.name }}!

+

Last login: {{ user.last_login | date(format="%Y-%m-%d") }}

+
+ {% elif visitor_count > 0 %} +
+

Welcome, visitor!

+

You are visitor number {{ visitor_count }}

+
+ {% else %} +
+

Welcome to our site!

+
+ {% endif %} + + {# Macro definition and usage #} + {% macro render_item(item, featured=false) %} + + {% endmacro render_item %} + + {# Items section with macro usage #} +
+

Items ({{ items | length }})

+ + {% for item in items %} + {{ self::render_item(item=item, featured=item.id == featured_id) }} + + {% if not loop.last %} +
+ {% endif %} + {% endfor %} +
+ + {# Raw content that shouldn't be processed #} + {% raw %} +
+ The syntax {{ variable }} will not be processed in raw blocks. + Neither will {% control %} structures. +
+ {% endraw %} + + {# Includes #} + {% include "partials/footer.tera" %} + + {# Inheritance example #} + {% block content %} +

This is the default content.

+ {% endblock content %} + + {# Set variables #} + {% set text_color = dark_mode ? "#fff" : "#333" %} + {% set items_count = items | length %} + +
+ We have {{ items_count }} items. +
+ + {# Filters with complex expressions #} +

{{ "Hello, " ~ user.name | default(value="Guest") | upper }}

+

{{ items | filter(attribute="featured", value=true) | length }} featured items

+ + {# With statement #} + {% with %} + {% set local_var = "Only visible in this scope" %} +

{{ local_var }}

+ {% endwith %} + + {# Mathematical operations #} +
+

Price: ${{ price }}

+

Tax ({{ tax_rate * 100 }}%): ${{ price * tax_rate }}

+

Total: ${{ price * (1 + tax_rate) }}

+
+ + {# Boolean operations #} + {% if user and user.is_admin or super_user %} +
Admin panel
+ {% endif %} +
+ + {# Footer section with filters and includes #} +
+

© {{ current_year }} {{ company_name | default(value="Our Company") }}

+ + {% if debug %} +
+

Render time: {{ render_time }}ms

+

Template version: {{ version }}

+
+ {% endif %} +
+
+ + + + diff --git a/runtime/syntax/testdir/input/tex_03.tex b/runtime/syntax/testdir/input/tex_03.tex new file mode 100644 index 0000000000..25d57eab3f --- /dev/null +++ b/runtime/syntax/testdir/input/tex_03.tex @@ -0,0 +1,11 @@ +\documentclass{article} +\usepackage{amsmath} +\begin{document} +\begin{align} + \begin{bmatrix} + 1 & x & x^{2} \\ + 1 & y & y^{2} \\ + 1 & z & z^{2} \\ + \end{bmatrix} +\end{align} +\end{document} diff --git a/runtime/syntax/testdir/input/vim9_block.vim b/runtime/syntax/testdir/input/vim9_block.vim deleted file mode 100644 index 3880f97aca..0000000000 --- a/runtime/syntax/testdir/input/vim9_block.vim +++ /dev/null @@ -1,33 +0,0 @@ -vim9script - -# Vim9 blocks - - -{ - var foo = 42 -} - -{ - { - { - { - var foo = 42 - } - var foo = 42 - } - var foo = 42 - } - var foo = 42 -} - -def Foo() - { - var foo = 42 - echo foo - } -enddef - -echo "foo" | { - var foo = 42 -} - diff --git a/runtime/syntax/testdir/input/vim9_blocks.vim b/runtime/syntax/testdir/input/vim9_blocks.vim new file mode 100644 index 0000000000..20a68fc5ab --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_blocks.vim @@ -0,0 +1,49 @@ +vim9script +# Vim9 blocks +# VIM_TESTSETUP set list listchars=trail:- + + +{ + var foo = 42 +} + + +{ + { + { + { + var foo = 42 + } + var foo = 42 + } + var foo = 42 + } + var foo = 42 +} + + +def Foo() + { + var foo = 42 + echo foo + } +enddef + + +# start/end patterns + +{ + var foo = 42 +} + +{ # comment + var foo = 42 +} # comment + +echo "Foo" | { | echo "Bar" + var foo = 42 +} | echo "Baz" + +# dictionary +{}->items() + diff --git a/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim b/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim new file mode 100644 index 0000000000..5b49ae91f8 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim @@ -0,0 +1,114 @@ +vim9script +# Vim9 special methods - new*(), empty(), len(), string() + + +def new() +enddef + +def newOther() +enddef + +def newyetanother() +enddef + +def empty(): bool + return true +enddef + +def len(): number + return 0 +enddef + +def string(): string + return "" +enddef + +class A + def new() + def newNested() + enddef + def empty(): bool + return true + enddef + def len(): number + return 0 + enddef + def string(): string + return "" + enddef + enddef + + def newOther() + def newNested() + enddef + def empty(): bool + return true + enddef + def len(): number + return 0 + enddef + def string(): string + return "" + enddef + enddef + + def newyetanother() + def newNested() + enddef + def empty(): bool + return true + enddef + def len(): number + return 0 + enddef + def string(): string + return "" + enddef + enddef + + def empty(): bool + def newNested() + enddef + def empty(): bool + return true + enddef + def len(): number + return 0 + enddef + def string(): string + return "" + enddef + return true + enddef + + def len(): number + def newNested() + enddef + def empty(): bool + return true + enddef + def len(): number + return 0 + enddef + def string(): string + return "" + enddef + return 0 + enddef + + def string(): string + def newNested() + enddef + def empty(): bool + return true + enddef + def len(): number + return 0 + enddef + def string(): string + return "" + enddef + return "" + enddef +endclass + diff --git a/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim b/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim new file mode 100644 index 0000000000..61396c3ba2 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim @@ -0,0 +1,58 @@ +vim9script +# Vim |builtin-object-methods| and namesake builtin functions +# VIM_TEST_SETUP hi link vim9MethodName Special +# VIM_TEST_SETUP hi link vim9This Todo + + +class PairClassTest + public const a: any + public const b: any + + def new(a: any, b: any) + this.a = a + this.b = b + enddef + + def empty(): bool + return false + enddef + def len(): number + return 2 + enddef + def string(): string + return printf('(%s, %s)', this.a, this.b) + enddef +endclass + +enum MarkerEnumTest + INSTANCE + + def NoOp() + enddef + + def empty(): bool + return true + enddef + def len(): number + return 0 + enddef + def string(): string + return this.name + enddef +endenum + +const b1: bool = empty(MarkerEnumTest.INSTANCE) +const n1: number = len(MarkerEnumTest.INSTANCE) +const s1: string = string(MarkerEnumTest.INSTANCE) +echo b1 && MarkerEnumTest.INSTANCE.empty() +echo n1 == 0 && MarkerEnumTest.INSTANCE.len() == 0 +echo s1 == 'INSTANCE' && MarkerEnumTest.INSTANCE.string() == 'INSTANCE' + +const pair: PairClassTest = PairClassTest.new(0, 1) +const b2: bool = !pair.empty() +const n2: number = pair.len() +const s2: string = pair.string() +echo b2 && !empty(pair) +echo n2 == 2 && len(pair) == 2 +echo s2 == '(0, 1)' && string(pair) == '(0, 1)' + diff --git a/runtime/syntax/testdir/input/vim9_comment.vim b/runtime/syntax/testdir/input/vim9_comment.vim deleted file mode 100644 index fd6a5d2a2a..0000000000 --- a/runtime/syntax/testdir/input/vim9_comment.vim +++ /dev/null @@ -1,64 +0,0 @@ -vim9script - -# Vim comments - -# Vim9-script comment - - # string only recognised with leading char - "useless string" - -function! Foo() - " Legacy-script comment - # 42 " comment -endfunction - -def! Bar() - # Vim9-script comment - "useless string" # comment -enddef - -command -count FooCommand { - # Vim9-script comment - "useless string" # comment -} - -autocmd BufNewFile * { - # Vim9-script comment - "useless string" # comment -} - - -# Multiline comments - -# comment - \ continuing comment - \ continuing comment - -# :Foo - \ arg1 - #\ comment - \ arg2 - -echo "TOP" - - -# Line-continuation comments - -:Foo - #\ line continuation comment - \ arg1 - #\ line continuation comment - \ arg2 - - -# Issue: #13047 - -if !exists(":DiffOrig") - command DiffOrig vert new | set bt=nofile | r ++edit %% | 0d_ | diffthis - \ | wincmd p | diffthis -endif - - -# Issue: #11307 and #11560 - -# This is what we call " blah diff --git a/runtime/syntax/testdir/input/vim9_comment_strings.vim b/runtime/syntax/testdir/input/vim9_comment_strings.vim new file mode 100644 index 0000000000..854f7d76bc --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_comment_strings.vim @@ -0,0 +1,27 @@ +vim9script +# Vim9 comment strings +# VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true + + +# pre "string" post + +function Foo() + " pre "string" post +endfunction + +def Bar() + # pre "string" post +enddef + +command Foo { + # pre "string" post +} + +autocmd BufNewFile * { + # pre "string" post +} + +{ + # pre "string" post +} + diff --git a/runtime/syntax/testdir/input/vim9_comments.vim b/runtime/syntax/testdir/input/vim9_comments.vim new file mode 100644 index 0000000000..1842d7ef74 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_comments.vim @@ -0,0 +1,92 @@ +vim9script +# Vim9 comments + + +# Vim9-script comment + + # string only recognised with leading char + "useless string" + +function! Foo() + " Legacy-script comment + # 42 " comment +endfunction + +def! Bar() + # Vim9-script comment + "useless string" # comment +enddef + +command -count FooCommand { + # Vim9-script comment + "useless string" # comment +} + +autocmd BufNewFile * { + # Vim9-script comment + "useless string" # comment +} + + +# Multiline comments + +# comment + \ continuing comment + \ continuing comment + +var foo = 42 # commment + \ continuing comment + \ continuing comment + +# :Foo + \ arg1 + #\ comment + \ arg2 + +echo "TOP" + + +# Line-continuation comments + +:Foo + #\ line continuation comment + \ arg1 + #\ line continuation comment + \ arg2 + + +# Expression comments + +var foo = { # comment + # comment + bar: 42, # comment + # comment + # comment + baz: 42 # comment + # comment +} # comment + + +# Issue: #13047 + +if !exists(":DiffOrig") + command DiffOrig vert new | set bt=nofile | r ++edit %% | 0d_ | diffthis + \ | wincmd p | diffthis +endif + + +# Issue: #11307 and #11560 + +# This is what we call " blah + + +# PR: #14975 +# https://github.com/vim/vim/pull/14975#issuecomment-2832643115 + +var d = { + a: 0, +# a ' quote {{{ +#}}} +b: 0, +} + diff --git a/runtime/syntax/testdir/input/vim9_constructors.vim b/runtime/syntax/testdir/input/vim9_constructors.vim new file mode 100644 index 0000000000..3b49969e27 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_constructors.vim @@ -0,0 +1,18 @@ +vim9script +# Vim9 constructors + + +class A + static var _instance: A + var str: string + def _new(str: string) + this.str = str + enddef + static def GetInstance(str: string): A + if _instance == null + _instance = A._new(str) + endif + return _instance + enddef +endclass + diff --git a/runtime/syntax/testdir/input/vim9_def_variables.vim b/runtime/syntax/testdir/input/vim9_def_variables.vim index 94ef810b8b..97f867c122 100644 --- a/runtime/syntax/testdir/input/vim9_def_variables.vim +++ b/runtime/syntax/testdir/input/vim9_def_variables.vim @@ -1,8 +1,9 @@ vim9script +# Vim9 function variables -# Vim9 function variable highlighting def Foo() + # Declarations var foo = expr @@ -12,7 +13,7 @@ def Foo() t:foo = expr w:foo = expr - v:foo = expr + v:true = expr $FOO = expr @@ -59,6 +60,9 @@ END foo[1:] = expr foo[:] = expr + foo["key"] = expr + foo['key'] = expr + foo += expr foo -= expr foo *= expr @@ -107,36 +111,36 @@ END @f = expr @f ..= expr - &foo = expr + &ari = expr &t_k1 = "\[234;" - &foo ..= expr + &ari ..= expr - &foo += expr - &foo -= expr + &ari += expr + &ari -= expr - &l:foo = expr + &l:aleph = expr - &l:foo ..= expr - &l:foo += expr - &l:foo -= expr + &l:aleph ..= expr + &l:aleph += expr + &l:aleph -= expr - &g:foo = expr + &g:aleph = expr - &g:foo ..= expr - &g:foo += expr - &g:foo -= expr + &g:aleph ..= expr + &g:aleph += expr + &g:aleph -= expr [foo, bar] = expr [foo, \ bar] = expr - [v:foo, v:bar] = expr - [v:foo, - \ v:bar] = expr - [&foo, &bar] = expr - [&foo, - \ &bar] = expr + [v:true, v:false] = expr + [v:true, + \ v:false] = expr + [&ari, &bkc] = expr + [&ari, + \ &bkc] = expr [$foo, $bar] = expr [$foo, \ $bar] = expr @@ -155,18 +159,18 @@ END [foo, \ bar; \ baz] = expr - [v:foo, v:bar; v:baz] = expr - [v:foo, - \ v:bar; - \ v:baz] = expr + [v:true, v:false; v:none] = expr + [v:true, + \ v:false; + \ v:none] = expr [$foo, $bar; $baz] = expr [$foo, \ $bar; \ $baz] = expr - [&foo, &bar; &baz] = expr - [&foo, - \ &bar; - \ &baz] = expr + [&ari, &bkc; &cmp] = expr + [&ari, + \ &bkc; + \ &cmp] = expr [@a, @b; @c] = expr [@a, \ @b; @@ -195,6 +199,28 @@ END for [foo, bar] in expr endfor -enddef +# Scope dictionaries + +echo get(b:, 'foo', 42) +echo get(w:, 'foo', 42) +echo get(t:, 'foo', 42) +echo get(g:, 'foo', 42) +echo get(v:, 'foo', 42) + +for k in keys(b:) | echo b:[k] | endfor +for k in keys(w:) | echo w:[k] | endfor +for k in keys(t:) | echo t:[k] | endfor +for k in keys(g:) | echo g:[k] | endfor +for k in keys(v:) | echo v:[k] | endfor + +# Neovim-specific variables (not highlighted by default) + +echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum + +echo &channel &inccommand &mousescroll &pumblend &redrawdebug &scrollback +echo &shada &shadafile &statuscolumn &termpastefilter &termsync &winbar +echo &winblend &winhighlight + +enddef diff --git a/runtime/syntax/testdir/input/vim9_ex_class_fold.vim b/runtime/syntax/testdir/input/vim9_ex_class_fold.vim index 3e5715fe06..ea89b9dfc0 100644 --- a/runtime/syntax/testdir/input/vim9_ex_class_fold.vim +++ b/runtime/syntax/testdir/input/vim9_ex_class_fold.vim @@ -1,8 +1,9 @@ vim9script # Vim9 :class command -# VIM_TEST_SETUP let g:vimsyn_folding = 'cf' +# VIM_TEST_SETUP let g:vimsyn_folding = 'cfi' # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax + interface Interface1 endinterface interface Interface2 diff --git a/runtime/syntax/testdir/input/vim9_ex_commands.vim b/runtime/syntax/testdir/input/vim9_ex_commands.vim index 1773e21b7e..c22fb71952 100644 --- a/runtime/syntax/testdir/input/vim9_ex_commands.vim +++ b/runtime/syntax/testdir/input/vim9_ex_commands.vim @@ -1,7 +1,7 @@ vim9script - # Vim9 Ex commands + # START NOT MATCHED :@ :@@ @@ -14,8 +14,6 @@ vim9script : help : help # FIXME -:2match -:3match :abbreviate :abclear :aboveleft @@ -540,6 +538,7 @@ vim9script :undojoin :undolist :unhide +:uniq :unlockvar :unmap :unmenu @@ -597,8 +596,6 @@ Foo() | help Foo() |help Foo()| help -Foo() | 2match -Foo() | 3match Foo() | abbreviate Foo() | abclear Foo() | aboveleft @@ -1121,6 +1118,7 @@ Foo() | undo Foo() | undojoin Foo() | undolist Foo() | unhide +Foo() | uniq Foo() | unlockvar Foo() | unmap Foo() | unmenu diff --git a/runtime/syntax/testdir/input/vim9_ex_comment_strings.vim b/runtime/syntax/testdir/input/vim9_ex_comment_strings.vim deleted file mode 100644 index fd02c1a60a..0000000000 --- a/runtime/syntax/testdir/input/vim9_ex_comment_strings.vim +++ /dev/null @@ -1,22 +0,0 @@ -vim9script - -# Vim comment strings -# VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true - -# pre "string" post - -function Foo() - " pre "string" post -endfunction - -def Bar() - # pre "string" post -enddef - -command Foo { - # pre "string" post -} - -autocmd BufNewFile * { - # pre "string" post -} diff --git a/runtime/syntax/testdir/input/vim9_ex_echo.vim b/runtime/syntax/testdir/input/vim9_ex_echo.vim new file mode 100644 index 0000000000..e09dd04c0a --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_ex_echo.vim @@ -0,0 +1,36 @@ +vim9script +# Vim9 :echo commands +# VIM_TEST_SETUP hi link vimVar Identifier + + +echo # comment +echo "Foo" # comment +echo foo[0] # comment +echo Foo() # comment +echo "Foo" | # comment + +def Foo() + echo # comment + echo "Foo" # comment + echo foo[0] # comment + echo Foo() # comment + echo "Foo" | # comment +enddef + + +echo "4" + # comment + .. "2" # comment + +echo "4" .. + # comment + "2" # comment + +echo "4" # comment + # comment + .. "2" # comment + +echo "4" .. # comment + # comment + "2" # comment + diff --git a/runtime/syntax/testdir/input/vim9_ex_enum.vim b/runtime/syntax/testdir/input/vim9_ex_enum.vim new file mode 100644 index 0000000000..8529deda24 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_ex_enum.vim @@ -0,0 +1,111 @@ +vim9script +# Vim :enum command +# VIM_TEST_SETUP hi link vim9EnumValue Todo + + +interface Interface1 + def Def1() +endinterface +interface Interface2 +endinterface + +# enum-implements clause with interspersed comments + +enum Enum1 implements Interface1, Interface2 + Value1 + def Def1() + enddef +endenum + +enum Enum2 + \ implements Interface1, Interface2 + Value1 + def Def1() + enddef +endenum + +enum Enum3 # comment + \ implements Interface1, Interface2 + Value1 +endenum + +enum Enum4 + # comment + \ implements Interface1, Interface2 + Value1 +endenum + +enum Enum5 + \ implements Interface1, Interface2 # comment + Value1 + def Def1() + enddef +endenum + +enum Enum6 + #\ comment + \ implements Interface1, Interface2 + Value1 + def Def1() + enddef +endenum + +# [enum Enum7.Value1 {name: 'Value1', ordinal: 0, val1: 0, val2: 0}, enum Enum7.Value2 {name: 'Value2', ordinal: 1, val1: 1, val2: 0}, enum Enum7.Value3 {name: 'Value3', ordinal: 2, val1: 2, val2: 0}] +# comment +enum Enum7 + \ + #\ comment + \ + #\ comment + \ implements Interface1, Interface2 # comment + # comment + # comment + Value1, # comment + # comment + # comment + Value2(1 + 0), # comment + # comment + # comment + Value3( # comment + # comment + 1 # comment + # comment + + # comment + # comment + 1 # comment + ) # comment + # comment + var val1: number # comment + # comment + def Def1() + enddef + # comment + static def Def2() # comment + # comment + enddef # comment + # comment + public var val2: number # comment +endenum + +# [enum Enum8.implements {name: 'implements', ordinal: 0}] +enum Enum8 implements Interface1, Interface2 + implements + def Def1() + enddef +endenum + +# [enum Enum9.Value1 {name: 'Value1', ordinal: 0, implements: 0}] +enum Enum9 implements Interface1, Interface2 + Value1 + var implements: number + def Def1() + enddef +endenum + +# [enum Enum10.implements {name: 'implements', ordinal: 0}] +enum Enum10 implements Interface1, Interface2 + implements + def Def1() + enddef +endenum + diff --git a/runtime/syntax/testdir/input/vim9_ex_enum2.vim b/runtime/syntax/testdir/input/vim9_ex_enum2.vim new file mode 100644 index 0000000000..f602d794fe --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_ex_enum2.vim @@ -0,0 +1,31 @@ +vim9script +# Vim9 :enum command +# VIM_TEST_SETUP hi link vim9EnumValue Todo +# See: https://github.com/vim/vim/pull/16365#issuecomment-2571420551 + + +enum Letter + # + ######################################### + A("(\" # not a comment NOR_ANOTHER_VALUE, + \ "), B(")\""), C($"'') + \('"), D($'""(),"'), E, + F( + ")" .. # FA, + "(" # FB, + ), G + #enum NotSupported + #endenum + + def new(this.value = v:none) + return + enddef + const value: string +endenum + +for letter in Letter.values + echo letter +endfor + +echo Letter.D + diff --git a/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim b/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim index 0656907eb7..b4769d5813 100644 --- a/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim +++ b/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim @@ -1,7 +1,9 @@ vim9script -# Vim :enum command -# VIM_TEST_SETUP let g:vimsyn_folding = 'ef' +# Vim9 :enum command +# VIM_TEST_SETUP let g:vimsyn_folding = 'efi' # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax +# VIM_TEST_SETUP hi link vim9EnumValue Todo + interface Interface1 endinterface @@ -29,11 +31,20 @@ enum Enum4 endenum enum Enum5 implements Interface1, Interface2 - Value1, - Value2, - Value3 - def Method1() - def Nested() - enddef + Value1, + Value2, + Value3 + def Method1() + def Nested() enddef + enddef endenum + +enum Enum6 + #\ comment + \ implements Interface1, Interface2 + Value1, + Value2, + Value3 +endenum + diff --git a/runtime/syntax/testdir/input/vim9_ex_for.vim b/runtime/syntax/testdir/input/vim9_ex_for.vim index e3c303330a..f23b3cc505 100644 --- a/runtime/syntax/testdir/input/vim9_ex_for.vim +++ b/runtime/syntax/testdir/input/vim9_ex_for.vim @@ -1,5 +1,4 @@ vim9script - # Vim9 :for command @@ -66,3 +65,24 @@ for [foo: number, bar: number] in expr2 echo foo bar endfor + +# Issue #7961 (Builtin types are not highlighted in item-variable declarations +# of :for commands) + +var m: number +var n: number +for x: number in range(2) | m = x | endfor +###### ^^^^^^ +echo m +for [x: number, y: number] in [[0, 0], [1, 1]] | [m, n] = [x, y] | endfor +echo m n + +var F: func +for t: tuple in ((function('tolower'),),) | F = t[0] | endfor +###### ^^^^^^^^^^^ +echo F('HELLO') +for [L: func, U: func] in [[function('tolower'), function('toupper')]] + [_, F] = [L, U] +endfor +echo F('hello') F('world') + diff --git a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim index b4b9f6de0f..dda1449584 100644 --- a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim +++ b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim @@ -1,8 +1,8 @@ vim9script - # Vim9 :function and :def tail comment errors # VIM_TEST_SETUP unlet! g:vimsyn_folding + fun Test1() abort # fun return 1 endfun # endfun @@ -42,3 +42,4 @@ endfun # endfun for d in range(1, 6) exec $'echo Test{d}()' endfor + diff --git a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim index 12f7942cf1..b2803854d4 100644 --- a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim +++ b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim @@ -1,8 +1,8 @@ vim9script - # Vim9 :function and :def tail comments # VIM_TEST_SETUP unlet! g:vimsyn_folding + fun Test1() abort " fun return 1 endfun " endfun @@ -42,3 +42,4 @@ endfun " endfun for d in range(1, 6) exec $'echo Test{d}()' endfor + diff --git a/runtime/syntax/testdir/input/vim9_ex_import.vim b/runtime/syntax/testdir/input/vim9_ex_import.vim new file mode 100644 index 0000000000..bedd5bbda7 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_ex_import.vim @@ -0,0 +1,120 @@ +vim9script +# Vim9 :import command +# VIM_TEST_SETUP hi link vimImportName Todo + + +import "foo.vim" +import true ? "foo.vim" : "bar.vim" + +import true ? + "foo.vim" : + "bar.vim" + +import true + ? "foo.vim" + : "bar.vim" + +import true ? # comment + # comment + "foo.vim" : + # comment + "bar.vim" + +import true # comment + # comment + ? "foo.vim" + # comment + : "bar.vim" + +import "foo.vim" as bar +import true ? "foo.vim" : "bar.vim" as baz + +import true ? + "foo.vim" : + "bar.vim" + as baz + +import true + ? "foo.vim" + : "bar.vim" + as baz + +import true ? # comment + # comment + "foo.vim" : + # comment + "bar.vim" + # comment + as baz + +import true # comment + # comment + ? "foo.vim" + # comment + : "bar.vim" + # comment + as baz + +echo "Foo" | import "foo.vim" + + +# autoload + +import autoload "foo.vim" +import autoload true ? "foo.vim" : "bar.vim" + +import autoload true ? + "foo.vim" : + "bar.vim" + +import autoload true + ? "foo.vim" + : "bar.vim" + +import autoload true ? # comment + # comment + "foo.vim" : + # comment + "bar.vim" + +import autoload true # comment + # comment + ? "foo.vim" + # comment + : "bar.vim" + +import autoload "foo.vim" as bar +import autoload true ? "foo.vim" : "bar.vim" as baz + +import autoload true ? + "foo.vim" : + "bar.vim" + as baz + +import autoload true + ? "foo.vim" + : "bar.vim" + as baz + +import autoload true ? # comment + # comment + "foo.vim" : + # comment + "bar.vim" + # comment + as baz + +import autoload true # comment + # comment + ? "foo.vim" + # comment + : "bar.vim" + # comment + as baz + + +# "as" keyword in expr + +var as = "modules/" +import true ? as .. "foo.vim" : as .. "bar.vim" as other + diff --git a/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim b/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim index 232c3e2796..f108e749a0 100644 --- a/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim +++ b/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim @@ -1,8 +1,9 @@ vim9script -# Vim :interface command +# Vim9 :interface command # VIM_TEST_SETUP let g:vimsyn_folding = 'i' # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax + interface Interface1 endinterface @@ -34,3 +35,4 @@ interface Interface5 def Meth1(): number def Meth2(): number endinterface + diff --git a/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim b/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim new file mode 100644 index 0000000000..184089c819 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim @@ -0,0 +1,299 @@ +vim9script +# Vim9 heredoc +# VIM_TEST_SETUP let g:vimsyn_folding = "h" +# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax + + +var foo =<< END +line1 +line2 +END + + var foo =<< END +line1 +line2 +END + +var [foo, bar] =<< EOS +line1 +line2 +EOS + + var [foo, bar] =<< EOS +line1 +line2 +EOS + +var [foo, + \ bar] =<< EOS +line1 +line2 +EOS + + var [foo, + \ bar] =<< EOS +line1 +line2 +EOS + +# assignment + +foo =<< END +line1 +line2 +END + + foo =<< END +line1 +line2 +END + +g:foo =<< END +line1 +line2 +END + + g:foo =<< END +line1 +line2 +END + +[foo, bar] =<< EOS +line1 +line2 +EOS + + [foo, bar] =<< EOS +line1 +line2 +EOS + +[foo, + \ bar] =<< EOS +line1 +line2 +EOS + + [foo, + \ bar] =<< EOS +line1 +line2 +EOS + +[g:foo, g:bar] =<< EOS +line1 +line2 +EOS + + [g:foo, g:bar] =<< EOS +line1 +line2 +EOS + +[g:foo, + \ g:bar] =<< EOS +line1 +line2 +EOS + + [g:foo, + \ g:bar] =<< EOS +line1 +line2 +EOS + + +# typed + +var foo: list =<< END +line1 +line2 +END + +var [foo: string, bar: string] =<< END +line1 +line2 +END + +# assignment + +# trim + +var foo =<< trim END + line1 + line2 +END + + var foo =<< trim END + line1 + line2 + END + + +# interpolation + +var foo =<< eval END +line{1 + 0} +line{1 + 1} +END + + var foo =<< eval END +line{1 + 0} +line{1 + 1} +END + +var foo =<< trim eval END + line{1 + 0} + line{1 + 1} +END + + var foo =<< trim eval END + line{1 + 0} + line{1 + 1} + END + +# no interpolation (escaped { and }) + +var foo =<< eval END +line{{1 + 0}} +line{{1 + 1}} +END + + var foo =<< eval END +line{{1 + 0}} +line{{1 + 1}} +END + +var foo =<< trim eval END + line{{1 + 0}} + line{{1 + 1}} +END + + var foo =<< trim eval END + line{{1 + 0}} + line{{1 + 1}} + END + + +# no interpolation + +var foo =<< END +line{1 + 0} +line{1 + 1} +END + + var foo =<< END +line{1 + 0} +line{1 + 1} +END + +var foo =<< trim END + line{1 + 0} + line{1 + 1} +END + + var foo =<< trim END + line{1 + 0} + line{1 + 1} + END + + +# end marker must not be followed by whitespace + +# assert_equal(foo, ["END "]) +var foo =<< END +END +END + +# assert_equal(foo, [" END "]) +var foo =<< END + END +END + +# assert_equal(foo, ["END "]) +var foo =<< trim END + END +END + +# assert_equal(foo, ["END "]) + var foo =<< trim END + END + END + + +# end marker must be vertically aligned with :var (if preceded by whitespace) + +# assert_equal(foo, ["END"]) +var foo =<< trim END + END +END + + # assert_equal(foo, ["END"]) + var foo =<< trim END + END + END + +# assert_equal(foo, ["END "]) +var foo =<< trim END +END +END + + # assert_equal(foo, ["END"]) + var foo =<< trim END + END + END + + # assert_equal(foo, ["END "]) + var foo =<< trim END + END + END + + # assert_equal(foo, ["END"]) + var foo =<< trim END + END + END + + # assert_equal(foo, ["END "]) + var foo =<< trim END + END + END + + # assert_equal(foo, ["END "]) + var foo =<< trim END +END +END + + # assert_equal(foo, ["END"]) + var foo =<< trim END + END +END + + # assert_equal(foo, ["END"]) + var foo =<< trim END + END +END + + +# end markers + +var foo =<< !@#$%^&*()_+ +line1 +line2 +!@#$%^&*()_+ + +var foo =<< 0!@#$%^&*()_+ +line1 +line2 +0!@#$%^&*()_+ + +var foo =<< A!@#$%^&*()_+ +line1 +line2 +A!@#$%^&*()_+ + +# error - leading lowercase character +var foo =<< a!@#$%^&*()_+ +line1 +line2 +a!@#$%^&*()_+ + diff --git a/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim b/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim index 126c6dd38c..b6b5fece9d 100644 --- a/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim +++ b/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim @@ -1,6 +1,6 @@ vim9script +# Vim9 :loadkeymap command -# Vim :loadkeymap command scriptencoding utf-8 @@ -22,5 +22,7 @@ c Special notation allowed in RHS - octal # Vim-script comment characters \# Line should not match as a Vim9-script comment -" “ Line should not match as a legacy-script comment +# Line should not match as a legacy-script comment +" “ : # Line should not match as a Vim9-script comment + diff --git a/runtime/syntax/testdir/input/vim9_ex_no_comment_strings.vim b/runtime/syntax/testdir/input/vim9_ex_no_comment_strings.vim deleted file mode 100644 index dcea14d28d..0000000000 --- a/runtime/syntax/testdir/input/vim9_ex_no_comment_strings.vim +++ /dev/null @@ -1,22 +0,0 @@ -vim9script - -# Vim comment strings -# VIM_TEST_SETUP let g:vimsyn_comment_strings = v:false - -# pre "string" post - -function Foo() - " pre "string" post -endfunction - -def Bar() - # pre "string" post -enddef - -command Foo { - # pre "string" post -} - -autocmd BufNewFile * { - # pre "string" post -} diff --git a/runtime/syntax/testdir/input/vim9_ex_special_method_definitions.vim b/runtime/syntax/testdir/input/vim9_ex_special_method_definitions.vim deleted file mode 100644 index 79a0626ff4..0000000000 --- a/runtime/syntax/testdir/input/vim9_ex_special_method_definitions.vim +++ /dev/null @@ -1,113 +0,0 @@ -vim9script -# Vim9 special methods new*(), empty(), len(), string() - -def new() -enddef - -def newOther() -enddef - -def newyetanother() -enddef - -def empty(): bool - return true -enddef - -def len(): number - return 0 -enddef - -def string(): string - return "" -enddef - -class A - def new() - def newNested() - enddef - def empty(): bool - return true - enddef - def len(): number - return 0 - enddef - def string(): string - return "" - enddef - enddef - - def newOther() - def newNested() - enddef - def empty(): bool - return true - enddef - def len(): number - return 0 - enddef - def string(): string - return "" - enddef - enddef - - def newyetanother() - def newNested() - enddef - def empty(): bool - return true - enddef - def len(): number - return 0 - enddef - def string(): string - return "" - enddef - enddef - - def empty(): bool - def newNested() - enddef - def empty(): bool - return true - enddef - def len(): number - return 0 - enddef - def string(): string - return "" - enddef - return true - enddef - - def len(): number - def newNested() - enddef - def empty(): bool - return true - enddef - def len(): number - return 0 - enddef - def string(): string - return "" - enddef - return 0 - enddef - - def string(): string - def newNested() - enddef - def empty(): bool - return true - enddef - def len(): number - return 0 - enddef - def string(): string - return "" - enddef - return "" - enddef -endclass - diff --git a/runtime/syntax/testdir/input/vim9_ex_type.vim b/runtime/syntax/testdir/input/vim9_ex_type.vim index bfd9eb9a26..1408ac8555 100644 --- a/runtime/syntax/testdir/input/vim9_ex_type.vim +++ b/runtime/syntax/testdir/input/vim9_ex_type.vim @@ -1,5 +1,6 @@ vim9script -# Vim :type command +# Vim9 :type command + type Foo = string type Bar = list diff --git a/runtime/syntax/testdir/input/vim9_expr.vim b/runtime/syntax/testdir/input/vim9_expr.vim deleted file mode 100644 index fd9cbb0091..0000000000 --- a/runtime/syntax/testdir/input/vim9_expr.vim +++ /dev/null @@ -1,114 +0,0 @@ -vim9script -# Vim9-script expressions - - -# Operators - -# Ternary - -echo expr ? expr : expr - -echo lnum == 1 ? "top" : lnum -echo lnum == 1 ? "top" : lnum == 1000 ? "last" : lnum - -echo lnum == 1 - ? "top" - : lnum == 1000 - ? "last" - : lnum -echo lnum == 1 ? - "top" : - lnum == 1000 ? - "last" : - lnum - -echo true ? true : false -echo 1 ? 1 : 0 -echo "foo" ? "foo" : "bar" -echo foo ? foo : bar -echo g:foo ? g:foo : g:bar -echo $FOO ? $FOO : $BAR -echo True() ? True() : False() -echo @a ? @a : @b -echo (true) ? (true) : (false) -echo (1) ? (1) : (0) - -# Falsy - -echo expr ?? expr - -echo theList ?? 'list is empty' -echo GetName() ?? 'unknown' - -echo theList - \ ?? 'list is empty' -echo theList ?? - \ 'list is empty' - -echo true ?? true -echo 1 ?? 1 -echo "foo" ?? "foo" -echo foo ?? foo -echo g:foo ?? g:foo -echo $FOO ?? $FOO -echo True() ?? True() -echo @a ?? @a -echo (true) ?? (true) -echo (1) ?? (1) - - -# Function calls - -Foo(true, false, null) - - -# Command {expr} arguments - -if true - echo true -elseif false - echo false -endif - -while true - break -endwhile - -def Foo(): bool - return true -enddef - - -# Issue #14423 (vim.vim: Opt out of vimSearch*) - -:?truthy -const truthy: number = false - ? (0 - ) - : (1 - ) -echo truthy - -def Foo() - :?truthy - const truthy: number = false - ? (0 - ) - : (1 - ) - echo truthy -enddef - - -# Issue #16227 (Vimscript ternary expression highlighting) - -var foo = 'foo' # comment -var bar = foo == 'foo' ? 'bar' : 'baz' -var baz = foo == 'foo' - \ ? 'baz' - \ : 'bar' -var qux = foo == 'foo' - ? 'qux' # comment - : 'qux' # comment -echo qux ?? 'quux' - diff --git a/runtime/syntax/testdir/input/vim9_expressions.vim b/runtime/syntax/testdir/input/vim9_expressions.vim new file mode 100644 index 0000000000..05a9fe7235 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_expressions.vim @@ -0,0 +1,215 @@ +vim9script +# Vim9 expressions + + +# Boolean + +echo true false + +# Number + +# ' separated + +echo 1'000'000 +echo 1'000'000.00 +echo -1'000'000 +echo -1'000'000.00 + +echo 0b1000'0000 +echo 0o1000'0000 +echo 0x1000'0000 +echo -0b1000'0000 +echo -0o1000'0000 +echo -0x1000'0000 + +# Null + +echo null null_blob null_channel null_class null_dict null_function null_job +echo null_list null_object null_partial null_string null_tuple + +# Dictionary + +echo {} +echo { foo: 21 * 2 } +echo { -foo-: 21 * 2 } +echo { 42: 21 * 2 } +echo { 'foo': 21 * 2 } +echo { "foo": 21 * 2 } + +echo { foo: { bar: 21 * 2 } } +echo { foo: { -bar-: 21 * 2 } } +echo { foo: { 42: 21 * 2 } } +echo { foo: { 'bar': 21 * 2 } } +echo { foo: { "bar": 21 * 2 } } + +echo { -foo-: { bar: 21 * 2 } } +echo { -foo-: { -bar-: 21 * 2 } } +echo { -foo-: { 42: 21 * 2 } } +echo { -foo-: { 'bar': 21 * 2 } } +echo { -foo-: { "bar": 21 * 2 } } + +echo { 42: { bar: 21 * 2 } } +echo { 42: { -bar-: 21 * 2 } } +echo { 42: { 42: 21 * 2 } } +echo { 42: { 'bar': 21 * 2 } } +echo { 42: { "bar": 21 * 2 } } + +echo { 'foo': { bar: 21 * 2 } } +echo { 'foo': { -bar-: 21 * 2 } } +echo { 'foo': { 42: 21 * 2 } } +echo { 'foo': { "bar": 21 * 2 } } +echo { 'foo': { 'bar': 21 * 2 } } + +echo { "foo": { bar: 21 * 2 } } +echo { "foo": { -bar-: 21 * 2 } } +echo { "foo": { 42: 21 * 2 } } +echo { "foo": { 'bar': 21 * 2 } } +echo { "foo": { "bar": 21 * 2 } } + +echo { + # comment + foo: { + bar: 21 * 2 + } +} + +# match as keys not scope dictionaries +echo { b: 42, w: 42, t: 42, g: 42, l: 42, s: 42, a: 42, v: 42 } + +# Register + +echo @" @@ +echo @0 @1 @2 @3 @4 @5 @6 @7 @8 @9 +echo @a @b @c @d @e @f @g @h @i @j @k @l @m @n @o @p @q @r @s @t @u @v @w @x @y @z +echo @A @B @C @D @E @F @G @H @I @J @K @L @M @N @O @P @Q @R @S @T @U @V @W @X @Y @Z +echo @- @: @. @% @# @= @* @+ @~ @_ @/ + +# read-only @:, @., @%, @~ +@" = "foo" +@0 = "foo" +@1 = "foo" +@9 = "foo" +@a = "foo" +@k = "foo" +@z = "foo" +@A = "foo" +@K = "foo" +@Z = "foo" +@- = "foo" +@# = "foo" +@= = "foo" +@* = "foo" +@+ = "foo" +@_ = "foo" +@/ = "foo" + +# Operators + +# Ternary + +echo expr ? expr : expr + +echo lnum == 1 ? "top" : lnum +echo lnum == 1 ? "top" : lnum == 1000 ? "last" : lnum + +echo lnum == 1 + ? "top" + : lnum == 1000 + ? "last" + : lnum +echo lnum == 1 ? + "top" : + lnum == 1000 ? + "last" : + lnum + +echo true ? true : false +echo 1 ? 1 : 0 +echo "foo" ? "foo" : "bar" +echo foo ? foo : bar +echo g:foo ? g:foo : g:bar +echo $FOO ? $FOO : $BAR +echo True() ? True() : False() +echo @a ? @a : @b +echo (true) ? (true) : (false) +echo (1) ? (1) : (0) + +# Falsy + +echo expr ?? expr + +echo theList ?? 'list is empty' +echo GetName() ?? 'unknown' + +echo theList + \ ?? 'list is empty' +echo theList ?? + \ 'list is empty' + +echo true ?? true +echo 1 ?? 1 +echo "foo" ?? "foo" +echo foo ?? foo +echo g:foo ?? g:foo +echo $FOO ?? $FOO +echo True() ?? True() +echo @a ?? @a +echo (true) ?? (true) +echo (1) ?? (1) + + +# Function calls + +Foo(true, false, null) + + +# Command {expr} arguments + +if true + echo true +elseif false + echo false +endif + +while true + break +endwhile + +def Foo(): bool + return true +enddef + + +# Issue #14423 (vim.vim: Opt out of vimSearch*) + +:?truthy +const truthy: number = false + ? (0 + ) + : (1 + ) +echo truthy + +def Foo() + :?truthy + const truthy: number = false + ? (0 + ) + : (1 + ) + echo truthy +enddef + + +# Issue #16227 (Vim script ternary expression highlighting) + +var foo = 'foo' # comment +var bar = foo == 'foo' ? 'bar' : 'baz' +var baz = foo == 'foo' + \ ? 'baz' + \ : 'bar' +var qux = foo == 'foo' + ? 'qux' # comment + : 'qux' # comment +echo qux ?? 'quux' + diff --git a/runtime/syntax/testdir/input/vim9_function_calls.vim b/runtime/syntax/testdir/input/vim9_function_calls.vim new file mode 100644 index 0000000000..63e82c662f --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_function_calls.vim @@ -0,0 +1,317 @@ +vim9script +# Vim9 function calls +# VIM_TEST_SETUP hi link vimUserFunc Todo +# VIM_TEST_SETUP hi link vim9UserFunc Todo + + +call abs(42) +abs(42) + + +# Command/function distinction + +# append browse call chdir confirm copy delete eval execute filter function +# insert join map match mode sort split substitute swapname type + +var append = append(42) +call append(42) +# function +append(42) +# Legacy command +# append (42) + +var browse = browse(42) +call browse(42) +# function +browse(42) +# command +browse (42) + +var call = call(42) +call call(42) +# function +call(42) +# command +call (42) + +var chdir = chdir(42) +call chdir(42) +# function +chdir(42) +# command +chdir (42) + +var confirm = confirm(42) +call confirm(42) +# function +confirm(42) +# command +confirm (42) + +var copy = copy(42) +call copy(42) +# function +copy(42) +# command +copy (42) + +var delete = delete(42) +call delete(42) +# function +delete(42) +# command +delete (42) + +var eval = eval(42) +call eval(42) +# function +eval(42) +# command +eval (42) + +var execute = execute(42) +call execute(42) +# function +execute(42) +# command +execute (42) + +var filter = filter(42) +call filter(42) +# function +filter(42) +# command +filter (42) + +var function = function(42) +call function(42) +# function +function(42) +# command +function (42) + +var insert = insert(42) +call insert(42) +# function +insert(42) +# Legacy command +# insert (42) + +var join = join(42) +call join(42) +# function +join(42) +# command +join (42) + +var map = map(42) +call map(42) +# function +map(42) +# command +map (42) + +var match = match(42) +call match(42) +# function +match(42) +# command +match (42) + +var sort = sort(42) +call sort(42) +# function +sort(42) +# command +sort (42) + +var split = split(42) +call split(42) +# function +split(42) +# command +split (42) + +var substitute = substitute(42) +call substitute(42) +# function +substitute(42) +# command +substitute (42) + +var swapname = swapname(42) +call swapname(42) +# function +swapname(42) +# command +swapname (42) + +var type = type(42) +call type(42) +# function +type(42) +# command +type (42) + +var uniq = uniq(42) +call uniq(42) +# function +uniq(42) +# command +uniq (42) + + +# Errors + +var foo = foo(42) +call foo(42) +foo(42) + +var if = if(42) +call if(42) +# function +if(42) | .. | endif +# command +if (42) | .. | endif + +var echo = echo(42) +call echo(42) +# function +echo(42) +# command +echo (42) + + +# Expressions + +var foo = abs(42) + +abs(42) +call abs(42) +echo "Foo" | abs(42) + +echo abs(42) +echo (abs(42)) +echo abs(42) + foo +echo foo + abs(42) + +Foo() +call Foo() +echo "Foo" | Foo() + +echo Foo() +echo (Foo()) +echo Foo() + bar +echo bar + Foo() + + +# Scope modifiers and qualified names + +var foo = g:foo(42) +call g:foo(42) + +var foo = b:foo(42) +call b:foo(42) + +var foo = w:foo(42) +call w:foo(42) + +var foo = t:foo(42) +call t:foo(42) + +var foo = v:foo(42) +call v:foo(42) + + +var foo = module.foo(42) +call module.foo(42) +module.foo(42) + +var foo = g:module.foo(42) +call g:module.foo(42) +g:module.foo(42) + +var foo = b:module.foo(42) +call b:module.foo(42) +b:module.foo(42) + +var foo = w:module.foo(42) +call w:module.foo(42) +w:module.foo(42) + +var foo = t:module.foo(42) +call t:module.foo(42) +t:module.foo(42) + +var foo = v:module.foo(42) +call v:module.foo(42) +v:module.foo(42) + + +var foo = module#foo(42) +call module#foo(42) +module#foo(42) + +var foo = g:module#foo(42) +call g:module#foo(42) +g:module#foo(42) + + +# User, not builtin, functions + +call g:substitute() +call b:substitute() +call w:substitute() +call t:substitute() +call v:substitute() + +call substitute() + +call g:substitute.substitute() +call b:substitute.substitute() +call w:substitute.substitute() +call t:substitute.substitute() +call v:substitute.substitute() + +call substitute#substitute() +call g:substitute#substitute() + +g:substitute() +b:substitute() +w:substitute() +t:substitute() +v:substitute() + +substitute() + +g:substitute.substitute() +b:substitute.substitute() +w:substitute.substitute() +t:substitute.substitute() +v:substitute.substitute() + +substitute#substitute() +g:substitute#substitute() + + +# Chained function calls + +module.foo().bar() +module.foo().substitute() + + +# Issue 16721 (Vim script highlight of builtin function after |) + +&directory = $'{$MYVIMDIR}/.data/swap/' +&backupdir = $'{$MYVIMDIR}/.data/backup//' +&undodir = $'{$MYVIMDIR}/.data/undo//' +if !isdirectory(&undodir) | mkdir(&undodir, "p") | endif +if !isdirectory(&backupdir) | mkdir(&backupdir, "p") | endif +if !isdirectory(&directory) | mkdir(&directory, "p") | endif + + +# Issue #17766 (valid function call highlighted as error) + +module[0].foo() +module[0].substitute() + diff --git a/runtime/syntax/testdir/input/vim9_generic_function_example_enum.vim b/runtime/syntax/testdir/input/vim9_generic_function_example_enum.vim new file mode 100644 index 0000000000..037392134b --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_generic_function_example_enum.vim @@ -0,0 +1,36 @@ +vim9script +# VIM_TEST_SETUP highlight link vim9DefTypeParam Todo +# VIM_TEST_SETUP highlight link vim9EnumValue Identifier +# VIM_TEST_SETUP let g:vimsyn_folding = "ef" +# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax +# See: https://github.com/vim/vim/pull/17313#issuecomment-3033537127 (Aliaksei Budavei) + + +enum CommonPair + HelloWorld('hello', 'world'), + Booleans(true, false) + + const _fst: any + const _snd: any + + def new(fst: T, snd: U) + this._fst = fst + this._snd = snd + enddef + + def First(): T + return this._fst + enddef + + def Second(): T + return this._snd + enddef + + def string(): string + return printf("(%s, %s)", this._fst, this._snd) + enddef +endenum + +echo CommonPair.HelloWorld +echo CommonPair.Booleans + diff --git a/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim b/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim new file mode 100644 index 0000000000..f1abbdb3b1 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim @@ -0,0 +1,215 @@ +vim9script +# VIM_TEST_SETUP let g:vimsyn_folding = "cfi" +# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax +# VIM_TEST_SETUP hi link vim9DefTypeParam Todo +# See: https://github.com/vim/vim/pull/17313#issuecomment-3046696820 (Aliaksei Budavei) + + +# See https://github.com/vim/vim/pull/16604#issuecomment-265202845 . +export interface Listable + def Cons(_: E): Listable + def Reverse(): Listable + def Rest(): Listable + def First(): E + def empty(): bool + def len(): number + def string(): string +endinterface + +enum EmptyList implements Listable + INSTANCE + + def Cons(value: E): Listable + return List.new(value) + enddef + + def Reverse(): Listable + return this + enddef + + def Rest(): Listable + return this + enddef + + def First(): E + return null + enddef + + def empty(): bool + return true + enddef + + def len(): number + return 0 + enddef + + def string(): string + return '[]' + enddef +endenum + +class List implements Listable + const _value: any + const _size: number + var _next: Listable + + def new(value: E) + this._value = value + this._size = 1 + this._next = EmptyList.INSTANCE + enddef + + def _newCons(value: E, size: number) + this._value = value + this._size = size + enddef + + def Cons(value: E): Listable + const list: List = List._newCons(value, (this._size + 1)) + list._next = this + return list + enddef + + def Reverse(): Listable + var result: Listable = List.new(this.First()) + var list: Listable = this.Rest() + + while !list.empty() + result = result.Cons(list.First()) + list = list.Rest() + endwhile + + return result + enddef + + def Rest(): Listable + return this._next + enddef + + def First(): E + return this._value + enddef + + def empty(): bool + return (this._size == 0) + enddef + + def len(): number + return this._size + enddef + + def string(): string + if this.empty() + return '[]' + endif + + var text: string = '[' .. string(this.First()) .. ', ' + var list: Listable = this.Rest() + + while !list.empty() + text ..= string(list.First()) .. ', ' + list = list.Rest() + endwhile + + return strpart(text, 0, (strlen(text) - 2)) .. ']' + enddef +endclass + +export def MakeEmptyList(): Listable + return EmptyList.INSTANCE +enddef + +export def MakeList(value: E): Listable + return List.new(value) +enddef + +export def Map(listable: Listable, Mapper: func(T): U): Listable + var result: Listable = EmptyList.INSTANCE + var list: Listable = listable + + while !list.empty() + result = result.Cons(Mapper(list.First())) + list = list.Rest() + endwhile + + return result.Reverse() +enddef + +export def Filter(listable: Listable, Predicate: func(T): bool): Listable + var result: Listable = EmptyList.INSTANCE + var list: Listable = listable + + while !list.empty() + if Predicate(list.First()) + result = result.Cons(list.First()) + endif + + list = list.Rest() + endwhile + + return result.Reverse() +enddef + +############################################################ + +echo MakeEmptyList() + +const listX: Listable = MakeEmptyList() + .Cons(0).Cons(1).Cons(2).Cons(3) +const listY: Listable = MakeList(0) + .Cons(1).Cons(2).Cons(3) +echo listX == listY +echo listX +echo listX.Reverse() +echo MakeEmptyList().Reverse() +echo Filter(listX, (value: number) => value % 2 != 0) +echo Map(listX, (value: number) => nr2char((value + 60), 1)) + +echo 4 listX.len() listY.len() +echo listX +echo listY + +const list3X: Listable = listX.Rest() +const list3Y: Listable = listY.Rest() +echo 3 list3X.len() list3Y.len() +echo list3X +echo list3Y + +const list2X: Listable = list3X.Rest() +const list2Y: Listable = list3Y.Rest() +echo 2 list2X.len() list2Y.len() +echo list2X +echo list2Y + +const list1X: Listable = list2X.Rest() +const list1Y: Listable = list2Y.Rest() +echo 1 list1X.len() list1Y.len() +echo list1X +echo list1Y + +const list0X: Listable = list1X.Rest() +const list0Y: Listable = list1Y.Rest() +echo 0 list0X.len() list0Y.len() +echo list0X +echo list0Y + +const list0X_: Listable = list0X.Rest() +const list0Y_: Listable = list0Y.Rest() +echo 0 list0X_.len() list0Y_.len() +echo list0X_ +echo list0Y_ + +const list0X__: Listable = list0X_.Rest() +const list0Y__: Listable = list0Y_.Rest() +echo 0 list0X__.len() list0Y__.len() +echo list0X__ +echo list0Y__ + + +const listZ: Listable = MakeList(MakeList(-1)) +const listZZ: Listable = listZ.Cons(MakeList(0)) + .Cons(MakeList(1)) + .Cons(MakeList(2)) + .Cons(MakeList(3)) +echo listZZ + diff --git a/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim b/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim new file mode 100644 index 0000000000..fb8f65116e --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim @@ -0,0 +1,177 @@ +vim9script +# VIM_TEST_SETUP let g:vimsyn_folding = "cf" +# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax +# VIM_TEST_SETUP hi link vim9DefTypeParam Todo +# See: https://github.com/vim/vim/pull/17313#issuecomment-3046696820 (Aliaksei Budavei) + +# See https://github.com/vim/vim/issues/14330#issuecomment-2028938515 . +export class Set + final _elements: dict + const _Mapper: func(number, string): any + const ToStringer: func(any): string + const FromStringer: func(string): any + + static def _Mapper(F: func(string): E): func(number, string): E + return ((G: func(string): E) => (_: number, v: string): E => G(v))(F) + enddef + + def new() + this._elements = {} + this._Mapper = _Mapper((s: string): E => eval(s)) + this.ToStringer = (a: E): string => string(a) + this.FromStringer = (s: string): E => eval(s) + enddef + + def newFromList(elements: list, ToStringer: func(E): string, + FromStringer: func(string): E) + this._elements = elements + ->reduce(((F: func(E): string) => (d: dict, v: E) => + extend({[F(v)]: 1}, d))(ToStringer), + {}) + this._Mapper = _Mapper(FromStringer) + this.ToStringer = ToStringer + this.FromStringer = FromStringer + enddef + + def _FromList(elements: list): Set + return Set.newFromList(elements, this.ToStringer, this.FromStringer) + enddef + + def Contains(element: E): bool + return has_key(this._elements, this.ToStringer(element)) + enddef + + def Elements(): list + return keys(this._elements)->mapnew(this._Mapper) + enddef + + def empty(): bool + return empty(this._elements) + enddef + + def len(): number + return len(this._elements) + enddef + + def string(): string + return string(keys(this._elements)) + enddef + + # {1, 2, 3} ⊇ {1, 2}. + def Superset(that: Set): bool + return (len(this._elements) >= len(that._elements)) && that._elements + ->keys() + ->indexof(((set: Set) => (_: number, v: string) => !set._elements + ->has_key(v))(this)) < 0 + enddef + + # {1, 2} ⊆ {1, 2, 3}. + def Subset(that: Set): bool + return (len(this._elements) <= len(that._elements)) && this._elements + ->keys() + ->indexof(((set: Set) => (_: number, v: string) => !set._elements + ->has_key(v))(that)) < 0 + enddef + + # {1, 2, 3} ∪ {2, 3, 4} = {1, 2, 3, 4}. + def Union(that: Set): Set + return this._FromList({} + ->extend(that._elements) + ->extend(this._elements) + ->keys() + ->map(this._Mapper)) + enddef + + # {1, 2, 3} ∩ {2, 3, 4} = {2, 3}. + def Intersection(that: Set): Set + return this._FromList(this._elements + ->keys() + ->filter(((set: Set) => (_: number, v: string) => set._elements + ->has_key(v))(that)) + ->map(this._Mapper)) + enddef + + # {1, 2, 3} \ {2, 3, 4} = {1}. + # {2, 3, 4} \ {1, 2, 3} = {4}. + def SetDifference(that: Set): Set + return this._FromList(this._elements + ->keys() + ->filter(((set: Set) => (_: number, v: string) => !set._elements + ->has_key(v))(that)) + ->map(this._Mapper)) + enddef + + # {1, 2, 3} △ {2, 3, 4} = {1, 4}. + def SymmetricDifference(that: Set): Set + return this.Union(that).SetDifference(this.Intersection(that)) + enddef +endclass + +############################################################ + +const ToStr: func(number): string = (s: number) => string(s) +const FromStr: func(string): number = (s: string) => str2nr(s) + +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .Subset(Set.newFromList([1, 2], ToStr, FromStr)) +echo Set.newFromList([1, 2], ToStr, FromStr) + .Subset(Set.newFromList([1, 2, 3], ToStr, FromStr)) +echo Set.newFromList([1, 2], ToStr, FromStr) + .Superset(Set.newFromList([1, 2, 3], ToStr, FromStr)) +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .Superset(Set.newFromList([1, 2], ToStr, FromStr)) + +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .Union(Set.newFromList([2, 3, 4], ToStr, FromStr)) + .Elements() +echo Set.newFromList([2, 3, 4], ToStr, FromStr) + .Union(Set.newFromList([1, 2, 3], ToStr, FromStr)) + .Elements() + +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .Intersection(Set.newFromList([2, 3, 4], ToStr, FromStr)) + .Elements() +echo Set.newFromList([2, 3, 4], ToStr, FromStr) + .Intersection(Set.newFromList([1, 2, 3], ToStr, FromStr)) + .Elements() + +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .SetDifference(Set.newFromList([2, 3, 4], ToStr, FromStr)) + .Elements() +echo Set.newFromList([2, 3, 4], ToStr, FromStr) + .SetDifference(Set.newFromList([1, 2, 3], ToStr, FromStr)) + .Elements() + +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .SymmetricDifference(Set.newFromList([2, 3, 4], ToStr, FromStr)) + .Elements() +echo Set.newFromList([2, 3, 4], ToStr, FromStr) + .SymmetricDifference(Set.newFromList([1, 2, 3], ToStr, FromStr)) + .Elements() + +############################################################ + +const none: Set = Set.new() +echo none.len() +echo none.empty() +echo none.string() +echo string(none.Elements()) + +const sets: Set = Set.newFromList( + [Set.new(), Set.new(), Set.new(), Set.new()], + (o: Set): string => string(o), + (_: string): Set => Set.new()) +echo sets.len() +echo sets.empty() +echo sets.string() +echo string(sets.Elements()) + +const lists: Set = Set.newFromList>( + [[[[[]]]]], + (o: list): string => string(o), + (s: string): list => eval(s)) +echo lists.len() +echo lists.empty() +echo lists.string() +echo string(lists.Elements>()) + diff --git a/runtime/syntax/testdir/input/vim9_generic_functions.vim b/runtime/syntax/testdir/input/vim9_generic_functions.vim new file mode 100644 index 0000000000..4800752d3f --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_generic_functions.vim @@ -0,0 +1,97 @@ +vim9script +# Vim9 generic functions +# VIM_TEST_SETUP let g:vimsyn_folding = "cf" +# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax +# VIM_TEST_SETUP hi link vim9DefTypeParam Todo + + +# :help generic-functions + +def MyFunc(param1: T): T + var f: A + var x = param1 + return x +enddef + +MyFunc>() + + +def Flatten(x: list>): list + var result: list = [] + for inner in x + result += inner + endfor + return result +enddef + +echo Flatten([[1, 2], [3]]) + + +class A + def Foo() + enddef +endclass +var a = A.new() +a.Foo() + + +def MakeEcho(): func(T): T + return (x: T): T => x +enddef + +var EchoNumber = MakeEcho() +echo EchoNumber(123) + +var EchoString = MakeEcho() +echo EchoString('abc') + +# FIXME: add specific command handling +# defcompile MyFunc, dict> + +# disassemble MyFunc> +# disassemble MyFunc> + + +# funcrefs + +var Foo = Bar +Execute(Bar) + +var Foo = bar.Baz +Execute(bar.Baz) + +class Foo + def _MethodA(arg: T) + echo arg + enddef + def MethodB() + var F = this._MethodA + F("text") + enddef +endclass + +class Bar extends Foo + def MethodC() + var F = super._MethodA + F("text") + enddef +endclass + + +# Issue: https://github.com/vim/vim/pull/17722#issuecomment-3075531052 + +export def Id(): func(U): U + return (X_: U) => X_ +enddef + +export def Const(): func(U): func(V): U + return (X_: U) => (_: V) => X_ +enddef + +export def Flip(): func(func(U): func(V): W): func(V): func(U): W + return (F_: func(U): func(V): W) => (Y_: V) => (X_: U) => F_(X_)(Y_) +enddef + +echo Const()(2)(null) + == Flip()(Const())(null)(2) + diff --git a/runtime/syntax/testdir/input/vim9_lambda.vim b/runtime/syntax/testdir/input/vim9_lambda.vim deleted file mode 100644 index 4340eb0990..0000000000 --- a/runtime/syntax/testdir/input/vim9_lambda.vim +++ /dev/null @@ -1,116 +0,0 @@ -vim9script - -# Vim 9 lambda expressions - -var Foo: func -var expr = 0 - -# without return type -Foo = () => expr -Foo = (_) => expr -Foo = (x) => expr - -Foo = (...y) => expr -Foo = (_, ...y) => expr -Foo = (x, ...y) => expr - -Foo = (x, y) => expr - -Foo = (_: number) => expr -Foo = (x: number) => expr - -Foo = (...y: list) => expr -Foo = (_: number, ...y: list) => expr -Foo = (x: number, ...y: list) => expr - -Foo = (x: number, y: number) => expr - -# with return type -Foo = (): number => expr -Foo = (_): number => expr -Foo = (x): number => expr - -Foo = (...y): number => expr -Foo = (_, ...y): number => expr -Foo = (x, ...y): number => expr - -Foo = (x, y): number => expr - -Foo = (_: number): number => expr -Foo = (x: number): number => expr - -Foo = (...y: list): number => expr -Foo = (_: number, ...y: list): number => expr -Foo = (x: number, ...y: list): number => expr - -Foo = (x: number, y: number): number => expr - - -# post operator comments - -Foo = () => # comment - expr -Foo = () => - # comment - expr -Foo = () => - - # comment - - expr - - -# line continuations - -Foo = (x: string, - \ y: number, - \ z: bool): number => expr -# FIXME -Foo = (x: string, - \ y: number, - \ z: bool): number - \ => expr - - -# funcref call - -echo (() => 42)() -echo ((x: string): number => 42)("foo") - - -# :help vim9-lambda - -var list = [1, 2, 3] -echo filter(list, (k, v) => - v > 0) -echo filter(list, (k, - \ v) - \ => v > 0) - -var Callback = (..._) => 'anything' -echo Callback(1, 2, 3) # displays "anything" - -var Lambda = (arg) => { - g:was_called = 'yes' - return expr - } - -var count = 0 -var timer = timer_start(500, (_) => { - count += 1 - echom 'Handler called ' .. count - }, {repeat: 3}) - -var dict = {} -var d = mapnew(dict, (k, v): string => { - return 'value' - }) - - -# Issue #15970 (vim9: Restore and extend the recognition of Enum body items) - -def Op(): func(func(number, number): number): func(number, Digit): number - return (F: func(number, number): number) => - (x: number, y: Digit): number => F(x, y.value) -enddef ####################### ^ vimCommand? - diff --git a/runtime/syntax/testdir/input/vim9_lambdas.vim b/runtime/syntax/testdir/input/vim9_lambdas.vim new file mode 100644 index 0000000000..4f7d1cde3c --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_lambdas.vim @@ -0,0 +1,161 @@ +vim9script +# Vim9 lambda expressions +# VIM_TEST_SETUP hi link vim9LambdaOperator Todo +# VIM_TEST_SETUP hi link vim9LambdaParen Todo + + +var Foo: func +var expr = 0 + +# without return type + +Foo = () => expr +Foo = (_) => expr +Foo = (x) => expr + +Foo = (...y) => expr +Foo = (_, ...y) => expr +Foo = (x, ...y) => expr + +Foo = (x, y) => expr + +Foo = (_: number) => expr +Foo = (x: number) => expr + +Foo = (...y: list) => expr +Foo = (_: number, ...y: list) => expr +Foo = (x: number, ...y: list) => expr + +Foo = (x: number, y: number) => expr + +# with return type + +Foo = (): number => expr +Foo = (_): number => expr +Foo = (x): number => expr + +Foo = (...y): number => expr +Foo = (_, ...y): number => expr +Foo = (x, ...y): number => expr + +Foo = (x, y): number => expr + +Foo = (_: number): number => expr +Foo = (x: number): number => expr + +Foo = (...y: list): number => expr +Foo = (_: number, ...y: list): number => expr +Foo = (x: number, ...y: list): number => expr + +Foo = (x: number, y: number): number => expr + +# with compound return type + +Foo = (): list => expr +Foo = (_): list => expr +Foo = (x): list => expr + +Foo = (...y): list => expr +Foo = (_, ...y): list => expr +Foo = (x, ...y): list => expr + +Foo = (x, y): list => expr + +Foo = (_: number): list => expr +Foo = (x: number): list => expr + +Foo = (...y: list): list => expr +Foo = (_: number, ...y: list): list => expr +Foo = (x: number, ...y: list): list => expr + +Foo = (x: number, y: number): list => expr + + +# Post-operator comments + +Foo = () => # comment + expr +Foo = () => + # comment + expr +Foo = () => + + # comment + + expr + + +# Line continuations + +Foo = (x: string, + \ y: number, + \ z: bool) => expr + +Foo = (x: string, + \ y: number, + \ z: bool) + \ => expr + +Foo = (x: string, + \ y: number, + \ z: bool): number => expr + +Foo = (x: string, + \ y: number, + \ z: bool): number + \ => expr + +Foo = (x: string, + \ y: number, + \ z: bool): + \ number => expr + + +# Funcref call + +echo (() => 42)() +echo ((x: string): number => 42)("foo") + + +# :help vim9-lambda + +var list = [1, 2, 3] +echo filter(list, (k, v) => + v > 0) +echo filter(list, (k, + \ v) + \ => v > 0) + +var Callback = (..._) => 'anything' +echo Callback(1, 2, 3) # displays "anything" + +var Lambda = (arg) => { + g:was_called = 'yes' + return expr + } + +var count = 0 +var timer = timer_start(500, (_) => { + count += 1 + echom 'Handler called ' .. count + }, {repeat: 3}) + +var dict = {} +var d = mapnew(dict, (k, v): string => { + return 'value' + }) + + +# Issue #15970 (vim9: Restore and extend the recognition of Enum body items) + +def Op(): func(func(number, number): number): func(number, Digit): number + return (F: func(number, number): number) => + (x: number, y: Digit): number => F(x, y.value) +enddef ####################### ^ vimCommand? + + +# Issue #16965 (vim syntax: wrong highlight with lambda, autoload, and false keyword) + +autocmd BufRead * timer_start(0, (_) => f#a(false, false)) +autocmd + diff --git a/runtime/syntax/testdir/input/vim9_legacy_header.vim b/runtime/syntax/testdir/input/vim9_legacy_header.vim index 66aeb39612..75fde68c68 100644 --- a/runtime/syntax/testdir/input/vim9_legacy_header.vim +++ b/runtime/syntax/testdir/input/vim9_legacy_header.vim @@ -1,3 +1,6 @@ +" Vim9 legacy script header + + " comment if !has('vim9script') @@ -14,3 +17,4 @@ vim9script noclear # string only recognised with leading char "useless string" + diff --git a/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim b/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim index 6e0e71e24d..db48abd967 100644 --- a/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim +++ b/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim @@ -1,4 +1,8 @@ -" VIM_TEST_SETUP let g:vimsyn_folding = "H" | set fdm=syntax +" Vim9 legacy script header +" VIM_TEST_SETUP let g:vimsyn_folding = "H" +" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax + + " comment if !has('vim9script') @@ -15,3 +19,4 @@ vim9script noclear # string only recognised with leading char "useless string" + diff --git a/runtime/syntax/testdir/input/vim9_no_comment_strings.vim b/runtime/syntax/testdir/input/vim9_no_comment_strings.vim new file mode 100644 index 0000000000..b9bdddb914 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_no_comment_strings.vim @@ -0,0 +1,27 @@ +vim9script +# Vim9 no comment strings +# VIM_TEST_SETUP let g:vimsyn_comment_strings = v:false + + +# pre "string" post + +function Foo() + " pre "string" post +endfunction + +def Bar() + # pre "string" post +enddef + +command Foo { + # pre "string" post +} + +autocmd BufNewFile * { + # pre "string" post +} + +{ + # pre "string" post +} + diff --git a/runtime/syntax/testdir/input/vim9_shebang.vim b/runtime/syntax/testdir/input/vim9_shebang.vim old mode 100755 new mode 100644 index c012fd9fc9..bd5ca914fc --- a/runtime/syntax/testdir/input/vim9_shebang.vim +++ b/runtime/syntax/testdir/input/vim9_shebang.vim @@ -1,7 +1,8 @@ #!/usr/bin/env vim -S vim9script +# Vim9 shebang line -# Vim shebang line # just a line comment #!/usr/bin/env vim -S + diff --git a/runtime/syntax/testdir/input/vim9_super_this_keywords.vim b/runtime/syntax/testdir/input/vim9_super_this_keywords.vim index 0370dd7681..43f29fedee 100644 --- a/runtime/syntax/testdir/input/vim9_super_this_keywords.vim +++ b/runtime/syntax/testdir/input/vim9_super_this_keywords.vim @@ -1,9 +1,9 @@ vim9script - # Vim9 this and super keywords # VIM_TEST_SETUP hi link vim9This Todo # VIM_TEST_SETUP hi link vim9Super Todo + def Echo(...args: list) echo args enddef diff --git a/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim b/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim index 326eaf099c..8db05e5501 100644 --- a/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim +++ b/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim @@ -1,5 +1,5 @@ vim9script - +# Vim9 this and super keywords # VIM_TEST_SETUP hi link vim9Super Todo # VIM_TEST_SETUP hi link vim9This Todo # See: https://github.com/vim/vim/pull/16476#issuecomment-2638191110 diff --git a/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim b/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim index fb1f610f88..a80c8c8737 100644 --- a/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim +++ b/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim @@ -1,5 +1,5 @@ vim9script - +# Vim9 this and super keywords # VIM_TEST_SETUP hi link vim9Super Todo # VIM_TEST_SETUP hi link vim9This Todo # See: https://github.com/vim/vim/pull/16476#issuecomment-2635119478 diff --git a/runtime/syntax/testdir/input/vim9_tuples.vim b/runtime/syntax/testdir/input/vim9_tuples.vim new file mode 100644 index 0000000000..2470f38b2f --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_tuples.vim @@ -0,0 +1,25 @@ +vim9script +# Vim9 tuples + + +# https://github.com/vim/vim/pull/16935#issuecomment-2738310273 + +function LegacyMakeEntry(key, value) abort + return (a:key, a:value) +endfunction + +def MakeEntry(key: string, value: any): tuple + return (key, value) +enddef + +function LegacyMakeLazyList(e1, e2) abort + return ({e1_, e2_ -> {-> [e1_, e2_]}}(a:e1, a:e2)) +endfunction + +def MakeLazyList(e1: any, e2: any): func(): list + return (((e1_: any, e2_: any) => () => [e1_, e2_])(e1, e2)) +enddef + +echo MakeEntry('key', 'value') == list2tuple(MakeLazyList('key', 'value')()) +echo LegacyMakeEntry('key', 'value') == list2tuple(LegacyMakeLazyList('key', 'value')()) + diff --git a/runtime/syntax/testdir/input/vim9_types.vim b/runtime/syntax/testdir/input/vim9_types.vim new file mode 100644 index 0000000000..81e76efd46 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_types.vim @@ -0,0 +1,17 @@ +vim9script +# Vim9 types +# VIM_TEST_SETUP hi link vimTypeAny Todo +# VIM_TEST_SETUP hi link vimVariableTypeAny Todo + + +# builtin types (distinct any highlighting) + +var foo: bool +var bar: any + +def Foo(arg: bool): bool +enddef + +def Bar(arg: any): any +enddef + diff --git a/runtime/syntax/testdir/input/vim9_variables.vim b/runtime/syntax/testdir/input/vim9_variables.vim index 88dfb58aae..8347bd7eee 100644 --- a/runtime/syntax/testdir/input/vim9_variables.vim +++ b/runtime/syntax/testdir/input/vim9_variables.vim @@ -1,7 +1,7 @@ vim9script - # Vim9 variable highlighting + # Declarations var foo = expr @@ -11,7 +11,7 @@ g:foo = expr t:foo = expr w:foo = expr -v:foo = expr +v:true = expr $FOO = expr @@ -47,6 +47,24 @@ var foo =<< eval trim END ... END +# Typed declarations + +var foo: tuple = expr +var foo: tuple = expr +var foo: tuple = expr +var foo: tuple<...list> = expr +var foo: tuple<...list> = expr +var foo: tuple> = expr + +var foo: tuple< + #\ comment + \number, + #\ comment + \string, + #\ comment + \bool + \> + # Assignments foo = expr @@ -58,6 +76,9 @@ foo[:2] = expr foo[1:] = expr foo[:] = expr +foo["key"] = expr +foo['key'] = expr + foo += expr foo -= expr foo *= expr @@ -106,36 +127,36 @@ $FOO ..= expr @f = expr @f ..= expr -&foo = expr +&ari = expr &t_k1 = "\[234;" -&foo ..= expr +&ari ..= expr -&foo += expr -&foo -= expr +&ari += expr +&ari -= expr -&l:foo = expr +&l:aleph = expr -&l:foo ..= expr -&l:foo += expr -&l:foo -= expr +&l:aleph ..= expr +&l:aleph += expr +&l:aleph -= expr -&g:foo = expr +&g:aleph = expr -&g:foo ..= expr -&g:foo += expr -&g:foo -= expr +&g:aleph ..= expr +&g:aleph += expr +&g:aleph -= expr [foo, bar] = expr [foo, \ bar] = expr -[v:foo, v:bar] = expr -[v:foo, - \ v:bar] = expr -[&foo, &bar] = expr -[&foo, - \ &bar] = expr +[v:true, v:false] = expr +[v:true, + \ v:false] = expr +[&ari, &bkc] = expr +[&ari, + \ &bkc] = expr [$foo, $bar] = expr [$foo, \ $bar] = expr @@ -154,18 +175,18 @@ $FOO ..= expr [foo, \ bar; \ baz] = expr -[v:foo, v:bar; v:baz] = expr -[v:foo, - \ v:bar; - \ v:baz] = expr +[v:true, v:false; v:none] = expr +[v:true, + \ v:false; + \ v:none] = expr [$foo, $bar; $baz] = expr [$foo, \ $bar; \ $baz] = expr -[&foo, &bar; &baz] = expr -[&foo, - \ &bar; - \ &baz] = expr +[&ari, &bkc; &cmp] = expr +[&ari, + \ &bkc; + \ &cmp] = expr [@a, @b; @c] = expr [@a, \ @b; @@ -195,3 +216,25 @@ endfor for [foo, bar] in expr endfor +# Scope dictionaries + +echo get(b:, 'foo', 42) +echo get(w:, 'foo', 42) +echo get(t:, 'foo', 42) +echo get(g:, 'foo', 42) +echo get(v:, 'foo', 42) + +for k in keys(b:) | echo b:[k] | endfor +for k in keys(w:) | echo w:[k] | endfor +for k in keys(t:) | echo t:[k] | endfor +for k in keys(g:) | echo g:[k] | endfor +for k in keys(v:) | echo v:[k] | endfor + +# Neovim-specific variables (not highlighted by default) + +echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum + +echo &channel &inccommand &mousescroll &pumblend &redrawdebug &scrollback +echo &shada &shadafile &statuscolumn &termpastefilter &termsync &winbar +echo &winblend &winhighlight + diff --git a/runtime/syntax/testdir/input/vim_comment.vim b/runtime/syntax/testdir/input/vim_comment.vim deleted file mode 100644 index f382f8df79..0000000000 --- a/runtime/syntax/testdir/input/vim_comment.vim +++ /dev/null @@ -1,68 +0,0 @@ -" Vim comments - -" Legacy-script comment - -# 42 " comment - -function! Foo() - " Legacy-script comment - # 42 " comment -endfunction - -def! Bar() - # Vim9-script comment - "useless string" # comment -enddef - -command -nargs=1 FooCommand { - # Vim9-script comment - "useless string" # comment -} - -autocmd BufNewFile * { - # Vim9-script comment - "useless string" # comment -} - - -" Multiline comments - -" comment - \ continuing comment - \ continuing comment - -" :Foo - \ arg1 - "\ comment - \ arg2 - -echo "TOP" - - -" Line-continuation comments - -:Foo - "\ line continuation comment - \ arg1 - "\ line continuation comment - \ arg2 - - -" Issue: #13047 - -if !exists(":DiffOrig") - command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis - \ | wincmd p | diffthis -endif - - -" Issue: #11307 and #11560 - -" This is what we call " blah - - -" Issue # #9587 - -def CommentTitle() - # Title: ... -enddef diff --git a/runtime/syntax/testdir/input/vim_comment_strings.vim b/runtime/syntax/testdir/input/vim_comment_strings.vim new file mode 100644 index 0000000000..0626403941 --- /dev/null +++ b/runtime/syntax/testdir/input/vim_comment_strings.vim @@ -0,0 +1,22 @@ +" Vim comment strings +" VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true + + +" pre "string" post + +function Foo() + " pre "string" post +endfunction + +def Bar() + # pre "string" post +enddef + +command Foo { + # pre "string" post +} + +autocmd BufNewFile * { + # pre "string" post +} + diff --git a/runtime/syntax/testdir/input/vim_comments.vim b/runtime/syntax/testdir/input/vim_comments.vim new file mode 100644 index 0000000000..0cababe111 --- /dev/null +++ b/runtime/syntax/testdir/input/vim_comments.vim @@ -0,0 +1,74 @@ +" Vim comments + + +" Legacy-script comment + +# 42 " comment + +function! Foo() + " Legacy-script comment + # 42 " comment +endfunction + +def! Bar() + # Vim9-script comment + "useless string" # comment +enddef + +command -nargs=1 FooCommand { + # Vim9-script comment + "useless string" # comment +} + +autocmd BufNewFile * { + # Vim9-script comment + "useless string" # comment +} + + +" Multiline comments + +" comment + \ continuing comment + \ continuing comment + +let foo = 42 " commment + \ continuing comment + \ continuing comment + +" :Foo + \ arg1 + "\ comment + \ arg2 + +echo "TOP" + + +" Line-continuation comments + +:Foo + "\ line continuation comment + \ arg1 + "\ line continuation comment + \ arg2 + + +" Issue: #13047 + +if !exists(":DiffOrig") + command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis + \ | wincmd p | diffthis +endif + + +" Issue: #11307 and #11560 + +" This is what we call " blah + + +" Issue # #9587 + +def CommentTitle() + # Title: ... +enddef + diff --git a/runtime/syntax/testdir/input/vim_ex_abbreviate.vim b/runtime/syntax/testdir/input/vim_ex_abbreviate.vim index 7360e38317..5965311e82 100644 --- a/runtime/syntax/testdir/input/vim_ex_abbreviate.vim +++ b/runtime/syntax/testdir/input/vim_ex_abbreviate.vim @@ -1,20 +1,24 @@ " Vim :abbreviate commands +" VIM_TEST_SETUP hi link vimMapLhs Identifier +" VIM_TEST_SETUP hi link vimMapRhs Todo +" VIM_TEST_SETUP hi link vimMapRhsContinue Todo + abbrev foo foobar cabbrev cfoo cfoobar -iabbrev ifoo cfoobar +iabbrev ifoo ifoobar abbrev foo foobar cabbrev cfoo cfoobar -iabbrev ifoo cfoobar +iabbrev ifoo ifoobar noreabbrev foo foobar cnoreabbrev cfoo cfoobar -inoreabbrev ifoo cfoobar +inoreabbrev ifoo ifoobar abbrev foo foobar cabbrev cfoo cfoobar -iabbrev ifoo cfoobar +iabbrev ifoo ifoobar unabbrev foo cunabbrev cfoo @@ -23,3 +27,28 @@ iunabbrev ifoo abclear cabclear iabclear + + +" Multiline RHS + +abbrev foo + \ foobar + +abbrev foo + \ + \ foobar + +abbrev foo + "\ comment + \ foobar + +abbrev foo + "\ comment + \ foo + "\ comment + \bar + +abbrev lhs + "\ comment (matches as RHS but harmless) +echo "clear" + diff --git a/runtime/syntax/testdir/input/vim_ex_augroup.vim b/runtime/syntax/testdir/input/vim_ex_augroup.vim index 2dae59dda5..f7022ecd88 100644 --- a/runtime/syntax/testdir/input/vim_ex_augroup.vim +++ b/runtime/syntax/testdir/input/vim_ex_augroup.vim @@ -1,19 +1,62 @@ " Vim :augroup command +" VIM_TEST_SETUP let g:vimsyn_folding = "a" +" VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax +" VIM_TEST_SETUP hi link vimAugroupName Todo + augroup foo - autocmd BufRead * echomsg "Foo" + autocmd! + autocmd BufRead * echo "Foo" augroup END -augroup foo | autocmd! | augroup END +augroup foo | autocmd! | augroup END augroup! foo augroup !@#$%^&*()_+ autocmd BufRead * echomsg "Foo" augroup END -augroup !@#$%^&*()_+ | autocmd! | augroup END +augroup !@#$%^&*()_+ | autocmd! | augroup END +augroup! !@#$%^&*()_+ + +augroup !@#$%^&*()_+ | autocmd! | augroup END augroup! !@#$%^&*()_+ +augroup no\|echo | autocmd! | augroup END +augroup! no\|echo + +augroup no\"echo | autocmd! | augroup END +augroup! no\"echo + +augroup \|echo\| | autocmd! | augroup END +augroup! \|echo\| + +augroup \"echo\" | autocmd! | augroup END +augroup! \"echo\" + +augroup \|\" | autocmd! | augroup END +augroup! \|\" + +augroup \"\| | autocmd! | augroup END +augroup! \"\| + + +augroup foo"comment + au! + au BufRead * echo "Foo" +augroup END"comment + +augroup foo|echo "Foo" + au! + au BufRead * echo "Foo" +augroup END|echo "Foo" + +augroup! foo"comment +augroup! foo|echo "Foo" + + " list groups augroup +augroup | echo "Foo" +augroup " comment diff --git a/runtime/syntax/testdir/input/vim_ex_autocmd.vim b/runtime/syntax/testdir/input/vim_ex_autocmd.vim new file mode 100644 index 0000000000..2216a427ec --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_autocmd.vim @@ -0,0 +1,257 @@ +" Vim :autocmd command +" VIM_TEST_SETUP hi link vimAutoCmdGroup Todo +" VIM_TEST_SETUP hi link vimUserAutoEvent Title + + +" Define + +autocmd foogroup BufRead *.txt echo "Foo" | echo "Bar" +autocmd BufRead *.txt echo "Foo" | echo "Bar" +autocmd BufRead,BufNewFile *.txt echo "Foo" | echo "Bar" +autocmd User FooEvent echo "Foo" | echo "Bar" + +autocmd foogroup BufRead *.txt ++once echo "Foo" | echo "Bar" +autocmd BufRead *.txt ++once echo "Foo" | echo "Bar" +autocmd BufRead,BufNewFile *.txt ++once echo "Foo" | echo "Bar" +autocmd User FooEvent ++once echo "Foo" | echo "Bar" + +autocmd foogroup BufRead *.txt ++nested echo "Foo" | echo "Bar" +autocmd BufRead *.txt ++nested echo "Foo" | echo "Bar" +autocmd BufRead,BufNewFile *.txt ++nested echo "Foo" | echo "Bar" +autocmd User FooEvent ++nested echo "Foo" | echo "Bar" + +autocmd foogroup BufRead *.txt ++once ++nested echo "Foo" | echo "Bar" +autocmd BufRead *.txt ++once ++nested echo "Foo" | echo "Bar" +autocmd BufRead,BufNewFile *.txt ++once ++nested echo "Foo" | echo "Bar" +autocmd User FooEvent ++once ++nested echo "Foo" | echo "Bar" + +autocmd foogroup BufRead ++once ++nested echo "Foo" | echo "Bar" +autocmd foogroup BufRead ++once ++nested echo "Foo" | echo "Bar" +autocmd foogroup BufRead ++once ++nested echo "Foo" | echo "Bar" +autocmd BufRead ++once ++nested echo "Foo" | echo "Bar" +autocmd BufRead ++once ++nested echo "Foo" | echo "Bar" +autocmd BufRead ++once ++nested echo "Foo" | echo "Bar" +autocmd BufRead,BufNewFile ++once ++nested echo "Foo" | echo "Bar" +autocmd BufRead,BufNewFile ++once ++nested echo "Foo" | echo "Bar" +autocmd BufRead,BufNewFile ++once ++nested echo "Foo" | echo "Bar" +autocmd User FooEvent,BarEvent ++once ++nested echo "Foo" | echo "Bar" + +autocmd foogroup BufRead foo ++once ++nested echo "Foo" | echo "Bar" + +autocmd BufRead *.txt { + echo "Foo" + echo "Bar" +} +autocmd BufRead,BufNewFile *.txt { + echo "Foo" + echo "Bar" +} +autocmd User FooEvent { + echo "Foo" + echo "Bar" +} +autocmd foogroup BufRead *.txt { + echo "Foo" + echo "Bar" +} + + +" Multiline {cmd} arg + +autocmd BufRead *.txt echo "Foo" + \| echo "Bar" + \| echo "Baz" + +autocmd BufRead *.txt echo "Foo" | + \ echo "Bar" | + \ echo "Baz" + +autocmd BufRead *.txt + "\ comment + \ echo "Foo" | + "\ comment + \ echo "Bar" + "\ comment + \| echo "Baz" + +autocmd BufRead,BufNewFile *.txt + "\ comment + \ echo "Foo" | + "\ comment + \ echo "Bar" + "\ comment + \| echo "Baz" +autocmd User FooEvent + "\ comment + \ echo "Foo" | + "\ comment + \ echo "Bar" + "\ comment + \| echo "Baz" +autocmd foogroup BufRead *.txt + "\ comment + \ echo "Foo" | + "\ comment + \ echo "Bar" + "\ comment + \| echo "Baz" + + +" Multiple patterns + +autocmd BufRead *.txt,*.vim,*.c echo "Foo" | echo "Bar" +autocmd BufRead ,*.vim,*.c echo "Foo" | echo "Bar" +autocmd BufRead *.txt,,*.c echo "Foo" | echo "Bar" +autocmd BufRead *.txt,*.vim, echo "Foo" | echo "Bar" + +autocmd BufRead ,, echo "Foo" | echo "Bar" + + +" FIXME: "BufRead" and "*" are valid group names, however, :help :augroup +" explicitly directs the user NOT to shadow event names with group names +autocmd BufRead BufRead *.txt ++once ++nested echo "Foo" +autocmd * BufRead *.txt ++once ++nested echo "Foo" + + +" Remove + +autocmd! foogroup BufRead *.txt ++once ++nested echo "Foo" | echo "Bar" +autocmd! BufRead *.txt ++once ++nested echo "Foo" | echo "Bar" +autocmd! foogroup User FooEvent ++once ++nested echo "Foo" | echo "Bar" +autocmd! User FooEvent ++once ++nested echo "Foo" | echo "Bar" + +autocmd! foogroup BufRead *.txt +autocmd! BufRead *.txt +autocmd! foogroup User FooEvent +autocmd! User FooEvent + +autocmd! foogroup * *.txt +autocmd! * *.txt + +autocmd! foogroup BufRead +autocmd! BufRead +autocmd! foogroup User FooEvent +autocmd! User FooEvent + +autocmd! foogroup +autocmd! + +" command -> bang -> group "!foogroup!" +autocmd!!foogroup! +" command -> bang -> group "foogroup" +autocmd!foogroup +" command -> bang -> event +autocmd!BufRead +" command -> bang -> user event +autocmd!User FooEvent + +" FIXME: "*" and "BufRead" are valid group names, however, :help :augroup +" explicitly directs the user NOT to shadow event names +" command -> group "*" -> event glob -> pattern +autocmd!* * *.txt +" command -> group "BufRead" -> event "BufRead" -> pattern +autocmd!BufRead BufRead *.txt + + +" List + +autocmd foogroup BufRead *.txt +autocmd BufRead *.txt + +autocmd foogroup * *.txt +autocmd * *.txt + +autocmd foogroup BufRead +autocmd BufRead +autocmd foogroup User FooEvent +autocmd User FooEvent + +autocmd foogroup +autocmd + + +" :doautoall + +doautoall BufRead + +doautoall BufRead *.txt +doautoall foogroup BufRead +doautoall BufRead + +doautoall foogroup BufRead *.txt + +doautoall User FooEvent +doautoall foogroup User FooEvent +doautoall User FooEvent + +doautoall foogroup User FooEvent + +doautoall foogroup BufRead *.txt | echo "Foo" +doautoall foogroup BufRead *.txt " comment + + +" :doautocmd + +doautocmd BufRead + +doautocmd BufRead *.txt +doautocmd foogroup BufRead +doautocmd BufRead + +doautocmd foogroup BufRead *.txt + +doautocmd User FooEvent +doautocmd User FooEvent,BarEvent +doautocmd foogroup User FooEvent +doautocmd User FooEvent + +doautocmd foogroup User FooEvent + +doautocmd foogroup BufRead *.txt | echo "Foo" +doautocmd foogroup BufRead *.txt | " comment + + +" Patterns + +au BufRead */*.txt + +au BufRead */*.* +au BufRead */*.??? +au BufRead */*.[t][x]t + +au BufRead */*.[a-z][a-z]t +au BufRead */*.[[:alpha:][:alpha:]]t + +au BufRead */*.[tx]\\\{2\}t +au BufRead */*.[a-z]\\\{2\}t +au BufRead */*.[[:alpha:]]\\\{2\}t +au BufRead */*.[^[:punct:]]\\\{2\}t + +au BufRead */*.[]]xt +au BufRead */*.[^]]xt + +au BufRead */*.[t\]]xt +au BufRead */*.[^t\]]xt + +au BufRead */*.[[]xt +au BufRead */*.[^[]xt + +au BufRead */*.[-]xt +au BufRead */*.[^-]xt + +au BufRead */*.[-t-]xt +au BufRead */*.[^-t-]xt + +au BufRead */*.[\^]xt +au BufRead */*.[^^]xt + +au BufRead */*.txt,*/*.vim +au BufRead */*.{txt,vim} +au BufRead */*.{t{x,t},v{i,m}} + +" literal +au BufRead */*.[]xt +au BufRead */*.[\]xt +au BufRead */*.[^]xt +au BufRead */*.[^\]xt + diff --git a/runtime/syntax/testdir/input/vim_ex_behave.vim b/runtime/syntax/testdir/input/vim_ex_behave.vim index a1e99f0d8a..6f5e5ec124 100644 --- a/runtime/syntax/testdir/input/vim_ex_behave.vim +++ b/runtime/syntax/testdir/input/vim_ex_behave.vim @@ -1,7 +1,9 @@ -" Vim behave command +" Vim :behave command + behave mswin behave xterm behave! mswin behave! xterm + diff --git a/runtime/syntax/testdir/input/vim_ex_call.vim b/runtime/syntax/testdir/input/vim_ex_call.vim index ae6bdc99e8..809a4103f3 100644 --- a/runtime/syntax/testdir/input/vim_ex_call.vim +++ b/runtime/syntax/testdir/input/vim_ex_call.vim @@ -1,7 +1,7 @@ " Vim :call command -" functions for which there are same-named Ex commands +" Functions with same-named Ex commands call browse(save, title, initdir, default) call call(func, arglist, dict) @@ -49,3 +49,4 @@ call Foo(arg1, arg2) let res = call(func, arglist, dict) let res = call (func, arglist, dict) + diff --git a/runtime/syntax/testdir/input/vim_ex_catch.vim b/runtime/syntax/testdir/input/vim_ex_catch.vim index f0e2a8fdc3..f7fad2672f 100644 --- a/runtime/syntax/testdir/input/vim_ex_catch.vim +++ b/runtime/syntax/testdir/input/vim_ex_catch.vim @@ -1,5 +1,6 @@ " Vim :catch command + " :help :catch catch /^Vim:Interrupt$/ " catch interrupts (CTRL-C) @@ -15,3 +16,4 @@ catch " same as /.*/ try | sleep 100 | catch /^Vim:Interrupt$/ | endtry try | edit | catch /^Vim(edit):E\d\+/ | echo "error" | endtry + diff --git a/runtime/syntax/testdir/input/vim_ex_command.vim b/runtime/syntax/testdir/input/vim_ex_command.vim index 0873648cb6..a2f01a708e 100644 --- a/runtime/syntax/testdir/input/vim_ex_command.vim +++ b/runtime/syntax/testdir/input/vim_ex_command.vim @@ -1,15 +1,19 @@ " Vim :command, :delcommand and :comclear commands +" VIM_TEST_SETUP hi link vimUserCmdName Todo +" VIM_TEST_SETUP hi link vimDelcommandName Todo -" list +" List command command F -" define + +" Define command Foo echo "Foo" command! Foo echo "Foo" + command! Foo echo "Foo" | echo "Bar" command! Foo { @@ -18,11 +22,27 @@ command! Foo { echo "Baz" } +command! -addr=arguments -bang -bar -buffer -complete=arglist -count=1 -keepscript -nargs=* -range=% -register Foo echo "Foo" + command! -addr=arguments -bang -bar -buffer -complete=arglist -count=1 -keepscript -nargs=* -range=% -register Foo \ echo "Foo" -command! -complete=custom,Completer1 Foo echo "Foo" -command! -complete=customlist,Completer2 Foo echo "Foo" +command! -addr=arguments -bang -bar -buffer -complete=arglist -count=1 -keepscript -nargs=* -range=% -register + \ Foo + \ echo "Foo" + +command! -addr=arguments -bang -bar -buffer -complete=arglist -count=1 -keepscript -nargs=* -range=% -register Foo + "\ comment + \ echo "Foo" + +command! -addr=arguments -bang -bar -buffer -complete=arglist -count=1 -keepscript -nargs=* -range=% -register + "\ comment + \ Foo + "\ comment + \ echo "Foo" + +command! -complete=custom,s:Completer1 Foo echo "Foo" +command! -complete=customlist,s:Completer2 Foo echo "Foo" function Foo() command! Foo echo "Foo (defined in :function)" @@ -32,43 +52,145 @@ def Foo2() command! Foo echo "Foo (defined in :def)" enddef -" multiline define - -" command! -" \ -addr=lines -" \ -bang -" \ -bar -" \ -buffer -" \ -complete=buffer -" \ -count -" \ -nargs=* -" \ -range -" \ -register -" \ -keepscript -" \ Foo -" \ echo "FOO" -" errors +" Multiline define + +command! -addr=lines + \ -bang + \ -bar + \ -buffer + \ -complete=buffer + \ -count + \ -nargs=* + \ -range + \ -register + \ -keepscript + \ Foo + \ echo "Foo" | + \ echo "Bar" + +command! + \ -addr=lines + \ -bang + \ -bar + \ -buffer + \ -complete=buffer + \ -count + \ -nargs=* + \ -range + \ -register + \ -keepscript + \ Foo + \ echo "Foo" | + \ echo "Bar" + +command! + "\ comment + \ -addr=lines + \ -bang + "\ comment + "\ comment + \ -bar + \ -buffer + "\ comment + \ -complete=buffer + "\ comment + \ -count + "\ comment + \ -nargs=* + "\ comment + \ -range + "\ comment + \ -register + "\ comment + \ -keepscript + "\ comment + \ Foo + "\ comment + \ echo "Foo" | + "\ comment + \ echo "Bar" + + +" Errors command! -badattr=arguments -bang -badattr -nargs=* Foo echo "Foo" -" delete + +" Delete delcommand Foo delcommand -buffer Foo -delcommand Foo | echo "..." -delcommand -buffer Foo | echo "..." +delcommand Foo | echo "Foo" +delcommand -buffer Foo | echo "Foo" delcommand Foo " comment delcommand -buffer Foo " comment comclear comclear " comment -comclear | echo "..." +comclear | echo "Foo" -" Issue #14135 +" Issue #14135 (vim.vim syntax highlighting broken wrt system()) com Foo call system('ls') + +" Issue #17001 (Wrong vimUserCmdAttrError highlighting in vim.vim) + +command! -bang -nargs=* -complete=file Make AsyncRun -program=make @ + + +" Issue #17326 (syntax highlighting breaks with complex :s comamnd) + +command -range=% -nargs=? -bang Tb { + if "" == "!" + :,s/\v"[^"]*"/\=substitute(submatch(0), " ", "•", "g")/ge + endif + if "" == "" + :,!column -t + else + :,!column -t -s'' + endif + if "" == "!" + :,s/•/ /ge + endif +} + +command -range=% -nargs=? -bang Tb :,s/\v"[^"]*"/\=substitute(submatch(0), " ", "•", "g")/ge + + +" Unreported issue (:map with trailing bar in replacement text) + +command! Foo + \ map lhs rhs | + \ abbreviate foo bar | + \ echo "Foo" + + +" Issue #18414 (Syntax group vimUserCmdReplacement lacking a keepend?) + +def Vim9Context() + command! MyFunction MyFunc() + # I am a comment + + command! ToggleWrap setlocal wrap! + # I am a comment but I didn't get highlighted +enddef + +command! MyFunction call MyFunc() +" I am a comment + +command! ToggleWrap setlocal wrap! +" I am a comment but I didn't get highlighted + + +" Issue #18448 (comment for subsequent command is not highlighted) + +def Vim9Context() + command! -nargs=1 -complete=file Rg :term rg + # command! -nargs=1 -complete=file Rg :term ++shell rg +enddef + diff --git a/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim b/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim new file mode 100644 index 0000000000..64b4782f69 --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim @@ -0,0 +1,135 @@ +" Vim Ex command modifiers + + + aboveleft echo "Foo" + +aboveleft echo "Foo" +belowright echo "Foo" +botright echo "Foo" +browse echo "Foo" +confirm echo "Foo" +filter /pattern/ echo "Foo" +filter! /pattern/ echo "Foo" +hide echo "Foo" +horizontal echo "Foo" +keepalt echo "Foo" +keepjumps echo "Foo" +keepmarks echo "Foo" +keeppatterns echo "Foo" +leftabove echo "Foo" +legacy echo "Foo" +lockmarks echo "Foo" +noautocmd echo "Foo" +noswapfile echo "Foo" +rightbelow echo "Foo" +sandbox echo "Foo" +silent echo "Foo" +silent! echo "Foo" +tab echo "Foo" +topleft echo "Foo" +unsilent echo "Foo" +verbose echo "Foo" +vertical echo "Foo" +vim9cmd echo "Foo" + + +: aboveleft echo "Foo" + " FIXME: not a ternary operator ':' + : aboveleft echo "Foo" + :aboveleft echo "Foo" + +:aboveleft echo "Foo" +:belowright echo "Foo" +:botright echo "Foo" +:browse echo "Foo" +:confirm echo "Foo" +:filter /pattern/ echo "Foo" +:filter! /pattern/ echo "Foo" +:hide echo "Foo" +:horizontal echo "Foo" +:keepalt echo "Foo" +:keepjumps echo "Foo" +:keepmarks echo "Foo" +:keeppatterns echo "Foo" +:leftabove echo "Foo" +:legacy echo "Foo" +:lockmarks echo "Foo" +:noautocmd echo "Foo" +:noswapfile echo "Foo" +:rightbelow echo "Foo" +:sandbox echo "Foo" +:silent echo "Foo" +:silent! echo "Foo" +:tab echo "Foo" +:topleft echo "Foo" +:unsilent echo "Foo" +:verbose echo "Foo" +:vertical echo "Foo" +:vim9cmd echo "Foo" + + +echo|aboveleft echo "Foo" +echo| aboveleft echo "Foo" +echo |aboveleft echo "Foo" + +echo | aboveleft echo "Foo" +echo | belowright echo "Foo" +echo | botright echo "Foo" +echo | browse echo "Foo" +echo | confirm echo "Foo" +echo | filter /pattern/ echo "Foo" +echo | filter! /pattern/ echo "Foo" +echo | hide echo "Foo" +echo | horizontal echo "Foo" +echo | keepalt echo "Foo" +echo | keepjumps echo "Foo" +echo | keepmarks echo "Foo" +echo | keeppatterns echo "Foo" +echo | leftabove echo "Foo" +echo | legacy echo "Foo" +echo | lockmarks echo "Foo" +echo | noautocmd echo "Foo" +echo | noswapfile echo "Foo" +echo | rightbelow echo "Foo" +echo | sandbox echo "Foo" +echo | silent echo "Foo" +echo | silent! echo "Foo" +echo | tab echo "Foo" +echo | topleft echo "Foo" +echo | unsilent echo "Foo" +echo | verbose echo "Foo" +echo | vertical echo "Foo" +echo | vim9cmd echo "Foo" + + +aboveleft belowright botright browse confirm filter /pattern/ filter! /pattern/ hide horizontal keepalt keepjumps keepmarks keeppatterns leftabove legacy lockmarks noautocmd noswapfile rightbelow sandbox silent silent! tab topleft unsilent verbose vertical vim9cmd echo "Foo" +aboveleft + \ belowright + \ botright + \ browse + \ confirm + \ filter /pattern/ + \ filter! /pattern/ + \ hide + \ horizontal + \ keepalt + \ keepjumps + \ keepmarks + \ keeppatterns + \ leftabove + \ legacy + \ lockmarks + \ noautocmd + \ noswapfile + \ rightbelow + \ sandbox + \ silent + \ silent! + \ tab + \ topleft + \ unsilent + \ verbose + \ vertical + \ vim9cmd + \ echo "Foo" + diff --git a/runtime/syntax/testdir/input/vim_ex_commands.vim b/runtime/syntax/testdir/input/vim_ex_commands.vim index 9fa1458ccd..351e20ad83 100644 --- a/runtime/syntax/testdir/input/vim_ex_commands.vim +++ b/runtime/syntax/testdir/input/vim_ex_commands.vim @@ -1,5 +1,6 @@ " Ex commands + " START NOT MATCHED :@ :@@ @@ -13,8 +14,6 @@ : help : help # FIXME -:2match -:3match :append text . @@ -540,6 +539,7 @@ :unabbreviate :unabbreviate :unhide +:uniq :unlet :unlockvar :unmap @@ -597,8 +597,6 @@ call Foo() | help call Foo() |help call Foo()| help -call Foo() | 2match -call Foo() | 3match " FIXME call Foo() | append text @@ -1126,6 +1124,7 @@ call Foo() | undolist call Foo() | unabbreviate call Foo() | unabbreviate call Foo() | unhide +call Foo() | uniq call Foo() | unlet call Foo() | unlockvar call Foo() | unmap diff --git a/runtime/syntax/testdir/input/vim_ex_comment_strings.vim b/runtime/syntax/testdir/input/vim_ex_comment_strings.vim deleted file mode 100644 index 4214d6b3a0..0000000000 --- a/runtime/syntax/testdir/input/vim_ex_comment_strings.vim +++ /dev/null @@ -1,20 +0,0 @@ -" Vim comment strings -" VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true - -" pre "string" post - -function Foo() - " pre "string" post -endfunction - -def Bar() - # pre "string" post -enddef - -command Foo { - # pre "string" post -} - -autocmd BufNewFile * { - # pre "string" post -} diff --git a/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim b/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim index 965c543da8..27c93a0e6c 100644 --- a/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim +++ b/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim @@ -1,5 +1,6 @@ " Vim :debuggreedy command + debuggreedy 0debuggreedy diff --git a/runtime/syntax/testdir/input/vim_ex_def.vim b/runtime/syntax/testdir/input/vim_ex_def.vim index d379d8f450..7b1d39f4d1 100644 --- a/runtime/syntax/testdir/input/vim_ex_def.vim +++ b/runtime/syntax/testdir/input/vim_ex_def.vim @@ -1,7 +1,7 @@ " Vim :def command -" list +" List def def Foo @@ -13,7 +13,7 @@ def Foo | echo "Foo" def Foo " comment -" definition +" Definition " empty definition def Foo() @@ -60,7 +60,7 @@ def s:ls() enddef -" return types +" Return types def Foo(): void enddef @@ -88,7 +88,7 @@ def Foo() enddef # comment -" parameters +" Parameters def Foo(x: bool, y = 42, z: string = "zed") enddef @@ -99,13 +99,13 @@ def Foo( z: string = "zed") enddef -" Issue #16243 (vimscript def parameters syntax highlight is wrong) +" Issue #16243 (Vim script def parameters syntax highlight is wrong) def Test(lines: list = [line('.'), line('.')]): void enddef -" comments +" Comments def Foo() # Vim9-script comment @@ -113,13 +113,13 @@ def Foo() enddef -" leading command separator +" Leading command separator echo "Foo" | def Foo() enddef -" command modifiers +" Command modifiers silent! def Foo() enddef diff --git a/runtime/syntax/testdir/input/vim_ex_def_fold.vim b/runtime/syntax/testdir/input/vim_ex_def_fold.vim index 0d344ed99a..00aff00e89 100644 --- a/runtime/syntax/testdir/input/vim_ex_def_fold.vim +++ b/runtime/syntax/testdir/input/vim_ex_def_fold.vim @@ -3,7 +3,7 @@ " VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax -" list +" List def def Foo @@ -15,7 +15,7 @@ def Foo | echo "Foo" def Foo " comment -" definition +" Definition " empty definition def Foo() @@ -62,7 +62,7 @@ def s:ls() enddef -" return types +" Return types def Foo(): void enddef @@ -90,7 +90,7 @@ def Foo() enddef # comment -" parameters +" Parameters def Foo(x: bool, y = 42, z: string = "zed") enddef @@ -102,7 +102,7 @@ def Foo( enddef -" comments +" Comments def Foo() # Vim9-script comment @@ -110,19 +110,19 @@ def Foo() enddef -" command modifiers +" Command modifiers silent! def Foo() enddef -" leading command separator +" Leading command separator echo "Foo" | def Foo() enddef -" fold-region ending +" Fold-region ending def Foo() # enddef diff --git a/runtime/syntax/testdir/input/vim_ex_def_nested.vim b/runtime/syntax/testdir/input/vim_ex_def_nested.vim index 3b9302d94e..57800ebcd3 100644 --- a/runtime/syntax/testdir/input/vim_ex_def_nested.vim +++ b/runtime/syntax/testdir/input/vim_ex_def_nested.vim @@ -2,6 +2,7 @@ vim9script # Vim9 :def command (nested) # VIM_TEST_SETUP hi link vim9This Todo + class Test const name: string @@ -19,3 +20,4 @@ class Test endclass echo Test.new() + diff --git a/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim b/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim index f21310754b..897d25e50f 100644 --- a/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim +++ b/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim @@ -1,10 +1,10 @@ vim9script - # Vim9 :def command (nested) # VIM_TEST_SETUP let g:vimsyn_folding = 'f' # VIM_TEST_SETUP setl fdc=2 fdm=syntax # VIM_TEST_SETUP hi link vim9This Todo + class Test const name: string @@ -22,3 +22,4 @@ class Test endclass echo Test.new() + diff --git a/runtime/syntax/testdir/input/vim_ex_def_return_type.vim b/runtime/syntax/testdir/input/vim_ex_def_return_type.vim new file mode 100644 index 0000000000..af88721ff4 --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_def_return_type.vim @@ -0,0 +1,60 @@ +vim9script +# Vim9 function return types +# VIM_TEST_SETUP hi link vimUserType Todo + + +# Issue #14442 (vim.vim: confusion for function return types starting on another line) + +def TestA______________________________________________________________(): + \ void +enddef + +def TestB____(result: dict>, fs: list): + \ void +enddef + +def TestC____(maybe: bool, F: func(): dict): func(): + \ void + return () => { + } +enddef + +def TestD____(fs: list>): func(): func(): + \ void + return () => () => { + } +enddef + +class Tests + def TestA__________________________________________________________(): + \ void + enddef + + def TestB(result: dict>, fs: list): + \ void + enddef + + def TestC(maybe: bool, F: func(): dict): func(): + \ void + return () => { + } + enddef + + def TestD(fs: list>): func(): func(): + \ void + return () => () => { + } + enddef +endclass + +def F(G: func(number, number, number): lib.Trampoline): + \ func(number, number, number): + \ func(): lib.Trampoline + return ((H: func(number, number, number): lib.Trampoline) => + (a1: number, a2: number, n: number) => + () => + H(a2, (a1 + a2), (n - 1)))(G) +enddef + +defcompile + diff --git a/runtime/syntax/testdir/input/vim_ex_defer.vim b/runtime/syntax/testdir/input/vim_ex_defer.vim new file mode 100644 index 0000000000..146237d7dc --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_defer.vim @@ -0,0 +1,14 @@ +" Vim :defer command +" VIM_TEST_SETUP hi link vimUserFunc Todo + + +function Foo() + defer delete("tmpfile") + defer Delete("tmpfile") +endfunction + +def Bar() + defer delete("tmpfile") + defer Delete("tmpfile") +enddef + diff --git a/runtime/syntax/testdir/input/vim_ex_delfunction.vim b/runtime/syntax/testdir/input/vim_ex_delfunction.vim new file mode 100644 index 0000000000..04c33e9262 --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_delfunction.vim @@ -0,0 +1,34 @@ +" Vim :delfunction command + + +delfunction Foo +delfunction Foo +delfunction foo.bar +delfunction g:foo.bar +delfunction s:foo.bar +delfunction foo#bar +delfunction g:foo#bar +delfunction foo#bar.baz +delfunction g:foo#bar.baz + + +delfunction! Foo +delfunction! Foo +delfunction! foo.bar +delfunction! g:foo.bar +delfunction! s:foo.bar +delfunction! foo#bar +delfunction! g:foo#bar +delfunction! foo#bar.baz +delfunction! g:foo#bar.baz + + +delfunction Foo | echo "Foo" +delfunction Foo " comment + + +" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687 +" (arg named /fu%\[nction]/) + +silent! delfunc! func + diff --git a/runtime/syntax/testdir/input/vim_ex_echo.vim b/runtime/syntax/testdir/input/vim_ex_echo.vim index df2bf5c97d..7715df1cbc 100644 --- a/runtime/syntax/testdir/input/vim_ex_echo.vim +++ b/runtime/syntax/testdir/input/vim_ex_echo.vim @@ -1,5 +1,6 @@ " Vim :echo commands + echo "Answer = " 42 echon "Answer = " 42 echomsg "Answer = " 42 @@ -7,10 +8,25 @@ echowindow "Answer = " 42 echoerr "Answer = " 42 echoconsole "Answer = " 42 -echo "following command is :|" | | + +" Trailing bar vs OR operator + +" OR operator +echo foo || bar +echo foo || + \ bar + +" following command is :| +echo "Foo" | | + +" invalid expression +echo "Foo" || echohl WarningMsg | echo "Don't panic!" | echohl None + +" Line continuations + echo "Answer = " "\ comment \ 42 @@ -20,11 +36,14 @@ echo "\ comment \ 42 + +" Trailing bar and comments + " :echo without {expr} echo| echo "Foo" " trailing comment needs | -echo "foo" | " comment +echo "Foo" | " comment " Issue #9987 (parenthesised argument - not a function call) @@ -36,3 +55,4 @@ if 123 else echo 'bar' endif + diff --git a/runtime/syntax/testdir/input/vim_ex_eval.vim b/runtime/syntax/testdir/input/vim_ex_eval.vim new file mode 100644 index 0000000000..e4f629337d --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_eval.vim @@ -0,0 +1,20 @@ +" Vim :eval command + + +eval "Foo"->append(0) + +eval "Foo" + \ ->append( + \ 0 + \ ) + +eval "Foo"->append(0) | echo "Foo" + +echo "Foo" | eval "Foo"->append(0) + +eval "Foo"->append(0) " comment + +def Vim9Context() + eval "Foo"->append(0) # comment +enddef + diff --git a/runtime/syntax/testdir/input/vim_ex_execute.vim b/runtime/syntax/testdir/input/vim_ex_execute.vim index 2ec507e1c1..5f4b7d47e7 100644 --- a/runtime/syntax/testdir/input/vim_ex_execute.vim +++ b/runtime/syntax/testdir/input/vim_ex_execute.vim @@ -1,5 +1,6 @@ " Vim :execute command + " :help :execute execute "buffer" nextbuf @@ -15,8 +16,22 @@ if 0 endif execute 'while i < 5 | echo i | let i = i + 1 | endwhile' + +" Trailing bar vs OR operator + +" OR operator +execute foo || bar ? "Foo" : "NotFoo" +execute foo || + \ bar ? "Foo" : "NotFoo" + " following command is :|" -execute "call Foo()" | | +execute "Foo" | | + +" invalid expression +execute "Foo" || + + +" Line continuations execute "call" "\ comment @@ -27,15 +42,23 @@ execute "\ comment \ "Foo()" + +" Trailing bar and comments + " :execute without {expr} execute| echo "Foo" " trailing comment needs | -execute "foo" | " comment +execute "Foo" | " comment + +def Vim9Context() + # trailing comment allowed + execute "Foo" # comment +enddef " Issue #9987 (parenthesised argument - not a function call) -" FIXME: execute is ex command not builtin function let foo = {'arg': "call Foo()"} execute (foo.arg) + diff --git a/runtime/syntax/testdir/input/vim_ex_filetype.vim b/runtime/syntax/testdir/input/vim_ex_filetype.vim new file mode 100644 index 0000000000..8dd153c522 --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_filetype.vim @@ -0,0 +1,30 @@ +" Vim :filetype command + + +filetype +filetype on +filetype off +filetype plugin on +filetype plugin off +filetype indent on +filetype indent off +filetype plugin indent on +filetype plugin indent off + +filetype | echo "Foo" +filetype " comment + +function Foo() + filetype + filetype on + filetype off + filetype plugin on + filetype plugin off + filetype indent on + filetype indent off + filetype plugin indent on + filetype plugin indent off + filetype | echo "Foo" + filetype " comment +endfunction + diff --git a/runtime/syntax/testdir/input/vim_ex_filter.vim b/runtime/syntax/testdir/input/vim_ex_filter.vim new file mode 100644 index 0000000000..79471c9f9f --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_filter.vim @@ -0,0 +1,16 @@ +" Vim :filter command +" VIM_TEST_SETUP hi link vimCmdSep Operator + + +filter pa\%(tt\)ern oldfiles +filter! pa\%(tt\)ern oldfiles + +filter /pa\%(tt\)ern/ oldfiles +filter! /pa\%(tt\)ern/ oldfiles + +filter !pa\%(tt\)ern! oldfiles +filter! !pa\%(tt\)ern! oldfiles + +filter /pa\%(t|t\)ern/ oldfiles | echo "Foo" +filter! /pa\%(t|t\)ern/ oldfiles | echo "Foo" + diff --git a/runtime/syntax/testdir/input/vim_ex_function.vim b/runtime/syntax/testdir/input/vim_ex_function.vim index 1b781913b8..8a0f398fe2 100644 --- a/runtime/syntax/testdir/input/vim_ex_function.vim +++ b/runtime/syntax/testdir/input/vim_ex_function.vim @@ -1,7 +1,7 @@ " Vim :function command -" list +" List function function Foo @@ -13,7 +13,7 @@ function Foo | echo "Foo" function Foo " comment -" definition +" Definition " empty definition function Foo() @@ -64,16 +64,54 @@ function Foo() return 42 endfunction +function b:dict.Foo() + return 42 +endfunction + +function w:dict.Foo() + return 42 +endfunction + +function t:dict.Foo() + return 42 +endfunction + +function g:dict.Foo() + return 42 +endfunction + +function s:dict.Foo() + return 42 +endfunction + +function v:dict.Foo() + return 42 +endfunction + +function Foo(arg) + let l:dict = {} + function l:dict.BAR() + return 42 + endfunction + function a:arg.BAR() + return 42 + endfunction +endfunction + function foo#bar#Foo() return 42 endfunction +function g:foo#bar#Foo() + return 42 +endfunction + " same name as an Ex command function s:ls() endfunction -" modifiers +" Modifiers function Foo() range endfunction @@ -138,7 +176,7 @@ function Foo() endfunction " comment -" parameters +" Parameters function Foo(x, y, z, ...) return 42 @@ -152,6 +190,14 @@ function Foo( return 42 endfunction +function Foo( + x, + y, + z, + ...) + return 42 +endfunction + function Foo(x, y = 42, z = "zed") return 42 endfunction @@ -163,13 +209,34 @@ function Foo( return 42 endfunction -" Issue #16243 (vimscript def parameters syntax highlight is wrong) +function Foo( + x, + y = 42, + z = "zed") + return 42 +endfunction + + +" Arguments + +function Foo(a, b, c) + echo a:a a:b a:c +endfunction + +function Foo(...) + echo a:000 + echo a:0 + echo a:1 a:2 a:3 a:4 a:5 a:6 a:7 a:8 a:9 a:10 a:11 a:12 a:13 a:14 a:15 a:16 a:17 a:18 a:19 a:20 +endfunction + + +" Issue #16243 (Vim script def parameters syntax highlight is wrong) function Test(lines = [line('.'), line('.')]) endfunction -" comments +" Comments function Foo() " Legacy-script comment @@ -178,22 +245,22 @@ function Foo() endfunction -" command modifiers +" Command modifiers silent! function Foo() endfunction -" leading command separator +" Leading command separator echo "Foo" | function Foo() endfunction -" delete function +" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687 +" (function named /s:fu%\[nction]/) -delfunction Foo -delfunction foo.bar -delfunction! Foo -delfunction foo.bar +func! s:func(_, func) + return a:func +endfunc diff --git a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim index e5d746439a..dbcba980b8 100644 --- a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim +++ b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim @@ -1,6 +1,7 @@ " Vim :function and :def tail comment errors " VIM_TEST_SETUP unlet! g:vimsyn_folding + fun s:Test1() abort # fun return 1 endfun # endfun @@ -41,3 +42,4 @@ for d in range(1, 6)->reverse() exec $'echo s:Test{d}()' exec $'delfunction s:Test{d}' endfor + diff --git a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim index e46bf752e6..a29d3a9988 100644 --- a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim +++ b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim @@ -1,6 +1,7 @@ " Vim :function and :def tail comments " VIM_TEST_SETUP unlet! g:vimsyn_folding + fun s:Test1() abort " fun return 1 endfun " endfun @@ -41,3 +42,4 @@ for d in range(1, 6)->reverse() exec $'echo s:Test{d}()' exec $'delfunction s:Test{d}' endfor + diff --git a/runtime/syntax/testdir/input/vim_ex_function_fold.vim b/runtime/syntax/testdir/input/vim_ex_function_fold.vim index bd0cf610e1..c64c62de86 100644 --- a/runtime/syntax/testdir/input/vim_ex_function_fold.vim +++ b/runtime/syntax/testdir/input/vim_ex_function_fold.vim @@ -3,7 +3,7 @@ " VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax -" list +" List function function Foo @@ -15,7 +15,7 @@ function Foo | echo "Foo" function Foo " comment -" definition +" Definition " empty definition function Foo() @@ -66,16 +66,54 @@ function Foo() return 42 endfunction +function b:dict.Foo() + return 42 +endfunction + +function w:dict.Foo() + return 42 +endfunction + +function t:dict.Foo() + return 42 +endfunction + +function g:dict.Foo() + return 42 +endfunction + +function s:dict.Foo() + return 42 +endfunction + +function v:dict.Foo() + return 42 +endfunction + +function Foo(arg) + let l:dict = {} + function l:dict.BAR() + return 42 + endfunction + function a:arg.BAR() + return 42 + endfunction +endfunction + function foo#bar#Foo() return 42 endfunction +function g:foo#bar#Foo() + return 42 +endfunction + " same name as an Ex command function s:ls() endfunction -" modifiers +" Modifiers function Foo() range endfunction @@ -140,7 +178,7 @@ function Foo() endfunction " comment -" parameters +" Parameters function Foo(x, y, z, ...) return 42 @@ -154,6 +192,14 @@ function Foo( return 42 endfunction +function Foo( + x, + y, + z, + ...) + return 42 +endfunction + function Foo(x, y = 42, z = "zed") return 42 endfunction @@ -165,8 +211,34 @@ function Foo( return 42 endfunction +function Foo( + x, + y = 42, + z = "zed") + return 42 +endfunction + + +" Arguments + +function Foo(a, b, c) + echo a:a a:b a:c +endfunction + +function Foo(...) + echo a:000 + echo a:0 + echo a:1 a:2 a:3 a:4 a:5 a:6 a:7 a:8 a:9 a:10 a:11 a:12 a:13 a:14 a:15 a:16 a:17 a:18 a:19 a:20 +endfunction + + +" Issue #16243 (Vim script def parameters syntax highlight is wrong) + +function Test(lines = [line('.'), line('.')]) +endfunction + -" comments +" Comments function Foo() " Legacy-script comment @@ -175,27 +247,27 @@ function Foo() endfunction -" command modifiers +" Command modifiers silent! function Foo() endfunction -" leading command separator +" Leading command separator echo "Foo" | function Foo() endfunction -" delete function +" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687 +" (function named /s:fu%\[nction]/) -delfunction Foo -delfunction foo.bar -delfunction! Foo -delfunction foo.bar +func! s:func(_, func) + return a:func +endfunc -" fold-region ending +" Fold-region ending function Foo() " endfunction diff --git a/runtime/syntax/testdir/input/vim_ex_function_nested.vim b/runtime/syntax/testdir/input/vim_ex_function_nested.vim index 749b57238e..0e0c36a1fa 100644 --- a/runtime/syntax/testdir/input/vim_ex_function_nested.vim +++ b/runtime/syntax/testdir/input/vim_ex_function_nested.vim @@ -1,5 +1,6 @@ " Vim :def and :function commands (nested) + def FunA(): string def DoFunA(): string return "." @@ -36,3 +37,4 @@ echo FunA() echo FunB() echo FunC() echo FunD() + diff --git a/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim b/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim index d966ef386d..a2563b8471 100644 --- a/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim +++ b/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim @@ -2,6 +2,7 @@ " VIM_TEST_SETUP let g:vimsyn_folding = 'f' " VIM_TEST_SETUP setl fdc=2 fdm=syntax + def FunA(): string def DoFunA(): string return "." @@ -38,3 +39,4 @@ echo FunA() echo FunB() echo FunC() echo FunD() + diff --git a/runtime/syntax/testdir/input/vim_ex_grep.vim b/runtime/syntax/testdir/input/vim_ex_grep.vim new file mode 100644 index 0000000000..8e4e72df92 --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_grep.vim @@ -0,0 +1,47 @@ +" Vim :*grep and :*grepadd commands +" VIM_TEST_SETUP hi link vimCmdSep Operator +" VIM_TEST_SETUP hi link vimGrepBarEscape Special + + +grep 'pat\|tern' foo.txt +lgrep 'pat\|tern' foo.txt + +grep! 'pat\|tern' foo.txt +lgrep! 'pat\|tern' foo.txt + +grepadd 'pat\|tern' foo.txt +lgrepadd 'pat\|tern' foo.txt + +grepadd! 'pat\|tern' foo.txt +lgrepadd! 'pat\|tern' foo.txt + + +" Special filename characters + +grep 'pat\|tern' % +lgrep 'pat\|tern' % + +grep! 'pat\|tern' % +lgrep! 'pat\|tern' % + +grepadd! 'pat\|tern' % +lgrepadd! 'pat\|tern' % + +grepadd! 'pat\|tern' % +lgrepadd! 'pat\|tern' % + + +" Trailing bar, no tail comment + +grep 'pat\|tern' foo.txt | echo "Foo" +lgrep 'pat\|tern' foo.txt | echo "Foo" + +grep! 'pat\|tern' foo.txt | echo "Foo" +lgrep! 'pat\|tern' foo.txt | echo "Foo" + +grepadd 'pat\|tern' foo.txt | echo "Foo" +lgrepadd 'pat\|tern' foo.txt | echo "Foo" + +grepadd! 'pat\|tern' foo.txt | echo "Foo" +lgrepadd! 'pat\|tern' foo.txt | echo "Foo" + diff --git a/runtime/syntax/testdir/input/vim_ex_helpgrep.vim b/runtime/syntax/testdir/input/vim_ex_helpgrep.vim new file mode 100644 index 0000000000..aeef4501d4 --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_helpgrep.vim @@ -0,0 +1,11 @@ +" Vim :helpgrep command + + +helpgrep :help +helpgrep :help@en +helpgrep :h\%(elp\)\= + +lhelpgrep :help +lhelpgrep :help@en +lhelpgrep :h\%(elp\)\= + diff --git a/runtime/syntax/testdir/input/vim_ex_highlight.vim b/runtime/syntax/testdir/input/vim_ex_highlight.vim index e23968aa5c..1e53e176ce 100644 --- a/runtime/syntax/testdir/input/vim_ex_highlight.vim +++ b/runtime/syntax/testdir/input/vim_ex_highlight.vim @@ -1,34 +1,68 @@ " Vim :highlight command +" VIM_TEST_SETUP hi link vimHiGroup Todo + + +" List -" list highlight highlight Comment +highlight Conceal +highlight ErrorMsg +highlight Foo + + +" Reset -" reset highlight clear -" disable + +" Disable + highlight clear Comment +highlight clear Conceal +highlight clear ErrorMsg +highlight clear Foo + highlight Comment NONE +highlight Conceal NONE +highlight ErrorMsg NONE +highlight Foo NONE + + +" Add/modify -" add/modify highlight Comment cterm=underline +highlight Conceal cterm=underline +highlight ErrorMsg cterm=underline +highlight Foo cterm=underline + highlight default Comment term=bold +highlight default Conceal term=bold +highlight default ErrorMsg term=bold +highlight Foo ErrorMsg term=bold + + +" Link -" link highlight link Foo Comment highlight! link Foo Comment highlight link Foo NONE highlight! link Foo NONE +highlight link Foo ErrorMsg +highlight! link Foo ErrorMsg + + +" Default link -" default link highlight default link Foo Comment highlight! default link Foo Comment highlight default link Foo NONE highlight! default link Foo NONE +highlight default link Foo ErrorMsg +highlight! default link Foo ErrorMsg -" line continuation and command separator +" Line continuation and command separator hi Comment "\ comment @@ -53,3 +87,22 @@ hi default link hi default link \ Foo \ Comment | echo "Foo" + + +" 'statusline' user groups + +highlight User1 ctermfg=black +highlight User2 ctermfg=darkblue +highlight User3 ctermfg=darkgreen +highlight User4 ctermfg=darkcyan +highlight User5 ctermfg=darkred +highlight User6 ctermfg=darkmagenta +highlight User7 ctermfg=darkyellow +highlight User8 ctermfg=lightgray +highlight User9 ctermfg=darkgray + + +" :terminal group + +hi Terminal ctermbg=red ctermfg=blue + diff --git a/runtime/syntax/testdir/input/vim_ex_import.vim b/runtime/syntax/testdir/input/vim_ex_import.vim new file mode 100644 index 0000000000..07df827b9e --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_import.vim @@ -0,0 +1,119 @@ +" Vim :import command +" VIM_TEST_SETUP hi link vimImportName Todo + + +import "foo.vim" +impor v:true ? "foo.vim" : "bar.vim" + +import v:true ? + \ "foo.vim" : + \ "bar.vim" + +import v:true + \ ? "foo.vim" + \ : "bar.vim" + +import v:true ? + "\ comment + \ "foo.vim" : + "\ comment + \ "bar.vim" + +import v:true + "\ comment + \ ? "foo.vim" + "\ comment + \ : "bar.vim" + +import "foo.vim" as bar +import v:true ? "foo.vim" : "bar.vim" as baz + +import v:true ? + \ "foo.vim" : + \ "bar.vim" + \ as baz + +import v:true + \ ? "foo.vim" + \ : "bar.vim" + \ as baz + +import v:true ? + "\ comment + \ "foo.vim" : + "\ comment + \ "bar.vim" + "\ comment + \ as baz + +import v:true + "\ comment + \ ? "foo.vim" + "\ comment + \ : "bar.vim" + "\ comment + \ as baz + +echo "Foo" | import "foo.vim" + + +" autoload + +import autoload "foo.vim" +import autoload v:true ? "foo.vim" : "bar.vim" + +import autoload v:true ? + \ "foo.vim" : + \ "bar.vim" + +import autoload v:true + \ ? "foo.vim" + \ : "bar.vim" + +import autoload v:true ? + "\ comment + \"foo.vim" : + "\ comment + \ "bar.vim" + +import autoload v:true + "\ comment + \ ? "foo.vim" + "\ comment + \ : "bar.vim" + +import autoload "foo.vim" as bar +import autoload v:true ? "foo.vim" : "bar.vim" as baz + +import autoload v:true ? + \ "foo.vim" : + \ "bar.vim" + \ as baz + +import autoload v:true + \ ? "foo.vim" + \ : "bar.vim" + \ as baz + +import autoload v:true ? + "\ comment + \ "foo.vim" : + "\ comment + \ "bar.vim" + "\ comment + \ as baz + +import autoload v:true + "\ comment + \ ? "foo.vim" + "\ comment + \ : "bar.vim" + "\ comment + \ as baz + + +" "as" keyword in expr + +let as = "modules/" +import v:true ? as .. "foo.vim" : as .. "bar.vim" as other + diff --git a/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim b/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim index 2f88f938ec..7c45ab5e6a 100644 --- a/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim +++ b/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim @@ -13,8 +13,62 @@ line1 line2 END +let [foo, bar] =<< EOS +line1 +line2 +EOS + + let [foo, bar] =<< EOS +line1 +line2 +EOS + +let [foo, + \ bar] =<< EOS +line1 +line2 +EOS + + let [foo, + \ bar] =<< EOS +line1 +line2 +EOS + +let g:foo =<< END +line1 +line2 +END + + let g:foo =<< END +line1 +line2 +END + +let [g:foo, g:bar] =<< EOS +line1 +line2 +EOS + + let [g:foo, g:bar] =<< EOS +line1 +line2 +EOS + +let [g:foo, + \ g:bar] =<< EOS +line1 +line2 +EOS + + let [g:foo, + \ g:bar] =<< EOS +line1 +line2 +EOS + -" trim +" Trim let foo =<< trim END line1 @@ -27,7 +81,7 @@ END END -" interpolation +" Interpolation let foo =<< eval END line{1 + 0} @@ -49,7 +103,7 @@ END line{1 + 1} END -" no interpolation (escaped { and }) +" No interpolation (escaped { and }) let foo =<< eval END line{{1 + 0}} @@ -72,7 +126,7 @@ END END -" no interpolation +" No interpolation let foo =<< END line{1 + 0} @@ -95,7 +149,7 @@ END END -" end marker must not be followed by whitespace +" End marker must not be followed by whitespace " assert_equal(foo, ["END "]) let foo =<< END @@ -171,7 +225,7 @@ END END -" end markers +" End markers let foo =<< !@#$%^&*()_+ line1 diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim b/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim index 8f4484db5c..853256c911 100644 --- a/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim +++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim @@ -1,5 +1,6 @@ " Vim :loadkeymap command + scriptencoding utf-8 let b:keymap_name = "syntax-test" @@ -20,5 +21,7 @@ c Special notation allowed in RHS - octal " Vim-script comment characters # Line should not match as a Vim9-script comment -\" “ Line should not match as a legacy-script comment +" Line should not match as a legacy-script comment +\" “ : " Line should not match as a legacy-script comment + diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim index 029af2cb3b..4f4c5af40f 100644 --- a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim +++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim @@ -1,5 +1,6 @@ " Vim :loadkeymap command (after "|") + scriptencoding utf-8 let b:keymap_name = "syntax-test" diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim index 61578b6a0f..9500cbd5bc 100644 --- a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim +++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim @@ -1,5 +1,6 @@ " Vim :loadkeymap command (after ":") + scriptencoding utf-8 let b:keymap_name = "syntax-test" diff --git a/runtime/syntax/testdir/input/vim_ex_lua.vim b/runtime/syntax/testdir/input/vim_ex_lua.vim new file mode 100644 index 0000000000..55d151e463 --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_lua.vim @@ -0,0 +1,157 @@ +" Vim :lua, :luado and :luafile commands +" VIM_TEST_SETUP let g:vimsyn_embed = "l" +" VIM_TEST_SETUP let g:vimsyn_folding = "fl" +" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax + + +lua << EOF +print("Lua script") +EOF + + lua << trim EOF + print("Lua script") + EOF + +lua << +print("Lua script") +. + + lua << trim + print("Lua script") + . + +function Foo() + lua << trim EOF + print("Lua script in :func") + EOF +endfunction | call Foo() + +def Bar() + lua << trim EOF + print("Lua script in :def") + EOF +enddef | call Bar() + +lua print("Lua statement") + "\ comment + \ print("Lua statement again") + +luado print("Lua statement") + "\ comment + \ print("Lua statement again") + +luafile foo.lua + + +" :mzscheme and :mzfile + +mzscheme << trim EOF + (display "MzScheme script") +EOF + +mzscheme (display "MzScheme statement") + "\ comment + \ (display "MzScheme statement again") + +mzfile foo.rkt + + +" :perl and :perldo + +perl << trim EOF + print("Perl script\n") +EOF + +perl print("Perl statement\n"); + "\ comment + \ print("Perl statement again\n") + +perldo print("Perl statement\n"); + "\ comment + \ print("Perl statement again\n") + + +" :python, :pydo and :pyfile + +python << trim EOF + print("Python script") +EOF + +python print("Python statement"); + "\ comment + \ print("Python statement again") + +pydo print("Python statement"); + "\ comment + \ print("Python statement again") + +pyfile foo.py + + +" :python3, :py3do and :py3file + +python3 << trim EOF + print("Python3 script") +EOF + +python3 print("Python3 statement"); + "\ comment + \ print("Python3 statement") + +py3do print("Python3 statement"); + "\ comment + \ print("Python3 statement") + +py3file foo.py + + +" :pythonx, :pyxdo and :pyxfile + +pythonx << trim EOF + print("PythonX script") +EOF + +pythonx print("PythonX statement"); + "\ comment + \ print("PythonX statement") + +pyxdo print("PythonX statement"); + "\ comment + \ print("PythonX statement") + +pyxfile foo.py + + +" :ruby, :rubydo and :rubyfile + +ruby << trim EOF + puts "Ruby script" +EOF + +ruby puts "Ruby statement"; + "\ comment + \ puts "Ruby statement again" + +rubydo puts "Ruby statement"; + "\ comment + \ puts "Ruby statement again" + +rubyfile foo.rb + + +" :tcl, :tcldo and :tclfile + +tcl << trim EOF + puts "TCL script" +EOF + +tcl puts "TCL statement"; + "\ comment + \ puts "TCL statement again" + +tcldo puts "TCL statement"; + "\ comment + \ puts "TCL statement again" + +tclfile foo.tcl + diff --git a/runtime/syntax/testdir/input/vim_ex_make.vim b/runtime/syntax/testdir/input/vim_ex_make.vim new file mode 100644 index 0000000000..0ef3046d7d --- /dev/null +++ b/runtime/syntax/testdir/input/vim_ex_make.vim @@ -0,0 +1,38 @@ +" Vim :*make commands +" VIM_TEST_SETUP hi link vimCmdSep Operator +" VIM_TEST_SETUP hi link vimMakeBarEscape Special + + +make +lmake + +make! +lmake! + +make -options target +lmake -options target + +make! -options target +lmake! -options target + + +" Special filename characters + +make % +lmake % + + +" Trailing bar, no tail comment + +make tar\|get | echo "Foo" +lmake tar\|get | echo "Foo" + +make! tar\|get | echo "Foo" +lmake! tar\|get | echo "Foo" + +make | echo "Foo" +lmake | echo "Foo" + +make! | echo "Foo" +lmake! | echo "Foo" + diff --git a/runtime/syntax/testdir/input/vim_ex_map.vim b/runtime/syntax/testdir/input/vim_ex_map.vim index 3ddc9e9a8d..b7c33ef498 100644 --- a/runtime/syntax/testdir/input/vim_ex_map.vim +++ b/runtime/syntax/testdir/input/vim_ex_map.vim @@ -1,10 +1,28 @@ " Vim :map commands +" VIM_TEST_SETUP hi link vimMapLhs Identifier +" VIM_TEST_SETUP hi link vimMapRhs Todo +" VIM_TEST_SETUP hi link vimMapRhsContinue Todo + map! map! lhs rhs map map lhs rhs +map