From a4e9136f68a40b1cb0eb6df5a5f06603224a87f4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:05:19 +0200 Subject: Merging upstream version 2:9.1.0698. Signed-off-by: Daniel Baumann --- .github/MAINTAINERS | 57 +- .github/actions/screendump/action.yml | 6 +- .github/workflows/ci.yml | 14 +- .gitignore | 2 + .hgignore | 2 + Filelist | 9 + Makefile | 5 +- ci/appveyor.bat | 27 +- runtime/autoload/dist/ft.vim | 101 +- runtime/autoload/dist/man.vim | 7 +- runtime/autoload/dist/vim.vim | 4 + runtime/autoload/dist/vim9.vim | 4 + runtime/autoload/netrw.vim | 203 ++-- runtime/autoload/typst.vim | 50 + runtime/autoload/zip.vim | 258 ++--- runtime/colors/blue.vim | 16 +- runtime/colors/darkblue.vim | 16 +- runtime/colors/delek.vim | 19 +- runtime/colors/desert.vim | 10 +- runtime/colors/elflord.vim | 10 +- runtime/colors/evening.vim | 16 +- runtime/colors/habamax.vim | 293 ++--- runtime/colors/industry.vim | 10 +- runtime/colors/koehler.vim | 16 +- runtime/colors/lunaperche.vim | 26 +- runtime/colors/morning.vim | 16 +- runtime/colors/murphy.vim | 10 +- runtime/colors/pablo.vim | 16 +- runtime/colors/peachpuff.vim | 20 +- runtime/colors/quiet.vim | 21 +- runtime/colors/retrobox.vim | 48 +- runtime/colors/ron.vim | 16 +- runtime/colors/shine.vim | 16 +- runtime/colors/slate.vim | 18 +- runtime/colors/sorbet.vim | 26 +- runtime/colors/torte.vim | 16 +- runtime/colors/wildcharm.vim | 194 ++-- runtime/colors/zaibatsu.vim | 10 +- runtime/colors/zellner.vim | 18 +- runtime/compiler/pandoc.vim | 45 +- runtime/compiler/typst.vim | 15 + runtime/doc/Make_mvc.mak | 6 +- runtime/doc/Makefile | 88 +- runtime/doc/autocmd.txt | 52 +- runtime/doc/builtin.txt | 155 ++- runtime/doc/change.txt | 25 +- runtime/doc/channel.txt | 7 +- runtime/doc/cmdline.txt | 5 +- runtime/doc/editing.txt | 16 +- runtime/doc/eval.txt | 10 +- runtime/doc/evim-it.1 | 8 +- runtime/doc/evim-it.UTF-8.1 | 8 +- runtime/doc/evim-ru.1 | 80 +- runtime/doc/evim-ru.UTF-8.1 | 80 +- runtime/doc/evim.1 | 8 +- runtime/doc/evim.man | 9 +- runtime/doc/filetype.txt | 39 +- runtime/doc/gui.txt | 4 +- runtime/doc/index.txt | 8 +- runtime/doc/insert.txt | 40 +- runtime/doc/map.txt | 3 +- runtime/doc/mbyte.txt | 6 +- runtime/doc/mlang.txt | 6 +- runtime/doc/motion.txt | 5 +- runtime/doc/options.txt | 56 +- runtime/doc/pattern.txt | 8 +- runtime/doc/pi_netrw.txt | 11 +- runtime/doc/popup.txt | 20 +- runtime/doc/quickfix.txt | 28 +- runtime/doc/quickref.txt | 1 + runtime/doc/repeat.txt | 334 +++++- runtime/doc/scroll.txt | 5 +- runtime/doc/sign.txt | 24 +- runtime/doc/sponsor.txt | 11 +- runtime/doc/starting.txt | 25 +- runtime/doc/syntax.txt | 275 +++-- runtime/doc/tabpage.txt | 5 +- runtime/doc/tags | 44 + runtime/doc/tagsrch.txt | 20 +- runtime/doc/terminal.txt | 48 +- runtime/doc/testing.txt | 30 +- runtime/doc/todo.txt | 7 +- runtime/doc/uganda.rux | 19 +- runtime/doc/uganda.txt | 6 +- runtime/doc/usr_05.txt | 20 +- runtime/doc/usr_41.txt | 4 + runtime/doc/various.txt | 7 +- runtime/doc/version9.txt | 41 +- runtime/doc/vim-it.1 | 175 +-- runtime/doc/vim-it.UTF-8.1 | 175 +-- runtime/doc/vim-ja.UTF-8.1 | 91 +- runtime/doc/vim-ru.1 | 794 ++++++++----- runtime/doc/vim-ru.UTF-8.1 | 794 ++++++++----- runtime/doc/vim.1 | 166 +-- runtime/doc/vim.man | 241 ++-- runtime/doc/vimdiff-it.1 | 2 +- runtime/doc/vimdiff-it.UTF-8.1 | 2 +- runtime/doc/vimdiff-ru.1 | 65 +- runtime/doc/vimdiff-ru.UTF-8.1 | 65 +- runtime/doc/vimdiff.1 | 2 +- runtime/doc/vimdiff.man | 2 +- runtime/doc/vimtutor-it.1 | 12 +- runtime/doc/vimtutor-it.UTF-8.1 | 12 +- runtime/doc/vimtutor-ru.1 | 76 +- runtime/doc/vimtutor-ru.UTF-8.1 | 76 +- runtime/doc/vimtutor.1 | 12 +- runtime/doc/vimtutor.man | 9 +- runtime/doc/windows.txt | 5 +- runtime/doc/xxd-it.1 | 83 +- runtime/doc/xxd-it.UTF-8.1 | 83 +- runtime/doc/xxd-ja.UTF-8.1 | 5 +- runtime/doc/xxd-ru.1 | 466 ++++---- runtime/doc/xxd-ru.UTF-8.1 | 466 ++++---- runtime/doc/xxd.1 | 59 +- runtime/doc/xxd.man | 53 +- runtime/filetype.vim | 88 +- runtime/ftplugin/antlr4.vim | 14 + runtime/ftplugin/asy.vim | 14 + runtime/ftplugin/autohotkey.vim | 16 + runtime/ftplugin/bindzone.vim | 16 + runtime/ftplugin/cabal.vim | 13 + runtime/ftplugin/cedar.vim | 13 + runtime/ftplugin/chicken.vim | 16 +- runtime/ftplugin/cmakecache.vim | 13 + runtime/ftplugin/csv.vim | 23 + runtime/ftplugin/cuda.vim | 11 + runtime/ftplugin/editorconfig.vim | 13 + runtime/ftplugin/gdscript.vim | 6 + runtime/ftplugin/go.vim | 6 + runtime/ftplugin/goaccess.vim | 14 + runtime/ftplugin/gomod.vim | 16 + runtime/ftplugin/hlsplaylist.vim | 37 + runtime/ftplugin/htmlangular.vim | 12 + runtime/ftplugin/javacc.vim | 20 + runtime/ftplugin/kivy.vim | 13 + runtime/ftplugin/ldapconf.vim | 13 + runtime/ftplugin/lex.vim | 14 + runtime/ftplugin/man.vim | 14 +- runtime/ftplugin/mediawiki.vim | 42 + runtime/ftplugin/mermaid.vim | 5 +- runtime/ftplugin/mojo.vim | 41 + runtime/ftplugin/mysql.vim | 9 + runtime/ftplugin/objcpp.vim | 1 + runtime/ftplugin/scheme.vim | 18 +- runtime/ftplugin/sql.vim | 26 +- runtime/ftplugin/squirrel.vim | 17 + runtime/ftplugin/terraform.vim | 14 + runtime/ftplugin/tf.vim | 13 + runtime/ftplugin/thrift.vim | 17 + runtime/ftplugin/typst.vim | 22 +- runtime/ftplugin/yacc.vim | 16 + runtime/indent/Make_mvc.mak | 4 +- runtime/indent/Makefile | 4 +- runtime/indent/glsl.vim | 14 + runtime/indent/lua.vim | 9 +- runtime/indent/mojo.vim | 6 + runtime/indent/ocaml.vim | 4 +- runtime/indent/proto.vim | 19 + runtime/indent/rust.vim | 9 +- runtime/indent/scheme.vim | 9 +- runtime/indent/testdir/lua.in | 19 + runtime/indent/testdir/lua.ok | 19 + runtime/indent/testdir/thrift.in | 38 + runtime/indent/testdir/thrift.ok | 38 + runtime/indent/thrift.vim | 74 ++ runtime/indent/typst.vim | 18 + runtime/indent/vim.vim | 6 +- runtime/indent/yaml.vim | 5 +- runtime/lang/Makefile | 92 +- runtime/lang/menu_pt_br.vim | 304 ++++- runtime/lang/menu_pt_pt.vim | 38 +- runtime/macros/maze/mazeclean.c | 2 +- runtime/optwin.vim | 4 +- .../pack/dist/opt/nohlsearch/plugin/nohlsearch.vim | 20 + .../pack/dist/opt/termdebug/plugin/termdebug.vim | 625 +++++----- runtime/plugin/manpager.vim | 8 +- runtime/plugin/matchparen.vim | 8 +- runtime/syntax/antlr4.vim | 30 + runtime/syntax/asy.vim | 243 ++++ runtime/syntax/chicken.vim | 18 +- runtime/syntax/csv.vim | 39 + runtime/syntax/debcopyright.vim | 4 +- runtime/syntax/dockerfile.vim | 4 +- runtime/syntax/dosbatch.vim | 9 +- runtime/syntax/dune.vim | 3 + runtime/syntax/fstab.vim | 22 +- runtime/syntax/generator/Makefile | 6 +- runtime/syntax/generator/gen_syntax_vim.vim | 19 +- runtime/syntax/generator/vim.vim.base | 298 +++-- runtime/syntax/glsl.vim | 752 ++++++++++++ runtime/syntax/goaccess.vim | 34 + runtime/syntax/html.vim | 3 +- runtime/syntax/htmlangular.vim | 18 + runtime/syntax/java.vim | 462 +++++--- runtime/syntax/javascript.vim | 9 +- runtime/syntax/kconfig.vim | 4 +- runtime/syntax/kivy.vim | 10 +- runtime/syntax/logindefs.vim | 27 +- runtime/syntax/make.vim | 21 +- runtime/syntax/mediawiki.vim | 292 +++++ runtime/syntax/mysql.vim | 314 ++--- runtime/syntax/ocaml.vim | 407 +++++-- runtime/syntax/opam.vim | 52 +- runtime/syntax/progress.vim | 14 +- runtime/syntax/scheme.vim | 21 +- runtime/syntax/sdc.vim | 46 +- runtime/syntax/testdir/README.txt | 102 +- runtime/syntax/testdir/dumps/c_02.dump | 10 +- runtime/syntax/testdir/dumps/c_03.dump | 8 +- runtime/syntax/testdir/dumps/c_04.dump | 12 +- runtime/syntax/testdir/dumps/c_05.dump | 12 +- runtime/syntax/testdir/dumps/c_06.dump | 12 +- runtime/syntax/testdir/dumps/c_07.dump | 20 + runtime/syntax/testdir/dumps/c_99.dump | 20 - runtime/syntax/testdir/dumps/dots_01_00.dump | 20 + runtime/syntax/testdir/dumps/dots_01_01.dump | 20 + runtime/syntax/testdir/dumps/dots_01_02.dump | 20 + runtime/syntax/testdir/dumps/dots_01_03.dump | 20 + runtime/syntax/testdir/dumps/dots_02_00.dump | 20 + runtime/syntax/testdir/dumps/dots_02_01.dump | 20 + runtime/syntax/testdir/dumps/dots_02_02.dump | 20 + runtime/syntax/testdir/dumps/dots_02_03.dump | 20 + runtime/syntax/testdir/dumps/dots_03_00.dump | 20 + runtime/syntax/testdir/dumps/dots_03_01.dump | 20 + runtime/syntax/testdir/dumps/dots_03_02.dump | 20 + runtime/syntax/testdir/dumps/dots_03_03.dump | 20 + runtime/syntax/testdir/dumps/dots_04_00.dump | 20 + runtime/syntax/testdir/dumps/dots_04_01.dump | 20 + runtime/syntax/testdir/dumps/dots_04_02.dump | 20 + runtime/syntax/testdir/dumps/dots_04_03.dump | 20 + runtime/syntax/testdir/dumps/dots_04_04.dump | 20 + runtime/syntax/testdir/dumps/dots_05_00.dump | 20 + runtime/syntax/testdir/dumps/dots_05_01.dump | 20 + runtime/syntax/testdir/dumps/dots_05_02.dump | 20 + runtime/syntax/testdir/dumps/dots_05_03.dump | 20 + runtime/syntax/testdir/dumps/dots_05_04.dump | 20 + runtime/syntax/testdir/dumps/dots_06_00.dump | 20 + runtime/syntax/testdir/dumps/dots_06_01.dump | 20 + runtime/syntax/testdir/dumps/dots_06_02.dump | 20 + runtime/syntax/testdir/dumps/dots_06_03.dump | 20 + runtime/syntax/testdir/dumps/dots_07_00.dump | 20 + runtime/syntax/testdir/dumps/dots_07_01.dump | 20 + runtime/syntax/testdir/dumps/dots_07_02.dump | 20 + runtime/syntax/testdir/dumps/dots_07_03.dump | 20 + runtime/syntax/testdir/dumps/dots_07_04.dump | 20 + runtime/syntax/testdir/dumps/dots_08_00.dump | 20 + runtime/syntax/testdir/dumps/dots_08_01.dump | 20 + runtime/syntax/testdir/dumps/dots_08_02.dump | 20 + runtime/syntax/testdir/dumps/dots_08_03.dump | 20 + runtime/syntax/testdir/dumps/dots_08_04.dump | 20 + runtime/syntax/testdir/dumps/dots_09_00.dump | 20 + runtime/syntax/testdir/dumps/dots_09_01.dump | 20 + runtime/syntax/testdir/dumps/dots_09_02.dump | 20 + runtime/syntax/testdir/dumps/dots_09_03.dump | 20 + runtime/syntax/testdir/dumps/dots_10_00.dump | 20 + runtime/syntax/testdir/dumps/dots_10_01.dump | 20 + runtime/syntax/testdir/dumps/dots_10_02.dump | 20 + runtime/syntax/testdir/dumps/dots_10_03.dump | 20 + runtime/syntax/testdir/dumps/dots_10_04.dump | 20 + runtime/syntax/testdir/dumps/dots_10_05.dump | 20 + runtime/syntax/testdir/dumps/dots_11_00.dump | 20 + runtime/syntax/testdir/dumps/dots_11_01.dump | 20 + runtime/syntax/testdir/dumps/dots_11_02.dump | 20 + runtime/syntax/testdir/dumps/dots_11_03.dump | 20 + runtime/syntax/testdir/dumps/dots_11_04.dump | 20 + runtime/syntax/testdir/dumps/dots_11_05.dump | 20 + runtime/syntax/testdir/dumps/dots_12_00.dump | 20 + runtime/syntax/testdir/dumps/dots_12_01.dump | 20 + runtime/syntax/testdir/dumps/dots_12_02.dump | 20 + runtime/syntax/testdir/dumps/dots_12_03.dump | 20 + runtime/syntax/testdir/dumps/dots_12_04.dump | 20 + runtime/syntax/testdir/dumps/dots_13_00.dump | 20 + runtime/syntax/testdir/dumps/dots_13_01.dump | 20 + runtime/syntax/testdir/dumps/dots_13_02.dump | 20 + runtime/syntax/testdir/dumps/dots_13_03.dump | 20 + runtime/syntax/testdir/dumps/dots_13_04.dump | 20 + runtime/syntax/testdir/dumps/dots_14_00.dump | 20 + runtime/syntax/testdir/dumps/dots_14_01.dump | 20 + runtime/syntax/testdir/dumps/dots_14_02.dump | 20 + runtime/syntax/testdir/dumps/dots_14_03.dump | 20 + runtime/syntax/testdir/dumps/dots_14_04.dump | 20 + runtime/syntax/testdir/dumps/dots_15_00.dump | 20 + runtime/syntax/testdir/dumps/dots_15_01.dump | 20 + runtime/syntax/testdir/dumps/dots_15_02.dump | 20 + runtime/syntax/testdir/dumps/dots_15_03.dump | 20 + runtime/syntax/testdir/dumps/dots_16_00.dump | 20 + runtime/syntax/testdir/dumps/dots_16_01.dump | 20 + runtime/syntax/testdir/dumps/dots_16_02.dump | 20 + runtime/syntax/testdir/dumps/dots_16_03.dump | 20 + runtime/syntax/testdir/dumps/dots_17_00.dump | 20 + runtime/syntax/testdir/dumps/dots_17_01.dump | 20 + runtime/syntax/testdir/dumps/dots_17_02.dump | 20 + runtime/syntax/testdir/dumps/dots_17_03.dump | 20 + runtime/syntax/testdir/dumps/dots_18_00.dump | 20 + runtime/syntax/testdir/dumps/dots_18_01.dump | 20 + runtime/syntax/testdir/dumps/dots_18_02.dump | 20 + runtime/syntax/testdir/dumps/dots_18_03.dump | 20 + runtime/syntax/testdir/dumps/dots_19_00.dump | 20 + runtime/syntax/testdir/dumps/dots_19_01.dump | 20 + runtime/syntax/testdir/dumps/dots_19_02.dump | 20 + runtime/syntax/testdir/dumps/dots_19_03.dump | 20 + runtime/syntax/testdir/dumps/dots_20_00.dump | 20 + runtime/syntax/testdir/dumps/dots_20_01.dump | 20 + runtime/syntax/testdir/dumps/html_01.dump | 12 +- runtime/syntax/testdir/dumps/html_02.dump | 12 +- runtime/syntax/testdir/dumps/html_03.dump | 12 +- runtime/syntax/testdir/dumps/html_04.dump | 12 +- runtime/syntax/testdir/dumps/html_05.dump | 12 +- runtime/syntax/testdir/dumps/html_06.dump | 12 +- runtime/syntax/testdir/dumps/html_07.dump | 12 +- runtime/syntax/testdir/dumps/html_08.dump | 12 +- runtime/syntax/testdir/dumps/html_99.dump | 20 - .../syntax/testdir/dumps/java_annotations_99.dump | 20 - .../dumps/java_annotations_signature_00.dump | 20 + .../dumps/java_annotations_signature_01.dump | 20 + .../dumps/java_annotations_signature_02.dump | 20 + .../dumps/java_annotations_signature_03.dump | 20 + .../dumps/java_annotations_signature_04.dump | 20 + runtime/syntax/testdir/dumps/java_comments_02.dump | 2 +- runtime/syntax/testdir/dumps/java_comments_05.dump | 20 + runtime/syntax/testdir/dumps/java_comments_99.dump | 20 - .../testdir/dumps/java_contextual_keywords_99.dump | 20 - .../syntax/testdir/dumps/java_enfoldment_00.dump | 14 +- .../syntax/testdir/dumps/java_enfoldment_01.dump | 28 +- .../syntax/testdir/dumps/java_enfoldment_02.dump | 40 +- .../syntax/testdir/dumps/java_enfoldment_03.dump | 20 - .../syntax/testdir/dumps/java_enfoldment_04.dump | 20 - .../syntax/testdir/dumps/java_enfoldment_99.dump | 20 - runtime/syntax/testdir/dumps/java_escapes_07.dump | 20 + runtime/syntax/testdir/dumps/java_escapes_99.dump | 20 - runtime/syntax/testdir/dumps/java_generics_00.dump | 20 + runtime/syntax/testdir/dumps/java_generics_01.dump | 20 + runtime/syntax/testdir/dumps/java_generics_02.dump | 20 + runtime/syntax/testdir/dumps/java_generics_03.dump | 20 + runtime/syntax/testdir/dumps/java_generics_04.dump | 20 + runtime/syntax/testdir/dumps/java_generics_05.dump | 20 + runtime/syntax/testdir/dumps/java_generics_06.dump | 20 + runtime/syntax/testdir/dumps/java_generics_07.dump | 20 + .../testdir/dumps/java_generics_signature_00.dump | 20 + .../testdir/dumps/java_generics_signature_01.dump | 20 + .../testdir/dumps/java_generics_signature_02.dump | 20 + .../testdir/dumps/java_generics_signature_03.dump | 20 + .../testdir/dumps/java_generics_signature_04.dump | 20 + .../testdir/dumps/java_generics_signature_05.dump | 20 + .../testdir/dumps/java_generics_signature_06.dump | 20 + .../testdir/dumps/java_generics_signature_07.dump | 20 + .../testdir/dumps/java_lambda_expressions_07.dump | 2 +- .../testdir/dumps/java_lambda_expressions_99.dump | 20 - .../java_lambda_expressions_signature_00.dump | 20 + .../java_lambda_expressions_signature_01.dump | 20 + .../java_lambda_expressions_signature_02.dump | 20 + .../java_lambda_expressions_signature_03.dump | 20 + .../java_lambda_expressions_signature_04.dump | 20 + .../java_lambda_expressions_signature_05.dump | 20 + .../java_lambda_expressions_signature_06.dump | 20 + .../java_lambda_expressions_signature_07.dump | 20 + .../java_lambda_expressions_signature_08.dump | 20 + .../testdir/dumps/java_method_references_00.dump | 20 + .../testdir/dumps/java_method_references_01.dump | 20 + .../testdir/dumps/java_method_references_02.dump | 20 + .../testdir/dumps/java_method_references_03.dump | 20 + .../testdir/dumps/java_method_references_04.dump | 20 + .../testdir/dumps/java_method_references_05.dump | 20 + .../testdir/dumps/java_method_references_06.dump | 20 + .../testdir/dumps/java_method_references_07.dump | 20 + .../testdir/dumps/java_method_references_08.dump | 20 + .../testdir/dumps/java_method_references_09.dump | 20 + .../testdir/dumps/java_method_references_10.dump | 20 + .../dumps/java_method_references_signature_00.dump | 20 + .../dumps/java_method_references_signature_01.dump | 20 + .../dumps/java_method_references_signature_02.dump | 20 + .../dumps/java_method_references_signature_03.dump | 20 + .../dumps/java_method_references_signature_04.dump | 20 + .../dumps/java_method_references_signature_05.dump | 20 + .../dumps/java_method_references_signature_06.dump | 20 + .../dumps/java_method_references_signature_07.dump | 20 + .../dumps/java_method_references_signature_08.dump | 20 + .../dumps/java_method_references_signature_09.dump | 20 + .../dumps/java_method_references_signature_10.dump | 20 + .../testdir/dumps/java_methods_indent2_01.dump | 2 +- .../testdir/dumps/java_methods_indent2_02.dump | 4 +- .../testdir/dumps/java_methods_indent2_03.dump | 2 +- .../testdir/dumps/java_methods_indent2_04.dump | 2 +- .../testdir/dumps/java_methods_indent2_05.dump | 20 + .../testdir/dumps/java_methods_indent2_05.vim | 2 + .../testdir/dumps/java_methods_indent2_99.dump | 20 - .../testdir/dumps/java_methods_indent2_99.vim | 2 - .../dumps/java_methods_indent2_signature_00.dump | 20 + .../dumps/java_methods_indent2_signature_00.vim | 2 + .../dumps/java_methods_indent2_signature_01.dump | 20 + .../dumps/java_methods_indent2_signature_01.vim | 2 + .../dumps/java_methods_indent2_signature_02.dump | 20 + .../dumps/java_methods_indent2_signature_02.vim | 2 + .../dumps/java_methods_indent2_signature_03.dump | 20 + .../dumps/java_methods_indent2_signature_03.vim | 2 + .../dumps/java_methods_indent2_signature_04.dump | 20 + .../dumps/java_methods_indent2_signature_04.vim | 2 + .../dumps/java_methods_indent2_signature_05.dump | 20 + .../dumps/java_methods_indent2_signature_05.vim | 2 + .../testdir/dumps/java_methods_indent4_01.dump | 2 +- .../testdir/dumps/java_methods_indent4_02.dump | 4 +- .../testdir/dumps/java_methods_indent4_03.dump | 2 +- .../testdir/dumps/java_methods_indent4_04.dump | 2 +- .../testdir/dumps/java_methods_indent4_05.dump | 20 + .../testdir/dumps/java_methods_indent4_05.vim | 2 + .../testdir/dumps/java_methods_indent4_06.dump | 20 + .../testdir/dumps/java_methods_indent4_99.dump | 20 - .../testdir/dumps/java_methods_indent4_99.vim | 2 - .../dumps/java_methods_indent4_signature_00.dump | 20 + .../dumps/java_methods_indent4_signature_00.vim | 2 + .../dumps/java_methods_indent4_signature_01.dump | 20 + .../dumps/java_methods_indent4_signature_01.vim | 2 + .../dumps/java_methods_indent4_signature_02.dump | 20 + .../dumps/java_methods_indent4_signature_02.vim | 2 + .../dumps/java_methods_indent4_signature_03.dump | 20 + .../dumps/java_methods_indent4_signature_03.vim | 2 + .../dumps/java_methods_indent4_signature_04.dump | 20 + .../dumps/java_methods_indent4_signature_04.vim | 2 + .../dumps/java_methods_indent4_signature_05.dump | 20 + .../dumps/java_methods_indent4_signature_05.vim | 2 + .../dumps/java_methods_indent4_signature_06.dump | 20 + .../testdir/dumps/java_methods_indent8_01.dump | 2 +- .../testdir/dumps/java_methods_indent8_02.dump | 4 +- .../testdir/dumps/java_methods_indent8_03.dump | 2 +- .../testdir/dumps/java_methods_indent8_04.dump | 10 +- .../testdir/dumps/java_methods_indent8_05.dump | 20 + .../testdir/dumps/java_methods_indent8_05.vim | 2 + .../testdir/dumps/java_methods_indent8_06.dump | 20 + .../testdir/dumps/java_methods_indent8_99.dump | 20 - .../testdir/dumps/java_methods_indent8_99.vim | 2 - .../dumps/java_methods_indent8_signature_00.dump | 20 + .../dumps/java_methods_indent8_signature_00.vim | 2 + .../dumps/java_methods_indent8_signature_01.dump | 20 + .../dumps/java_methods_indent8_signature_01.vim | 2 + .../dumps/java_methods_indent8_signature_02.dump | 20 + .../dumps/java_methods_indent8_signature_02.vim | 2 + .../dumps/java_methods_indent8_signature_03.dump | 20 + .../dumps/java_methods_indent8_signature_03.vim | 2 + .../dumps/java_methods_indent8_signature_04.dump | 20 + .../dumps/java_methods_indent8_signature_04.vim | 2 + .../dumps/java_methods_indent8_signature_05.dump | 20 + .../dumps/java_methods_indent8_signature_05.vim | 2 + .../dumps/java_methods_indent8_signature_06.dump | 20 + .../dumps/java_methods_indent8_signature_06.vim | 2 + .../testdir/dumps/java_methods_style_99.dump | 20 - .../syntax/testdir/dumps/java_methods_style_99.vim | 2 - .../dumps/java_methods_style_signature_00.dump | 20 + .../dumps/java_methods_style_signature_00.vim | 2 + .../dumps/java_methods_style_signature_01.dump | 20 + .../dumps/java_methods_style_signature_01.vim | 2 + .../dumps/java_methods_style_signature_02.dump | 20 + .../dumps/java_methods_style_signature_02.vim | 2 + .../dumps/java_methods_style_signature_03.dump | 20 + .../dumps/java_methods_style_signature_03.vim | 2 + .../dumps/java_methods_style_signature_04.dump | 20 + .../dumps/java_methods_style_signature_04.vim | 2 + runtime/syntax/testdir/dumps/java_numbers_05.dump | 20 + runtime/syntax/testdir/dumps/java_numbers_99.dump | 20 - runtime/syntax/testdir/dumps/java_string_99.dump | 20 - runtime/syntax/testdir/dumps/java_switch_01.dump | 10 +- runtime/syntax/testdir/dumps/java_switch_02.dump | 10 +- runtime/syntax/testdir/dumps/java_switch_03.dump | 12 +- runtime/syntax/testdir/dumps/java_switch_04.dump | 10 +- runtime/syntax/testdir/dumps/java_switch_05.dump | 12 +- runtime/syntax/testdir/dumps/java_switch_06.dump | 12 +- runtime/syntax/testdir/dumps/java_switch_07.dump | 20 + runtime/syntax/testdir/dumps/java_switch_99.dump | 20 - .../syntax/testdir/dumps/java_unfoldment_01.dump | 2 +- .../syntax/testdir/dumps/java_unfoldment_02.dump | 4 +- .../syntax/testdir/dumps/java_unfoldment_03.dump | 28 +- .../syntax/testdir/dumps/java_unfoldment_04.dump | 28 +- .../syntax/testdir/dumps/java_unfoldment_05.dump | 20 + .../syntax/testdir/dumps/java_unfoldment_99.dump | 20 - .../syntax/testdir/dumps/markdown_conceal_99.dump | 20 - runtime/syntax/testdir/dumps/modula2_iso_02.dump | 10 +- runtime/syntax/testdir/dumps/modula2_iso_03.dump | 10 +- runtime/syntax/testdir/dumps/modula2_iso_04.dump | 10 +- runtime/syntax/testdir/dumps/modula2_iso_05.dump | 10 +- runtime/syntax/testdir/dumps/modula2_iso_06.dump | 10 +- runtime/syntax/testdir/dumps/modula2_iso_99.dump | 20 - runtime/syntax/testdir/dumps/modula2_pim_06.dump | 20 + runtime/syntax/testdir/dumps/modula2_pim_99.dump | 20 - runtime/syntax/testdir/dumps/modula2_r10_02.dump | 10 +- runtime/syntax/testdir/dumps/modula2_r10_03.dump | 10 +- runtime/syntax/testdir/dumps/modula2_r10_04.dump | 12 +- runtime/syntax/testdir/dumps/modula2_r10_05.dump | 10 +- runtime/syntax/testdir/dumps/modula2_r10_06.dump | 12 +- runtime/syntax/testdir/dumps/modula2_r10_07.dump | 12 +- runtime/syntax/testdir/dumps/modula2_r10_08.dump | 20 + runtime/syntax/testdir/dumps/modula2_r10_99.dump | 20 - .../syntax/testdir/dumps/progress_comments_00.dump | 20 + .../syntax/testdir/dumps/progress_comments_01.dump | 20 + .../syntax/testdir/dumps/progress_comments_02.dump | 20 + runtime/syntax/testdir/dumps/sh_01_99.dump | 20 - runtime/syntax/testdir/dumps/sh_02_01.dump | 10 +- runtime/syntax/testdir/dumps/sh_02_99.dump | 20 - runtime/syntax/testdir/dumps/sh_03_01.dump | 10 +- runtime/syntax/testdir/dumps/sh_03_02.dump | 20 + runtime/syntax/testdir/dumps/sh_03_99.dump | 20 - runtime/syntax/testdir/dumps/sh_04_99.dump | 20 - runtime/syntax/testdir/dumps/sh_05_02.dump | 6 +- runtime/syntax/testdir/dumps/sh_05_03.dump | 10 +- runtime/syntax/testdir/dumps/sh_05_04.dump | 10 +- runtime/syntax/testdir/dumps/sh_05_05.dump | 10 +- runtime/syntax/testdir/dumps/sh_05_06.dump | 10 +- runtime/syntax/testdir/dumps/sh_05_07.dump | 12 +- runtime/syntax/testdir/dumps/sh_05_08.dump | 12 +- runtime/syntax/testdir/dumps/sh_05_09.dump | 12 +- runtime/syntax/testdir/dumps/sh_05_10.dump | 12 +- runtime/syntax/testdir/dumps/sh_05_11.dump | 12 +- runtime/syntax/testdir/dumps/sh_05_12.dump | 14 +- runtime/syntax/testdir/dumps/sh_05_13.dump | 14 +- runtime/syntax/testdir/dumps/sh_05_14.dump | 14 +- runtime/syntax/testdir/dumps/sh_05_15.dump | 14 +- runtime/syntax/testdir/dumps/sh_05_16.dump | 16 +- runtime/syntax/testdir/dumps/sh_05_17.dump | 16 +- runtime/syntax/testdir/dumps/sh_05_18.dump | 16 +- runtime/syntax/testdir/dumps/sh_05_19.dump | 18 +- runtime/syntax/testdir/dumps/sh_05_20.dump | 16 +- runtime/syntax/testdir/dumps/sh_05_21.dump | 20 + runtime/syntax/testdir/dumps/sh_05_99.dump | 20 - runtime/syntax/testdir/dumps/sh_06_01.dump | 12 +- runtime/syntax/testdir/dumps/sh_06_02.dump | 12 +- runtime/syntax/testdir/dumps/sh_06_03.dump | 14 +- runtime/syntax/testdir/dumps/sh_06_04.dump | 20 + runtime/syntax/testdir/dumps/sh_06_99.dump | 20 - runtime/syntax/testdir/dumps/sh_07_01.dump | 16 +- runtime/syntax/testdir/dumps/sh_07_02.dump | 18 +- runtime/syntax/testdir/dumps/sh_07_03.dump | 20 +- runtime/syntax/testdir/dumps/sh_07_04.dump | 26 +- runtime/syntax/testdir/dumps/sh_07_05.dump | 20 + runtime/syntax/testdir/dumps/sh_07_99.dump | 20 - runtime/syntax/testdir/dumps/sh_08_02.dump | 10 +- runtime/syntax/testdir/dumps/sh_08_03.dump | 12 +- runtime/syntax/testdir/dumps/sh_08_04.dump | 14 +- runtime/syntax/testdir/dumps/sh_08_99.dump | 20 - runtime/syntax/testdir/dumps/sh_09_99.dump | 20 - runtime/syntax/testdir/dumps/sh_10_99.dump | 20 - runtime/syntax/testdir/dumps/sh_11_01.dump | 20 + runtime/syntax/testdir/dumps/sh_11_99.dump | 20 - runtime/syntax/testdir/dumps/vim9_comment_00.dump | 2 +- runtime/syntax/testdir/dumps/vim9_comment_01.dump | 6 +- runtime/syntax/testdir/dumps/vim9_comment_03.dump | 2 +- runtime/syntax/testdir/dumps/vim9_comment_99.dump | 20 - .../syntax/testdir/dumps/vim9_ex_commands_00.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_01.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_02.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_03.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_04.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_05.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_06.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_07.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_08.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_09.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_10.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_11.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_12.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_13.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_14.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_15.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_16.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_17.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_18.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_19.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_20.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_21.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_22.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_23.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_24.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_25.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_26.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_27.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_28.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_29.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_30.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_31.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_32.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_33.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_34.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_35.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_36.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_37.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_38.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_39.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_40.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_41.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_42.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_43.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_44.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_45.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_46.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_47.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_48.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_49.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_50.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_51.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_52.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_53.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_54.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_55.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_56.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_57.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_58.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_59.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_60.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_61.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_62.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_63.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_64.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_65.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_66.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_67.dump | 20 + .../syntax/testdir/dumps/vim9_ex_commands_68.dump | 20 + .../testdir/dumps/vim9_ex_comment_strings_00.dump | 4 +- .../testdir/dumps/vim9_ex_comment_strings_01.dump | 4 +- .../testdir/dumps/vim9_ex_comment_strings_99.dump | 20 - ...im9_ex_function_def_tail_comment_errors_00.dump | 20 + ...im9_ex_function_def_tail_comment_errors_01.dump | 20 + ...im9_ex_function_def_tail_comment_errors_02.dump | 20 + .../vim9_ex_function_def_tail_comments_00.dump | 20 + .../vim9_ex_function_def_tail_comments_01.dump | 20 + .../vim9_ex_function_def_tail_comments_02.dump | 20 + .../testdir/dumps/vim9_ex_loadkeymap_00.dump | 20 + .../testdir/dumps/vim9_ex_loadkeymap_01.dump | 20 + .../dumps/vim9_ex_no_comment_strings_00.dump | 4 +- .../dumps/vim9_ex_no_comment_strings_01.dump | 4 +- .../dumps/vim9_ex_no_comment_strings_99.dump | 20 - runtime/syntax/testdir/dumps/vim9_keymap_00.dump | 20 - runtime/syntax/testdir/dumps/vim9_keymap_01.dump | 20 - runtime/syntax/testdir/dumps/vim9_keymap_99.dump | 20 - runtime/syntax/testdir/dumps/vim9_keymap_99.vim | 2 - .../testdir/dumps/vim9_legacy_header_99.dump | 20 - .../testdir/dumps/vim9_legacy_header_fold_99.dump | 20 - runtime/syntax/testdir/dumps/vim9_shebang_99.dump | 20 - runtime/syntax/testdir/dumps/vim_comment_03.dump | 2 +- runtime/syntax/testdir/dumps/vim_comment_99.dump | 20 - .../syntax/testdir/dumps/vim_ex_abbreviate_99.dump | 20 - .../syntax/testdir/dumps/vim_ex_augroup_99.dump | 20 - runtime/syntax/testdir/dumps/vim_ex_behave_99.dump | 20 - runtime/syntax/testdir/dumps/vim_ex_call_00.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_call_01.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_call_02.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_call_03.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_catch_99.dump | 20 - .../syntax/testdir/dumps/vim_ex_command_99.dump | 20 - .../syntax/testdir/dumps/vim_ex_commands_05.dump | 2 +- .../syntax/testdir/dumps/vim_ex_commands_06.dump | 8 +- .../syntax/testdir/dumps/vim_ex_commands_07.dump | 8 +- .../syntax/testdir/dumps/vim_ex_commands_08.dump | 8 +- .../syntax/testdir/dumps/vim_ex_commands_09.dump | 10 +- .../syntax/testdir/dumps/vim_ex_commands_10.dump | 12 +- .../syntax/testdir/dumps/vim_ex_commands_11.dump | 12 +- .../syntax/testdir/dumps/vim_ex_commands_12.dump | 12 +- .../syntax/testdir/dumps/vim_ex_commands_13.dump | 12 +- .../syntax/testdir/dumps/vim_ex_commands_14.dump | 14 +- .../syntax/testdir/dumps/vim_ex_commands_15.dump | 12 +- .../syntax/testdir/dumps/vim_ex_commands_16.dump | 16 +- .../syntax/testdir/dumps/vim_ex_commands_17.dump | 14 +- .../syntax/testdir/dumps/vim_ex_commands_18.dump | 16 +- .../syntax/testdir/dumps/vim_ex_commands_19.dump | 14 +- .../syntax/testdir/dumps/vim_ex_commands_20.dump | 16 +- .../syntax/testdir/dumps/vim_ex_commands_21.dump | 14 +- .../syntax/testdir/dumps/vim_ex_commands_22.dump | 16 +- .../syntax/testdir/dumps/vim_ex_commands_23.dump | 14 +- .../syntax/testdir/dumps/vim_ex_commands_24.dump | 16 +- .../syntax/testdir/dumps/vim_ex_commands_25.dump | 14 +- .../syntax/testdir/dumps/vim_ex_commands_26.dump | 16 +- .../syntax/testdir/dumps/vim_ex_commands_27.dump | 14 +- .../syntax/testdir/dumps/vim_ex_commands_28.dump | 16 +- .../syntax/testdir/dumps/vim_ex_commands_29.dump | 14 +- .../syntax/testdir/dumps/vim_ex_commands_30.dump | 16 +- .../syntax/testdir/dumps/vim_ex_commands_31.dump | 18 +- .../syntax/testdir/dumps/vim_ex_commands_32.dump | 18 +- .../syntax/testdir/dumps/vim_ex_commands_33.dump | 18 +- .../syntax/testdir/dumps/vim_ex_commands_34.dump | 18 +- .../syntax/testdir/dumps/vim_ex_commands_35.dump | 18 +- .../syntax/testdir/dumps/vim_ex_commands_36.dump | 18 +- .../syntax/testdir/dumps/vim_ex_commands_37.dump | 18 +- .../syntax/testdir/dumps/vim_ex_commands_38.dump | 20 +- .../syntax/testdir/dumps/vim_ex_commands_39.dump | 20 +- .../syntax/testdir/dumps/vim_ex_commands_40.dump | 20 +- .../syntax/testdir/dumps/vim_ex_commands_41.dump | 20 +- .../syntax/testdir/dumps/vim_ex_commands_42.dump | 22 +- .../syntax/testdir/dumps/vim_ex_commands_43.dump | 24 +- .../syntax/testdir/dumps/vim_ex_commands_44.dump | 24 +- .../syntax/testdir/dumps/vim_ex_commands_45.dump | 24 +- .../syntax/testdir/dumps/vim_ex_commands_46.dump | 24 +- .../syntax/testdir/dumps/vim_ex_commands_47.dump | 24 +- .../syntax/testdir/dumps/vim_ex_commands_48.dump | 24 +- .../syntax/testdir/dumps/vim_ex_commands_49.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_50.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_51.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_52.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_53.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_54.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_55.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_56.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_57.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_58.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_59.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_60.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_61.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_62.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_63.dump | 26 +- .../syntax/testdir/dumps/vim_ex_commands_64.dump | 30 +- .../syntax/testdir/dumps/vim_ex_commands_65.dump | 30 +- .../syntax/testdir/dumps/vim_ex_commands_66.dump | 40 +- .../syntax/testdir/dumps/vim_ex_commands_67.dump | 20 + .../syntax/testdir/dumps/vim_ex_commands_68.dump | 20 + .../syntax/testdir/dumps/vim_ex_commands_99.dump | 20 - .../testdir/dumps/vim_ex_comment_strings_01.dump | 20 + .../testdir/dumps/vim_ex_comment_strings_99.dump | 20 - runtime/syntax/testdir/dumps/vim_ex_def_05.dump | 12 +- runtime/syntax/testdir/dumps/vim_ex_def_06.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_def_99.dump | 20 - .../syntax/testdir/dumps/vim_ex_def_fold_02.dump | 22 +- .../syntax/testdir/dumps/vim_ex_def_fold_03.dump | 24 +- .../syntax/testdir/dumps/vim_ex_def_fold_04.dump | 22 +- .../syntax/testdir/dumps/vim_ex_def_fold_05.dump | 20 - .../syntax/testdir/dumps/vim_ex_def_fold_06.dump | 20 - .../syntax/testdir/dumps/vim_ex_def_fold_07.dump | 20 - .../syntax/testdir/dumps/vim_ex_def_fold_99.dump | 20 - .../syntax/testdir/dumps/vim_ex_def_nested_00.dump | 2 +- .../syntax/testdir/dumps/vim_ex_def_nested_01.dump | 20 + .../syntax/testdir/dumps/vim_ex_def_nested_99.dump | 20 - .../testdir/dumps/vim_ex_def_nested_fold_00.dump | 2 +- .../testdir/dumps/vim_ex_def_nested_fold_99.dump | 20 - runtime/syntax/testdir/dumps/vim_ex_echo_02.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_echo_99.dump | 20 - .../syntax/testdir/dumps/vim_ex_execute_99.dump | 20 - .../syntax/testdir/dumps/vim_ex_function_10.dump | 20 + .../syntax/testdir/dumps/vim_ex_function_99.dump | 20 - ...vim_ex_function_def_tail_comment_errors_00.dump | 20 + ...vim_ex_function_def_tail_comment_errors_01.dump | 20 + ...vim_ex_function_def_tail_comment_errors_02.dump | 20 + .../vim_ex_function_def_tail_comments_00.dump | 20 + .../vim_ex_function_def_tail_comments_01.dump | 20 + .../vim_ex_function_def_tail_comments_02.dump | 20 + .../testdir/dumps/vim_ex_function_fold_02.dump | 16 +- .../testdir/dumps/vim_ex_function_fold_03.dump | 26 +- .../testdir/dumps/vim_ex_function_fold_04.dump | 26 +- .../testdir/dumps/vim_ex_function_fold_05.dump | 26 +- .../testdir/dumps/vim_ex_function_fold_06.dump | 30 +- .../testdir/dumps/vim_ex_function_fold_07.dump | 34 +- .../testdir/dumps/vim_ex_function_fold_08.dump | 20 - .../testdir/dumps/vim_ex_function_fold_09.dump | 20 - .../testdir/dumps/vim_ex_function_fold_10.dump | 20 - .../testdir/dumps/vim_ex_function_fold_11.dump | 20 - .../testdir/dumps/vim_ex_function_fold_12.dump | 20 - .../testdir/dumps/vim_ex_function_fold_99.dump | 20 - .../testdir/dumps/vim_ex_function_nested_02.dump | 20 + .../testdir/dumps/vim_ex_function_nested_99.dump | 20 - .../dumps/vim_ex_function_nested_fold_99.dump | 20 - .../syntax/testdir/dumps/vim_ex_highlight_03.dump | 20 + .../syntax/testdir/dumps/vim_ex_highlight_99.dump | 20 - .../testdir/dumps/vim_ex_let_heredoc_00.dump | 20 + .../testdir/dumps/vim_ex_let_heredoc_01.dump | 20 + .../testdir/dumps/vim_ex_let_heredoc_02.dump | 20 + .../testdir/dumps/vim_ex_let_heredoc_03.dump | 20 + .../testdir/dumps/vim_ex_let_heredoc_04.dump | 20 + .../testdir/dumps/vim_ex_let_heredoc_05.dump | 20 + .../testdir/dumps/vim_ex_let_heredoc_06.dump | 20 + .../testdir/dumps/vim_ex_let_heredoc_07.dump | 20 + .../testdir/dumps/vim_ex_let_heredoc_08.dump | 20 + .../testdir/dumps/vim_ex_let_heredoc_09.dump | 20 + .../testdir/dumps/vim_ex_let_heredoc_10.dump | 20 + .../testdir/dumps/vim_ex_let_heredoc_11.dump | 20 + .../syntax/testdir/dumps/vim_ex_loadkeymap_00.dump | 20 + .../syntax/testdir/dumps/vim_ex_loadkeymap_01.dump | 20 + .../dumps/vim_ex_loadkeymap_after_bar_00.dump | 20 + .../dumps/vim_ex_loadkeymap_after_colon_00.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_map_00.dump | 6 +- runtime/syntax/testdir/dumps/vim_ex_map_01.dump | 14 +- runtime/syntax/testdir/dumps/vim_ex_map_02.dump | 12 +- runtime/syntax/testdir/dumps/vim_ex_map_03.dump | 14 +- runtime/syntax/testdir/dumps/vim_ex_map_04.dump | 32 +- runtime/syntax/testdir/dumps/vim_ex_map_05.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_map_06.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_map_99.dump | 20 - runtime/syntax/testdir/dumps/vim_ex_match_00.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_match_01.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_menu_03.dump | 10 +- runtime/syntax/testdir/dumps/vim_ex_menu_04.dump | 12 +- runtime/syntax/testdir/dumps/vim_ex_menu_05.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_menu_99.dump | 20 - .../testdir/dumps/vim_ex_menutranslate_03.dump | 20 + .../testdir/dumps/vim_ex_menutranslate_99.dump | 20 - .../dumps/vim_ex_no_comment_strings_01.dump | 20 + .../dumps/vim_ex_no_comment_strings_99.dump | 20 - runtime/syntax/testdir/dumps/vim_ex_set_00.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_set_01.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_set_02.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_set_03.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_set_04.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_set_05.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_sleep_99.dump | 20 - .../syntax/testdir/dumps/vim_ex_substitute_08.dump | 20 + .../syntax/testdir/dumps/vim_ex_substitute_99.dump | 20 - runtime/syntax/testdir/dumps/vim_ex_syntax_01.dump | 10 +- runtime/syntax/testdir/dumps/vim_ex_syntax_02.dump | 10 +- runtime/syntax/testdir/dumps/vim_ex_syntax_03.dump | 10 +- runtime/syntax/testdir/dumps/vim_ex_syntax_04.dump | 10 +- runtime/syntax/testdir/dumps/vim_ex_syntax_05.dump | 10 +- runtime/syntax/testdir/dumps/vim_ex_syntax_06.dump | 10 +- runtime/syntax/testdir/dumps/vim_ex_syntax_07.dump | 10 +- runtime/syntax/testdir/dumps/vim_ex_syntax_08.dump | 10 +- runtime/syntax/testdir/dumps/vim_ex_syntax_09.dump | 10 +- runtime/syntax/testdir/dumps/vim_ex_syntax_10.dump | 20 + runtime/syntax/testdir/dumps/vim_ex_syntax_99.dump | 20 - runtime/syntax/testdir/dumps/vim_ex_throw_99.dump | 20 - runtime/syntax/testdir/dumps/vim_expr_01.dump | 14 +- runtime/syntax/testdir/dumps/vim_expr_02.dump | 16 +- runtime/syntax/testdir/dumps/vim_expr_03.dump | 16 +- runtime/syntax/testdir/dumps/vim_expr_04.dump | 20 + runtime/syntax/testdir/dumps/vim_expr_99.dump | 20 - .../syntax/testdir/dumps/vim_key_notation_09.dump | 20 + .../syntax/testdir/dumps/vim_key_notation_99.dump | 20 - runtime/syntax/testdir/dumps/vim_keymap_00.dump | 20 - runtime/syntax/testdir/dumps/vim_keymap_01.dump | 20 - runtime/syntax/testdir/dumps/vim_keymap_04.vim | 2 + runtime/syntax/testdir/dumps/vim_keymap_99.dump | 20 - runtime/syntax/testdir/dumps/vim_keymap_99.vim | 2 - .../testdir/dumps/vim_line_continuation_99.dump | 20 - runtime/syntax/testdir/dumps/vim_new_99.dump | 20 - .../testdir/dumps/vim_object_methods_00.dump | 4 +- .../testdir/dumps/vim_object_methods_02.dump | 6 +- .../testdir/dumps/vim_object_methods_03.dump | 20 + .../testdir/dumps/vim_object_methods_99.dump | 20 - runtime/syntax/testdir/dumps/vim_shebang_99.dump | 20 - runtime/syntax/testdir/dumps/vim_variables_99.dump | 20 - runtime/syntax/testdir/dumps/yaml.yaml_00.dump | 20 - runtime/syntax/testdir/dumps/yaml.yaml_01.dump | 20 - runtime/syntax/testdir/dumps/yaml.yaml_02.dump | 20 - runtime/syntax/testdir/dumps/yaml.yaml_03.dump | 20 - runtime/syntax/testdir/dumps/yaml.yaml_04.dump | 20 - runtime/syntax/testdir/dumps/yaml.yaml_05.dump | 20 - runtime/syntax/testdir/dumps/yaml.yaml_06.dump | 20 - runtime/syntax/testdir/dumps/yaml.yaml_07.dump | 20 - runtime/syntax/testdir/dumps/yaml.yaml_08.dump | 20 - runtime/syntax/testdir/dumps/yaml.yaml_99.dump | 20 - runtime/syntax/testdir/dumps/yaml_01.dump | 4 +- runtime/syntax/testdir/dumps/yaml_03.dump | 2 +- runtime/syntax/testdir/dumps/yaml_04.dump | 2 +- runtime/syntax/testdir/dumps/yaml_05.dump | 8 +- runtime/syntax/testdir/dumps/yaml_06.dump | 12 +- runtime/syntax/testdir/dumps/yaml_07.dump | 16 +- runtime/syntax/testdir/dumps/yaml_99.dump | 20 - .../testdir/input/java_annotations_signature.java | 78 ++ runtime/syntax/testdir/input/java_enfoldment.java | 16 +- runtime/syntax/testdir/input/java_generics.java | 140 +++ .../testdir/input/java_generics_signature.java | 140 +++ .../testdir/input/java_lambda_expressions.java | 2 +- .../input/java_lambda_expressions_signature.java | 154 +++ .../testdir/input/java_method_references.java | 186 +++ .../input/java_method_references_signature.java | 186 +++ .../syntax/testdir/input/java_methods_indent2.java | 18 +- .../input/java_methods_indent2_signature.java | 104 ++ .../syntax/testdir/input/java_methods_indent4.java | 18 +- .../input/java_methods_indent4_signature.java | 104 ++ .../syntax/testdir/input/java_methods_indent8.java | 18 +- .../input/java_methods_indent8_signature.java | 104 ++ .../input/java_methods_style_signature.java | 82 ++ runtime/syntax/testdir/input/java_switch.java | 10 +- runtime/syntax/testdir/input/java_unfoldment.java | 14 +- runtime/syntax/testdir/input/progress_comments.p | 45 + .../syntax/testdir/input/selftestdir/README.txt | 10 + runtime/syntax/testdir/input/selftestdir/dots_01 | 60 + runtime/syntax/testdir/input/selftestdir/dots_02 | 30 + runtime/syntax/testdir/input/selftestdir/dots_03 | 20 + runtime/syntax/testdir/input/selftestdir/dots_04 | 15 + runtime/syntax/testdir/input/selftestdir/dots_05 | 12 + runtime/syntax/testdir/input/selftestdir/dots_06 | 10 + runtime/syntax/testdir/input/selftestdir/dots_07 | 9 + runtime/syntax/testdir/input/selftestdir/dots_08 | 8 + runtime/syntax/testdir/input/selftestdir/dots_09 | 7 + runtime/syntax/testdir/input/selftestdir/dots_10 | 6 + runtime/syntax/testdir/input/selftestdir/dots_11 | 6 + runtime/syntax/testdir/input/selftestdir/dots_12 | 5 + runtime/syntax/testdir/input/selftestdir/dots_13 | 5 + runtime/syntax/testdir/input/selftestdir/dots_14 | 5 + runtime/syntax/testdir/input/selftestdir/dots_15 | 4 + runtime/syntax/testdir/input/selftestdir/dots_16 | 4 + runtime/syntax/testdir/input/selftestdir/dots_17 | 4 + runtime/syntax/testdir/input/selftestdir/dots_18 | 4 + runtime/syntax/testdir/input/selftestdir/dots_19 | 4 + runtime/syntax/testdir/input/selftestdir/dots_20 | 2 + runtime/syntax/testdir/input/vim9_ex_commands.vim | 1225 ++++++++++++++++++++ .../vim9_ex_function_def_tail_comment_errors.vim | 44 + .../input/vim9_ex_function_def_tail_comments.vim | 44 + .../syntax/testdir/input/vim9_ex_loadkeymap.vim | 26 + runtime/syntax/testdir/input/vim9_keymap.vim | 26 - runtime/syntax/testdir/input/vim_ex_call.vim | 51 + runtime/syntax/testdir/input/vim_ex_commands.vim | 56 +- runtime/syntax/testdir/input/vim_ex_def.vim | 2 +- runtime/syntax/testdir/input/vim_ex_def_fold.vim | 4 +- .../vim_ex_function_def_tail_comment_errors.vim | 43 + .../input/vim_ex_function_def_tail_comments.vim | 43 + .../syntax/testdir/input/vim_ex_function_fold.vim | 3 +- .../syntax/testdir/input/vim_ex_let_heredoc.vim | 196 ++++ runtime/syntax/testdir/input/vim_ex_loadkeymap.vim | 24 + .../testdir/input/vim_ex_loadkeymap_after_bar.vim | 10 + .../input/vim_ex_loadkeymap_after_colon.vim | 10 + runtime/syntax/testdir/input/vim_ex_map.vim | 24 +- runtime/syntax/testdir/input/vim_ex_match.vim | 32 + runtime/syntax/testdir/input/vim_ex_set.vim | 93 ++ runtime/syntax/testdir/input/vim_keymap.vim | 27 - runtime/syntax/testdir/input/yaml.yaml | 7 +- runtime/syntax/testdir/runtest.vim | 204 +++- runtime/syntax/testdir/viewdumps.vim | 24 + runtime/syntax/thrift.vim | 74 ++ runtime/syntax/tmux.vim | 12 +- runtime/syntax/tsv.vim | 12 + runtime/syntax/typst.vim | 472 ++++++++ runtime/syntax/vim.vim | 368 +++--- runtime/syntax/yaml.vim | 2 +- runtime/tutor/Makefile | 52 +- runtime/tutor/tutor.es | 2 +- runtime/tutor/tutor.es.utf-8 | 2 +- src/GvimExt/Make_ming.mak | 4 +- src/GvimExt/Make_mvc.mak | 25 +- src/INSTALL | 6 - src/Make_cyg_ming.mak | 58 +- src/Make_mvc.mak | 363 +++--- src/Makefile | 12 +- src/arglist.c | 6 + src/auto/configure | 37 +- src/autocmd.c | 13 + src/buffer.c | 39 +- src/bufwrite.c | 4 +- src/change.c | 4 +- src/channel.c | 2 +- src/charset.c | 34 +- src/cmdexpand.c | 15 +- src/config.h.in | 7 +- src/configure.ac | 19 +- src/dict.c | 7 +- src/edit.c | 8 +- src/errors.h | 41 +- src/eval.c | 106 +- src/evalfunc.c | 245 +++- src/evalvars.c | 2 +- src/ex_cmds.c | 25 +- src/ex_cmds2.c | 2 +- src/ex_docmd.c | 125 +- src/ex_getln.c | 65 +- src/fileio.c | 4 +- src/filepath.c | 14 +- src/findfile.c | 70 +- src/fold.c | 5 + src/getchar.c | 227 +++- src/globals.h | 68 +- src/gui.c | 2 +- src/gui_gtk_x11.c | 4 +- src/gui_w32.c | 9 +- src/help.c | 4 + src/highlight.c | 4 +- src/if_mzsch.c | 21 +- src/if_py_both.h | 16 +- src/if_python3.c | 58 +- src/indent.c | 2 +- src/insexpand.c | 229 +++- src/list.c | 7 +- src/macros.h | 6 +- src/map.c | 46 +- src/mark.c | 32 + src/mbyte.c | 11 +- src/memline.c | 10 +- src/misc1.c | 22 +- src/misc2.c | 2 +- src/move.c | 9 +- src/netbeans.c | 2 + src/normal.c | 10 +- src/ops.c | 31 +- src/option.h | 27 +- src/optiondefs.h | 16 +- src/optionstr.c | 25 +- src/os_mswin.c | 255 ++-- src/os_unix.c | 42 +- src/os_w32dll.c | 2 +- src/os_w32exe.c | 72 +- src/os_win32.c | 71 +- src/po/Make_cyg.mak | 10 +- src/po/Make_ming.mak | 12 +- src/po/Make_mvc.mak | 167 ++- src/po/Makefile | 101 +- src/po/README.txt | 17 + src/po/README_mvc.txt | 18 + src/po/ca.po | 4 +- src/po/cleanup.vim | 12 +- src/po/cs.cp1250.po | 2 +- src/po/da.po | 4 +- src/po/de.po | 4 +- src/po/eo.po | 4 +- src/po/es.po | 4 +- src/po/fi.po | 4 +- src/po/fixfilenames.vim | 8 +- src/po/fr.po | 4 +- src/po/ga.po | 4 +- src/po/hu.po | 4 +- src/po/it.po | 91 +- src/po/ja.euc-jp.po | 181 ++- src/po/ja.po | 181 ++- src/po/ja.sjis.po | 181 ++- src/po/ko.UTF-8.po | 4 +- src/po/ko.po | 10 +- src/po/nb.po | 5 +- src/po/nl.po | 4 +- src/po/no.po | 5 +- src/po/pl.UTF-8.po | 4 +- src/po/pl.cp1250.po | 6 +- src/po/pl.po | 4 +- src/po/pt_BR.po | 39 +- src/po/ru.cp1251.po | 329 ++---- src/po/ru.po | 2 +- src/po/sk.cp1250.po | 2 +- src/po/sr.po | 68 +- src/po/sv.po | 4 +- src/po/tojavascript.vim | 13 +- src/po/tr.po | 180 ++- src/po/uk.cp1251.po | 4 +- src/po/uk.po | 4 +- src/po/zh_CN.UTF-8.po | 4 +- src/po/zh_CN.cp936.po | 6 +- src/po/zh_CN.po | 6 +- src/po/zh_TW.po | 2 +- src/popupmenu.c | 21 +- src/popupwin.c | 54 +- src/proto/autocmd.pro | 1 + src/proto/dict.pro | 2 +- src/proto/findfile.pro | 2 +- src/proto/list.pro | 2 +- src/proto/mark.pro | 1 + src/proto/mbyte.pro | 1 + src/proto/memline.pro | 2 +- src/proto/option.pro | 1 + src/proto/optionstr.pro | 1 + src/proto/os_mswin.pro | 2 + src/proto/os_unix.pro | 1 + src/proto/popupwin.pro | 1 + src/proto/search.pro | 1 + src/proto/sign.pro | 2 +- src/proto/tag.pro | 1 + src/proto/typval.pro | 3 +- src/proto/userfunc.pro | 3 +- src/proto/vim9class.pro | 1 + src/proto/vim9instr.pro | 2 +- src/proto/window.pro | 1 + src/regexp.c | 58 +- src/regexp_bt.c | 8 + src/regexp_nfa.c | 9 +- src/search.c | 172 ++- src/sign.c | 37 +- src/spellfile.c | 8 +- src/strings.c | 64 +- src/structs.h | 23 +- src/syntax.c | 119 +- src/tag.c | 12 +- src/terminal.c | 18 +- src/testdir/Make_all.mak | 18 +- src/testdir/Make_mvc.mak | 8 +- src/testdir/Makefile | 4 +- src/testdir/README.txt | 83 +- src/testdir/commondumps.vim | 76 ++ src/testdir/crash/dialog_changed_uaf | Bin 0 -> 552 bytes src/testdir/crash/double_free | Bin 0 -> 561 bytes src/testdir/crash/heap_overflow3 | Bin 0 -> 700 bytes src/testdir/crash/nullpointer | Bin 0 -> 315 bytes src/testdir/crash/reverse_text_overflow | Bin 0 -> 314 bytes .../Test_breakindent_with_double_width_wrap_1.dump | 6 + src/testdir/dumps/Test_cmdwin_no_terminal.dump | 2 +- src/testdir/dumps/Test_matchparen_mbyte_1.dump | 10 + src/testdir/dumps/Test_matchparen_mbyte_2.dump | 10 + src/testdir/dumps/Test_matchparen_mbyte_3.dump | 10 + src/testdir/dumps/Test_matchparen_mbyte_4.dump | 10 + src/testdir/dumps/Test_matchparen_mbyte_5.dump | 10 + src/testdir/dumps/Test_matchparen_mbyte_6.dump | 10 + src/testdir/dumps/Test_matchparen_mbyte_7.dump | 10 + src/testdir/dumps/Test_matchparen_mbyte_8.dump | 10 + src/testdir/dumps/Test_popup_setbuf_01.dump | 10 + src/testdir/dumps/Test_popup_setbuf_02.dump | 10 + src/testdir/dumps/Test_popup_setbuf_03.dump | 10 + src/testdir/dumps/Test_popup_setbuf_04.dump | 10 + src/testdir/dumps/Test_popup_setbuf_05.dump | 10 + src/testdir/dumps/Test_popup_setbuf_06.dump | 10 + ...op_inserts_text_before_double_width_wrap_2.dump | 3 + ...op_inserts_text_before_double_width_wrap_3.dump | 3 + src/testdir/dumps/Test_pum_highlights_10.dump | 20 + src/testdir/dumps/Test_pum_highlights_11.dump | 20 + src/testdir/dumps/Test_pum_highlights_12.dump | 20 + src/testdir/dumps/Test_pum_highlights_13.dump | 20 + src/testdir/dumps/Test_pum_highlights_14.dump | 20 + src/testdir/dumps/Test_pum_highlights_15.dump | 20 + src/testdir/dumps/Test_pum_highlights_16.dump | 20 + src/testdir/dumps/Test_wildmenu_pum_11.dump | 2 +- src/testdir/dumps/Test_wildmenu_pum_12.dump | 2 +- src/testdir/dumps/Test_wildmenu_pum_13.dump | 2 +- src/testdir/dumps/Test_wildmenu_pum_22.dump | 4 +- src/testdir/gen_opt_test.vim | 1 + src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo | Bin 0 -> 875 bytes src/testdir/samples/Test_tohtml_basic.c.html | 47 + .../samples/Test_tohtml_basic_no_css.c.html | 40 + src/testdir/samples/test.zip | Bin 0 -> 464 bytes src/testdir/samples/testa.zip | Bin 0 -> 1236 bytes src/testdir/test28.in | 13 + src/testdir/test28.ok | 3 + src/testdir/test_arglist.vim | 23 + src/testdir/test_assert.vim | 9 + src/testdir/test_autocmd.vim | 174 ++- src/testdir/test_breakindent.vim | 11 + src/testdir/test_buffer.vim | 46 + src/testdir/test_cd.vim | 8 + src/testdir/test_cmdline.vim | 39 +- src/testdir/test_codestyle.vim | 12 +- src/testdir/test_cpoptions.vim | 119 +- src/testdir/test_crash.vim | 40 + src/testdir/test_eval_stuff.vim | 27 +- src/testdir/test_ex_mode.vim | 100 +- src/testdir/test_excmd.vim | 2 + src/testdir/test_filetype.vim | 217 +++- src/testdir/test_findfile.vim | 35 + src/testdir/test_fnamemodify.vim | 2 + src/testdir/test_fold.vim | 35 + src/testdir/test_functions.vim | 32 +- src/testdir/test_gettext.vim | 18 + src/testdir/test_gettext_cp1251.vim | 35 + src/testdir/test_gettext_make.vim | 72 ++ src/testdir/test_gettext_makefile_in1.vim | 7 + src/testdir/test_gettext_makefile_in2.vim | 6 + src/testdir/test_gettext_makefile_in3.vim | 4 + src/testdir/test_gettext_makefile_in4.vim | 6 + src/testdir/test_gettext_utf8.vim | 35 + src/testdir/test_getvar.vim | 8 + src/testdir/test_goto.vim | 7 +- src/testdir/test_gui.vim | 3 +- src/testdir/test_increment.vim | 38 + src/testdir/test_ins_complete.vim | 118 ++ src/testdir/test_jumplist.vim | 68 +- src/testdir/test_listdict.vim | 92 ++ src/testdir/test_listlbr_utf8.vim | 6 + src/testdir/test_mapping.vim | 43 + src/testdir/test_matchparen.vim | 30 + src/testdir/test_menu.vim | 41 +- src/testdir/test_normal.vim | 3 + src/testdir/test_options.vim | 10 +- src/testdir/test_partial.vim | 22 + src/testdir/test_paste.vim | 2 +- src/testdir/test_popup.vim | 93 ++ src/testdir/test_popupwin.vim | 82 ++ src/testdir/test_put.vim | 8 - src/testdir/test_quickfix.vim | 4 +- src/testdir/test_regexp_utf8.vim | 32 + src/testdir/test_search.vim | 31 + src/testdir/test_selectmode.vim | 16 + src/testdir/test_signs.vim | 40 +- src/testdir/test_spell.vim | 15 + src/testdir/test_spellfile.vim | 16 + src/testdir/test_substitute.vim | 15 +- src/testdir/test_tabpage.vim | 58 + src/testdir/test_tagjump.vim | 57 +- src/testdir/test_taglist.vim | 47 +- src/testdir/test_termcodes.vim | 11 + src/testdir/test_termdebug.vim | 205 +++- src/testdir/test_textobjects.vim | 12 + src/testdir/test_textprop.vim | 4 + src/testdir/test_tohtml.vim | 72 ++ src/testdir/test_usercommands.vim | 4 + src/testdir/test_vim9_builtin.vim | 66 ++ src/testdir/test_vim9_class.vim | 469 ++++++++ src/testdir/test_vim9_cmd.vim | 9 + src/testdir/test_vim9_disassemble.vim | 90 ++ src/testdir/test_vim9_func.vim | 10 + src/testdir/test_vim9_script.vim | 18 +- src/testdir/test_vimscript.vim | 25 + src/testdir/test_winfixbuf.vim | 1 + src/testdir/test_xxd.vim | 16 +- src/testdir/test_zip_plugin.vim | 237 ++++ src/testdir/view_util.vim | 2 +- src/testdir/viewdumps.vim | 11 + src/testing.c | 11 +- src/textobject.c | 11 +- src/textprop.c | 2 +- src/typval.c | 89 +- src/undo.c | 4 +- src/usercmd.c | 510 ++++---- src/userfunc.c | 95 +- src/version.c | 404 +++++++ src/vim.h | 10 +- src/vim9.h | 3 +- src/vim9class.c | 127 +- src/vim9cmds.c | 4 +- src/vim9compile.c | 13 +- src/vim9execute.c | 81 +- src/vim9expr.c | 24 +- src/vim9instr.c | 6 +- src/vim9type.c | 16 +- src/viminfo.c | 2 +- src/window.c | 76 +- src/xxd/Make_ming.mak | 2 +- src/xxd/Make_mvc.mak | 2 +- 1199 files changed, 29374 insertions(+), 9815 deletions(-) create mode 100644 runtime/autoload/typst.vim create mode 100644 runtime/compiler/typst.vim create mode 100644 runtime/ftplugin/antlr4.vim create mode 100644 runtime/ftplugin/asy.vim create mode 100644 runtime/ftplugin/autohotkey.vim create mode 100644 runtime/ftplugin/bindzone.vim create mode 100644 runtime/ftplugin/cabal.vim create mode 100644 runtime/ftplugin/cedar.vim create mode 100644 runtime/ftplugin/cmakecache.vim create mode 100644 runtime/ftplugin/csv.vim create mode 100644 runtime/ftplugin/cuda.vim create mode 100644 runtime/ftplugin/editorconfig.vim create mode 100644 runtime/ftplugin/goaccess.vim create mode 100644 runtime/ftplugin/gomod.vim create mode 100644 runtime/ftplugin/hlsplaylist.vim create mode 100644 runtime/ftplugin/htmlangular.vim create mode 100644 runtime/ftplugin/javacc.vim create mode 100644 runtime/ftplugin/kivy.vim create mode 100644 runtime/ftplugin/ldapconf.vim create mode 100644 runtime/ftplugin/lex.vim create mode 100644 runtime/ftplugin/mediawiki.vim create mode 100644 runtime/ftplugin/mojo.vim create mode 100644 runtime/ftplugin/mysql.vim create mode 100644 runtime/ftplugin/objcpp.vim create mode 100644 runtime/ftplugin/squirrel.vim create mode 100644 runtime/ftplugin/terraform.vim create mode 100644 runtime/ftplugin/tf.vim create mode 100644 runtime/ftplugin/thrift.vim create mode 100644 runtime/ftplugin/yacc.vim create mode 100644 runtime/indent/glsl.vim create mode 100644 runtime/indent/mojo.vim create mode 100644 runtime/indent/proto.vim create mode 100644 runtime/indent/testdir/lua.in create mode 100644 runtime/indent/testdir/lua.ok create mode 100644 runtime/indent/testdir/thrift.in create mode 100644 runtime/indent/testdir/thrift.ok create mode 100644 runtime/indent/thrift.vim create mode 100644 runtime/indent/typst.vim create mode 100644 runtime/pack/dist/opt/nohlsearch/plugin/nohlsearch.vim create mode 100644 runtime/syntax/antlr4.vim create mode 100644 runtime/syntax/asy.vim create mode 100644 runtime/syntax/csv.vim create mode 100644 runtime/syntax/glsl.vim create mode 100644 runtime/syntax/goaccess.vim create mode 100644 runtime/syntax/htmlangular.vim create mode 100644 runtime/syntax/mediawiki.vim create mode 100644 runtime/syntax/testdir/dumps/c_07.dump delete mode 100644 runtime/syntax/testdir/dumps/c_99.dump create mode 100644 runtime/syntax/testdir/dumps/dots_01_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_01_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_01_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_01_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_02_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_02_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_02_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_02_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_03_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_03_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_03_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_03_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_04_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_04_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_04_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_04_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_04_04.dump create mode 100644 runtime/syntax/testdir/dumps/dots_05_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_05_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_05_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_05_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_05_04.dump create mode 100644 runtime/syntax/testdir/dumps/dots_06_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_06_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_06_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_06_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_07_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_07_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_07_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_07_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_07_04.dump create mode 100644 runtime/syntax/testdir/dumps/dots_08_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_08_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_08_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_08_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_08_04.dump create mode 100644 runtime/syntax/testdir/dumps/dots_09_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_09_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_09_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_09_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_10_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_10_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_10_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_10_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_10_04.dump create mode 100644 runtime/syntax/testdir/dumps/dots_10_05.dump create mode 100644 runtime/syntax/testdir/dumps/dots_11_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_11_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_11_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_11_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_11_04.dump create mode 100644 runtime/syntax/testdir/dumps/dots_11_05.dump create mode 100644 runtime/syntax/testdir/dumps/dots_12_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_12_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_12_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_12_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_12_04.dump create mode 100644 runtime/syntax/testdir/dumps/dots_13_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_13_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_13_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_13_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_13_04.dump create mode 100644 runtime/syntax/testdir/dumps/dots_14_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_14_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_14_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_14_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_14_04.dump create mode 100644 runtime/syntax/testdir/dumps/dots_15_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_15_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_15_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_15_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_16_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_16_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_16_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_16_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_17_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_17_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_17_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_17_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_18_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_18_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_18_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_18_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_19_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_19_01.dump create mode 100644 runtime/syntax/testdir/dumps/dots_19_02.dump create mode 100644 runtime/syntax/testdir/dumps/dots_19_03.dump create mode 100644 runtime/syntax/testdir/dumps/dots_20_00.dump create mode 100644 runtime/syntax/testdir/dumps/dots_20_01.dump delete mode 100644 runtime/syntax/testdir/dumps/html_99.dump delete mode 100644 runtime/syntax/testdir/dumps/java_annotations_99.dump create mode 100644 runtime/syntax/testdir/dumps/java_annotations_signature_00.dump create mode 100644 runtime/syntax/testdir/dumps/java_annotations_signature_01.dump create mode 100644 runtime/syntax/testdir/dumps/java_annotations_signature_02.dump create mode 100644 runtime/syntax/testdir/dumps/java_annotations_signature_03.dump create mode 100644 runtime/syntax/testdir/dumps/java_annotations_signature_04.dump create mode 100644 runtime/syntax/testdir/dumps/java_comments_05.dump delete mode 100644 runtime/syntax/testdir/dumps/java_comments_99.dump delete mode 100644 runtime/syntax/testdir/dumps/java_contextual_keywords_99.dump delete mode 100644 runtime/syntax/testdir/dumps/java_enfoldment_03.dump delete mode 100644 runtime/syntax/testdir/dumps/java_enfoldment_04.dump delete mode 100644 runtime/syntax/testdir/dumps/java_enfoldment_99.dump create mode 100644 runtime/syntax/testdir/dumps/java_escapes_07.dump delete mode 100644 runtime/syntax/testdir/dumps/java_escapes_99.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_00.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_01.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_02.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_03.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_04.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_05.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_06.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_07.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_signature_00.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_signature_01.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_signature_02.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_signature_03.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_signature_04.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_signature_05.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_signature_06.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_signature_07.dump delete mode 100644 runtime/syntax/testdir/dumps/java_lambda_expressions_99.dump create mode 100644 runtime/syntax/testdir/dumps/java_lambda_expressions_signature_00.dump create mode 100644 runtime/syntax/testdir/dumps/java_lambda_expressions_signature_01.dump create mode 100644 runtime/syntax/testdir/dumps/java_lambda_expressions_signature_02.dump create mode 100644 runtime/syntax/testdir/dumps/java_lambda_expressions_signature_03.dump create mode 100644 runtime/syntax/testdir/dumps/java_lambda_expressions_signature_04.dump create mode 100644 runtime/syntax/testdir/dumps/java_lambda_expressions_signature_05.dump create mode 100644 runtime/syntax/testdir/dumps/java_lambda_expressions_signature_06.dump create mode 100644 runtime/syntax/testdir/dumps/java_lambda_expressions_signature_07.dump create mode 100644 runtime/syntax/testdir/dumps/java_lambda_expressions_signature_08.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_00.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_01.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_02.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_03.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_04.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_05.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_06.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_07.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_08.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_09.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_10.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_signature_00.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_signature_01.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_signature_02.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_signature_03.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_signature_04.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_signature_05.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_signature_06.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_signature_07.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_signature_08.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_signature_09.dump create mode 100644 runtime/syntax/testdir/dumps/java_method_references_signature_10.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_05.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_05.vim delete mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_99.dump delete mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_99.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_00.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_00.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_01.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_01.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_02.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_02.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_03.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_03.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_04.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_04.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_05.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_signature_05.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_05.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_05.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_06.dump delete mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_99.dump delete mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_99.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_00.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_00.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_01.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_01.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_02.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_02.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_03.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_03.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_04.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_04.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_05.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_05.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent4_signature_06.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_05.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_05.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_06.dump delete mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_99.dump delete mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_99.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_00.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_00.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_01.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_01.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_02.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_02.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_03.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_03.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_04.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_04.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_05.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_05.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_06.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent8_signature_06.vim delete mode 100644 runtime/syntax/testdir/dumps/java_methods_style_99.dump delete mode 100644 runtime/syntax/testdir/dumps/java_methods_style_99.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_style_signature_00.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_style_signature_00.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_style_signature_01.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_style_signature_01.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_style_signature_02.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_style_signature_02.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_style_signature_03.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_style_signature_03.vim create mode 100644 runtime/syntax/testdir/dumps/java_methods_style_signature_04.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_style_signature_04.vim create mode 100644 runtime/syntax/testdir/dumps/java_numbers_05.dump delete mode 100644 runtime/syntax/testdir/dumps/java_numbers_99.dump delete mode 100644 runtime/syntax/testdir/dumps/java_string_99.dump create mode 100644 runtime/syntax/testdir/dumps/java_switch_07.dump delete mode 100644 runtime/syntax/testdir/dumps/java_switch_99.dump create mode 100644 runtime/syntax/testdir/dumps/java_unfoldment_05.dump delete mode 100644 runtime/syntax/testdir/dumps/java_unfoldment_99.dump delete mode 100644 runtime/syntax/testdir/dumps/markdown_conceal_99.dump delete mode 100644 runtime/syntax/testdir/dumps/modula2_iso_99.dump create mode 100644 runtime/syntax/testdir/dumps/modula2_pim_06.dump delete mode 100644 runtime/syntax/testdir/dumps/modula2_pim_99.dump create mode 100644 runtime/syntax/testdir/dumps/modula2_r10_08.dump delete mode 100644 runtime/syntax/testdir/dumps/modula2_r10_99.dump create mode 100644 runtime/syntax/testdir/dumps/progress_comments_00.dump create mode 100644 runtime/syntax/testdir/dumps/progress_comments_01.dump create mode 100644 runtime/syntax/testdir/dumps/progress_comments_02.dump delete mode 100644 runtime/syntax/testdir/dumps/sh_01_99.dump delete mode 100644 runtime/syntax/testdir/dumps/sh_02_99.dump create mode 100644 runtime/syntax/testdir/dumps/sh_03_02.dump delete mode 100644 runtime/syntax/testdir/dumps/sh_03_99.dump delete mode 100644 runtime/syntax/testdir/dumps/sh_04_99.dump create mode 100644 runtime/syntax/testdir/dumps/sh_05_21.dump delete mode 100644 runtime/syntax/testdir/dumps/sh_05_99.dump create mode 100644 runtime/syntax/testdir/dumps/sh_06_04.dump delete mode 100644 runtime/syntax/testdir/dumps/sh_06_99.dump create mode 100644 runtime/syntax/testdir/dumps/sh_07_05.dump delete mode 100644 runtime/syntax/testdir/dumps/sh_07_99.dump delete mode 100644 runtime/syntax/testdir/dumps/sh_08_99.dump delete mode 100644 runtime/syntax/testdir/dumps/sh_09_99.dump delete mode 100644 runtime/syntax/testdir/dumps/sh_10_99.dump create mode 100644 runtime/syntax/testdir/dumps/sh_11_01.dump delete mode 100644 runtime/syntax/testdir/dumps/sh_11_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim9_comment_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_02.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_03.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_04.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_05.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_06.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_07.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_08.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_09.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_10.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_11.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_12.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_13.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_14.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_15.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_17.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_18.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_19.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_20.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_21.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_22.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_23.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_24.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_25.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_26.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_27.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_28.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_29.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_30.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_31.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_32.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_33.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_34.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_35.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_36.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_37.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_38.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_39.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_40.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_41.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_42.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_43.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_44.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_45.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_46.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_47.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_48.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_50.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_51.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_52.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_53.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_54.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_55.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_56.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_57.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_58.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_59.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_60.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_61.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_62.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_63.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_64.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_65.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_66.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_67.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_commands_68.dump delete mode 100644 runtime/syntax/testdir/dumps/vim9_ex_comment_strings_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump delete mode 100644 runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim9_keymap_00.dump delete mode 100644 runtime/syntax/testdir/dumps/vim9_keymap_01.dump delete mode 100644 runtime/syntax/testdir/dumps/vim9_keymap_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim9_keymap_99.vim delete mode 100644 runtime/syntax/testdir/dumps/vim9_legacy_header_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim9_legacy_header_fold_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim9_shebang_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_comment_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_abbreviate_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_augroup_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_behave_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_call_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_call_01.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_call_02.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_call_03.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_catch_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_command_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_commands_67.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_commands_68.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_commands_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_comment_strings_01.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_comment_strings_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_def_06.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_def_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_def_fold_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_def_nested_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_echo_02.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_echo_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_execute_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_10.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_fold_08.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_fold_09.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_fold_11.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_fold_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_nested_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_highlight_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_01.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_02.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_03.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_05.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_09.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_10.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_let_heredoc_11.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_map_05.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_map_06.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_map_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_match_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_match_01.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_menu_05.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_menu_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_menutranslate_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_01.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_set_00.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_set_01.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_set_02.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_set_03.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_set_04.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_set_05.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_sleep_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_substitute_08.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_substitute_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_ex_syntax_10.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_syntax_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_ex_throw_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_expr_04.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_expr_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_key_notation_09.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_key_notation_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_keymap_00.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_keymap_01.dump create mode 100644 runtime/syntax/testdir/dumps/vim_keymap_04.vim delete mode 100644 runtime/syntax/testdir/dumps/vim_keymap_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_keymap_99.vim delete mode 100644 runtime/syntax/testdir/dumps/vim_line_continuation_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_new_99.dump create mode 100644 runtime/syntax/testdir/dumps/vim_object_methods_03.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_object_methods_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_shebang_99.dump delete mode 100644 runtime/syntax/testdir/dumps/vim_variables_99.dump delete mode 100644 runtime/syntax/testdir/dumps/yaml.yaml_00.dump delete mode 100644 runtime/syntax/testdir/dumps/yaml.yaml_01.dump delete mode 100644 runtime/syntax/testdir/dumps/yaml.yaml_02.dump delete mode 100644 runtime/syntax/testdir/dumps/yaml.yaml_03.dump delete mode 100644 runtime/syntax/testdir/dumps/yaml.yaml_04.dump delete mode 100644 runtime/syntax/testdir/dumps/yaml.yaml_05.dump delete mode 100644 runtime/syntax/testdir/dumps/yaml.yaml_06.dump delete mode 100644 runtime/syntax/testdir/dumps/yaml.yaml_07.dump delete mode 100644 runtime/syntax/testdir/dumps/yaml.yaml_08.dump delete mode 100644 runtime/syntax/testdir/dumps/yaml.yaml_99.dump delete mode 100644 runtime/syntax/testdir/dumps/yaml_99.dump create mode 100644 runtime/syntax/testdir/input/java_annotations_signature.java create mode 100644 runtime/syntax/testdir/input/java_generics.java create mode 100644 runtime/syntax/testdir/input/java_generics_signature.java create mode 100644 runtime/syntax/testdir/input/java_lambda_expressions_signature.java create mode 100644 runtime/syntax/testdir/input/java_method_references.java create mode 100644 runtime/syntax/testdir/input/java_method_references_signature.java create mode 100644 runtime/syntax/testdir/input/java_methods_indent2_signature.java create mode 100644 runtime/syntax/testdir/input/java_methods_indent4_signature.java create mode 100644 runtime/syntax/testdir/input/java_methods_indent8_signature.java create mode 100644 runtime/syntax/testdir/input/java_methods_style_signature.java create mode 100644 runtime/syntax/testdir/input/progress_comments.p create mode 100644 runtime/syntax/testdir/input/selftestdir/README.txt create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_01 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_02 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_03 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_04 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_05 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_06 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_07 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_08 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_09 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_10 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_11 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_12 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_13 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_14 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_15 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_16 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_17 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_18 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_19 create mode 100644 runtime/syntax/testdir/input/selftestdir/dots_20 create mode 100644 runtime/syntax/testdir/input/vim9_ex_commands.vim create mode 100644 runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim create mode 100644 runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim create mode 100644 runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim delete mode 100644 runtime/syntax/testdir/input/vim9_keymap.vim create mode 100644 runtime/syntax/testdir/input/vim_ex_call.vim create mode 100644 runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim create mode 100644 runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim create mode 100644 runtime/syntax/testdir/input/vim_ex_let_heredoc.vim create mode 100644 runtime/syntax/testdir/input/vim_ex_loadkeymap.vim create mode 100644 runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim create mode 100644 runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim create mode 100644 runtime/syntax/testdir/input/vim_ex_match.vim create mode 100644 runtime/syntax/testdir/input/vim_ex_set.vim delete mode 100644 runtime/syntax/testdir/input/vim_keymap.vim create mode 100644 runtime/syntax/testdir/viewdumps.vim create mode 100644 runtime/syntax/thrift.vim create mode 100644 runtime/syntax/tsv.vim create mode 100644 runtime/syntax/typst.vim create mode 100644 src/testdir/commondumps.vim create mode 100644 src/testdir/crash/dialog_changed_uaf create mode 100644 src/testdir/crash/double_free create mode 100644 src/testdir/crash/heap_overflow3 create mode 100644 src/testdir/crash/nullpointer create mode 100644 src/testdir/crash/reverse_text_overflow create mode 100644 src/testdir/dumps/Test_breakindent_with_double_width_wrap_1.dump create mode 100644 src/testdir/dumps/Test_matchparen_mbyte_1.dump create mode 100644 src/testdir/dumps/Test_matchparen_mbyte_2.dump create mode 100644 src/testdir/dumps/Test_matchparen_mbyte_3.dump create mode 100644 src/testdir/dumps/Test_matchparen_mbyte_4.dump create mode 100644 src/testdir/dumps/Test_matchparen_mbyte_5.dump create mode 100644 src/testdir/dumps/Test_matchparen_mbyte_6.dump create mode 100644 src/testdir/dumps/Test_matchparen_mbyte_7.dump create mode 100644 src/testdir/dumps/Test_matchparen_mbyte_8.dump create mode 100644 src/testdir/dumps/Test_popup_setbuf_01.dump create mode 100644 src/testdir/dumps/Test_popup_setbuf_02.dump create mode 100644 src/testdir/dumps/Test_popup_setbuf_03.dump create mode 100644 src/testdir/dumps/Test_popup_setbuf_04.dump create mode 100644 src/testdir/dumps/Test_popup_setbuf_05.dump create mode 100644 src/testdir/dumps/Test_popup_setbuf_06.dump create mode 100644 src/testdir/dumps/Test_prop_inserts_text_before_double_width_wrap_2.dump create mode 100644 src/testdir/dumps/Test_prop_inserts_text_before_double_width_wrap_3.dump create mode 100644 src/testdir/dumps/Test_pum_highlights_10.dump create mode 100644 src/testdir/dumps/Test_pum_highlights_11.dump create mode 100644 src/testdir/dumps/Test_pum_highlights_12.dump create mode 100644 src/testdir/dumps/Test_pum_highlights_13.dump create mode 100644 src/testdir/dumps/Test_pum_highlights_14.dump create mode 100644 src/testdir/dumps/Test_pum_highlights_15.dump create mode 100644 src/testdir/dumps/Test_pum_highlights_16.dump create mode 100644 src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo create mode 100644 src/testdir/samples/Test_tohtml_basic.c.html create mode 100644 src/testdir/samples/Test_tohtml_basic_no_css.c.html create mode 100644 src/testdir/samples/test.zip create mode 100644 src/testdir/samples/testa.zip create mode 100644 src/testdir/test28.in create mode 100644 src/testdir/test28.ok create mode 100644 src/testdir/test_gettext.vim create mode 100644 src/testdir/test_gettext_cp1251.vim create mode 100644 src/testdir/test_gettext_make.vim create mode 100644 src/testdir/test_gettext_makefile_in1.vim create mode 100644 src/testdir/test_gettext_makefile_in2.vim create mode 100644 src/testdir/test_gettext_makefile_in3.vim create mode 100644 src/testdir/test_gettext_makefile_in4.vim create mode 100644 src/testdir/test_gettext_utf8.vim create mode 100644 src/testdir/test_tohtml.vim create mode 100644 src/testdir/test_zip_plugin.vim create mode 100644 src/testdir/viewdumps.vim diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS index 1254782..38ab300 100644 --- a/.github/MAINTAINERS +++ b/.github/MAINTAINERS @@ -18,6 +18,7 @@ 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 @gpanders runtime/autoload/xmlformat.vim @chrisbra runtime/autoload/dist/json.vim @habamax runtime/colors/blue.vim @habamax @romainl @neutaaaaan @@ -100,6 +101,7 @@ 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 @gpanders runtime/compiler/xmllint.vim @dkearns runtime/compiler/xo.vim @dkearns runtime/compiler/yamllint.vim @romainl @@ -107,19 +109,28 @@ runtime/compiler/zsh.vim @dkearns runtime/doc/ft_hare.txt @selenebun runtime/doc/ps1.txt @heaths runtime/ftplugin/abaqus.vim @costerwi -runtime/ftplugin/apache.vim @dubgeiser +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/bst.vim @tpope +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/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 @@ -127,6 +138,7 @@ runtime/ftplugin/debcontrol.vim @jamessan runtime/ftplugin/debsources.vim @jamessan runtime/ftplugin/desktop.vim @e-kwsm 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 @@ -148,15 +160,18 @@ runtime/ftplugin/gitconfig.vim @tpope runtime/ftplugin/gitignore.vim @ObserverOfTime runtime/ftplugin/gitrebase.vim @tpope runtime/ftplugin/gitsendemail.vim @tpope -runtime/ftplugin/graphql.vim @ribru17 -runtime/ftplugin/gyp.vim @ObserverOfTime 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 @ribru17 +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/hgcommit.vim @k-takata +runtime/ftplugin/hlsplaylist.vim @avidseeker runtime/ftplugin/hog.vim @wtfbbqhax runtime/ftplugin/html.vim @dkearns runtime/ftplugin/hyprlang.vim @ribru17 @@ -166,6 +181,7 @@ 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/jj.vim @gpanders @@ -176,8 +192,11 @@ runtime/ftplugin/julia.vim @carlobaldassi 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/less.vim @genoma +runtime/ftplugin/lex.vim @ribru17 runtime/ftplugin/liquid.vim @tpope runtime/ftplugin/lua.vim @dkearns runtime/ftplugin/lc.vim @ribru17 @@ -185,14 +204,17 @@ 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/nginx.vim @chr4 runtime/ftplugin/nim.vim @ribru17 runtime/ftplugin/nroff.vim @a-vrma runtime/ftplugin/nsis.vim @k-takata runtime/ftplugin/octave.vim @dkearns +runtime/ftplugin/ondir.vim @jparise runtime/ftplugin/openvpn.vim @ObserverOfTime runtime/ftplugin/pascal.vim @dkearns runtime/ftplugin/pbtxt.vim @lakshayg @@ -220,6 +242,7 @@ runtime/ftplugin/ruby.vim @tpope @dkearns runtime/ftplugin/rust.vim @lilyball 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 @@ -229,6 +252,7 @@ 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 @@ -237,13 +261,16 @@ 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/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 @ribru17 +runtime/ftplugin/typst.vim @gpanders runtime/ftplugin/unison.vim @chuwy runtime/ftplugin/v.vim @ribru17 runtime/ftplugin/vdf.vim @ObserverOfTime @@ -254,6 +281,7 @@ 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 @@ -282,6 +310,7 @@ 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/gyp.vim @ObserverOfTime runtime/indent/haml.vim @tpope @@ -304,6 +333,7 @@ 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 @@ -311,6 +341,7 @@ 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 @@ -320,6 +351,7 @@ 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 @@ -327,7 +359,9 @@ runtime/indent/systemverilog.vim @Kocha runtime/indent/tcl.vim @dkearns runtime/indent/tcsh.vim @dkearns runtime/indent/teraterm.vim @k-takata +runtime/indent/thrift.vim @jiangyinzuo runtime/indent/typescript.vim @HerringtonDarkholme +runtime/indent/typst.vim @gpanders runtime/indent/vroom.vim @dbarnett runtime/indent/wast.vim @rhysd runtime/indent/xml.vim @chrisbra @@ -343,17 +377,20 @@ 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 @@ -365,9 +402,11 @@ 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 @@ -407,7 +446,9 @@ 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 @@ -423,6 +464,7 @@ 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 @@ -436,6 +478,7 @@ runtime/syntax/jsonc.vim @izhakjakov runtime/syntax/julia.vim @carlobaldassi runtime/syntax/jq.vim @vito-c 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 @@ -451,6 +494,7 @@ 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 @@ -463,6 +507,7 @@ 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/openvpn.vim @ObserverOfTime runtime/syntax/pacmanlog.vim @rpigott runtime/syntax/pascal.vim @dkearns @@ -475,6 +520,7 @@ 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 @@ -498,6 +544,7 @@ runtime/syntax/rst.vim @marshallward runtime/syntax/ruby.vim @dkearns 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 @@ -518,6 +565,7 @@ runtime/syntax/systemverilog.vim @Kocha runtime/syntax/tap.vim @petdance runtime/syntax/tcsh.vim @dkearns runtime/syntax/teraterm.vim @k-takata +runtime/syntax/thrift.vim @jiangyinzuo runtime/syntax/tidy.vim @dkearns runtime/syntax/tmux.vim @ericpruitt runtime/syntax/toml.vim @averms @@ -526,6 +574,7 @@ 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 diff --git a/.github/actions/screendump/action.yml b/.github/actions/screendump/action.yml index 19eb9b6..5cbc820 100644 --- a/.github/actions/screendump/action.yml +++ b/.github/actions/screendump/action.yml @@ -1,13 +1,13 @@ name: 'screendump' -description: "Upload failed syntax tests" +description: "Upload failed screendump tests" runs: using: "composite" steps: - - name: Upload failed syntax tests + - name: Upload failed tests uses: actions/upload-artifact@v4 with: # Name of the artifact to upload. - name: ${{ github.workflow }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-syntax-tests + name: ${{ github.workflow }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-tests # A file, directory or wildcard pattern that describes what # to upload. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1110665..edad08a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: env: CC: ${{ matrix.compiler }} GCC_VER: 13 - CLANG_VER: 18 + CLANG_VER: 19 TEST: test SRCDIR: ./src LEAK_CFLAGS: -DEXITFREE @@ -434,6 +434,9 @@ jobs: # SODIUM_MINGW_URL: https://download.libsodium.org/libsodium/releases/libsodium-%SODIUM_VER%-stable-mingw.tar.gz SODIUM_MINGW_URL: https://github.com/jedisct1/libsodium/releases/download/%SODIUM_VER%-RELEASE/libsodium-%SODIUM_VER%-mingw.tar.gz SODIUM_MINGW_VER: 26 + # Gettext-tools, iconv and libraries + GETTEXT32_URL: https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-shared-32.zip + GETTEXT64_URL: https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-shared-64.zip # Escape sequences COL_RED: "\x1b[31m" COL_GREEN: "\x1b[32m" @@ -501,6 +504,7 @@ jobs: echo "SODIUM_DIR_SLASH=${SODIUM_DIR_SLASH}" >> $GITHUB_ENV fi echo "SODIUM_DIR=${SODIUM_DIR}" >> $GITHUB_ENV + echo "GETTEXT_PATH=D:\gettext${{ matrix.arch == 'x64' && '64' || '32' }}" >> $GITHUB_ENV - uses: msys2/setup-msys2@v2 if: matrix.toolchain == 'mingw' @@ -522,6 +526,8 @@ jobs: echo %LUA_RELEASE%>> urls.txt echo %WINPTY_URL%>> urls.txt echo %SODIUM_VER%>> urls.txt + echo %GETTEXT32_URL%>> urls.txt + echo %GETTEXT64_URL%>> urls.txt - name: Cache downloaded files uses: actions/cache@v4 @@ -555,6 +561,12 @@ jobs: mklink %SODIUM_LIB%\libsodium.dll %SODIUM_LIB%\libsodium-%SODIUM_MINGW_VER%.dll ) + echo %COL_GREEN%Download Gettext%COL_RESET% + call :downloadfile %GETTEXT${{ env.BITS }}_URL% downloads\gettext${{ env.BITS }}.zip + 7z e -y downloads\gettext${{ env.BITS }}.zip -oD:\gettext${{ env.BITS }} > nul || exit 1 + copy /y D:\gettext${{ env.BITS }}\libintl-8.dll src\ || exit 1 + copy /y D:\gettext${{ env.BITS }}\libiconv-2.dll src\ || exit 1 + goto :eof :downloadfile diff --git a/.gitignore b/.gitignore index 241e96e..048ced9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ src/auto/gui_gtk_gresources.h src/auto/os_haiku.rdef src/objects/.dirstamp src/objects +src/po/big5corr +src/po/sjiscorr src/types.vim # We do need src/auto/configure. diff --git a/.hgignore b/.hgignore index 8b73f1b..5c9754e 100644 --- a/.hgignore +++ b/.hgignore @@ -10,6 +10,8 @@ src/auto/gui_gtk_gresources.h src/auto/os_haiku.rdef src/objects/.dirstamp src/objects +src/po/big5corr +src/po/sjiscorr src/types.vim # We do need src/auto/configure. diff --git a/Filelist b/Filelist index 20c19f7..803de2a 100644 --- a/Filelist +++ b/Filelist @@ -185,6 +185,7 @@ SRC_ALL = \ 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 \ @@ -198,6 +199,7 @@ SRC_ALL = \ 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 \ @@ -214,13 +216,17 @@ SRC_ALL = \ src/testdir/pyxfile/*.py \ src/testdir/dumps/*.dump \ src/testdir/dumps/*.vim \ + src/testdir/samples/*.html \ src/testdir/samples/*.txt \ src/testdir/samples/*.vim \ src/testdir/samples/test000 \ + src/testdir/samples/test.zip \ + src/testdir/samples/testa.zip \ src/testdir/color_ramp.vim \ src/testdir/silent.wav \ src/testdir/popupbounce.vim \ src/testdir/crash/* \ + src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo \ src/proto.h \ src/protodef.h \ src/proto/alloc.pro \ @@ -782,6 +788,7 @@ RT_ALL = \ runtime/pack/dist/opt/matchit/doc/matchit.txt \ runtime/pack/dist/opt/matchit/doc/tags \ runtime/pack/dist/opt/matchit/autoload/*.vim \ + runtime/pack/dist/opt/nohlsearch/plugin/nohlsearch.vim \ runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim \ runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim \ runtime/pack/dist/opt/termdebug/plugin/termdebug.vim \ @@ -832,8 +839,10 @@ RT_SCRIPTS = \ runtime/syntax/Makefile \ runtime/syntax/testdir/README.txt \ runtime/syntax/testdir/runtest.vim \ + runtime/syntax/testdir/viewdumps.vim \ runtime/syntax/testdir/ftplugin/*.* \ runtime/syntax/testdir/input/*.* \ + runtime/syntax/testdir/input/selftestdir/* \ runtime/syntax/testdir/input/setup/*.* \ runtime/syntax/testdir/dumps/*.dump \ runtime/syntax/testdir/dumps/*.vim \ diff --git a/Makefile b/Makefile index f4db80f..ad07376 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ VIM_FOR_INDENTTEST = ../../src/vim indenttest: cd runtime/indent && \ $(MAKE) clean && \ - $(MAKE) test VIM="$(VIM_FOR_INDENTTEST)" + $(MAKE) test VIMPROG="$(VIM_FOR_INDENTTEST)" # Executable used for running the syntax tests. VIM_FOR_SYNTAXTEST = ../../src/vim @@ -249,9 +249,6 @@ VERSION = $(MAJOR)$(MINOR) VDOT = $(MAJOR).$(MINOR) VIMRTDIR = vim$(VERSION) -# Vim used for conversion from "unix" to "dos" -VIM = vim - # How to include Filelist depends on the version of "make" you have. # If the current choice doesn't work, try the other one. diff --git a/ci/appveyor.bat b/ci/appveyor.bat index 5498769..c77cee1 100644 --- a/ci/appveyor.bat +++ b/ci/appveyor.bat @@ -1,15 +1,20 @@ @echo off :: Batch file for building/testing Vim on AppVeyor set target=%1 +set "GETTEXT_PATH=c:\gettext64\bin" setlocal ENABLEDELAYEDEXPANSION cd %APPVEYOR_BUILD_FOLDER% :: Python3 -set PYTHON3_VER=311 -set PYTHON3_RELEASE=3.11.1 -set PYTHON3_URL=https://www.python.org/ftp/python/%PYTHON3_RELEASE%/python-%PYTHON3_RELEASE%-amd64.exe -set PYTHON3_DIR=C:\python%PYTHON3_VER%-x64 +set "PYTHON3_VER=311" +set "PYTHON3_RELEASE=3.11.1" +set "PYTHON3_URL=https://www.python.org/ftp/python/%PYTHON3_RELEASE%/python-%PYTHON3_RELEASE%-amd64.exe" +set "PYTHON3_DIR=C:\python%PYTHON3_VER%-x64" + +:: Gettext-tools, iconv and libraries +set "GETTEXT64_URL=https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-shared-64.zip" +set "GETTEXT64_DIR=c:\gettext64" set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" @@ -43,6 +48,18 @@ if not exist %PYTHON3_DIR% ( AssociateFiles=0 Shortcuts=0 Include_doc=0 Include_launcher=0 ^ InstallLauncherAllUsers=0 ) +:: GETTEXT +if not exist %GETTEXT64_DIR% ( + mkdir %GETTEXT64_DIR% + call :downloadfile %GETTEXT64_URL% downloads\gettext64.zip + cmd /c powershell.exe -NoLogo -NoProfile -Command ^ + Add-Type -AssemblyName 'System.IO.Compression.FileSystem'; ^ + [System.IO.Compression.ZipFile]::ExtractToDirectory^('downloads\gettext64.zip', ^ + '%GETTEXT64_DIR%'^) + copy /y %GETTEXT64_DIR%\bin\libintl-8.dll C:\projects\vim\src\ || exit 1 + copy /y %GETTEXT64_DIR%\bin\libiconv-2.dll C:\projects\vim\src\ || exit 1 +) + @echo off goto :eof @@ -92,7 +109,7 @@ goto :eof @echo on cd src/testdir :: Testing with MSVC gvim -path %PYTHON3_DIR%;%PATH% +path %PYTHON3_DIR%;%GETTEXT_PATH%;%PATH% nmake -f Make_mvc.mak VIMPROG=..\gvim nmake -f Make_mvc.mak clean :: Testing with MSVC console version diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index bf9e32e..c8942eb 100644 --- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim @@ -9,6 +9,8 @@ vim9script # These functions are moved here from runtime/filetype.vim to make startup # faster. +var prolog_pattern = '^\s*\(:-\|%\+\(\s\|$\)\|\/\*\)\|\.\s*$' + export def Check_inp() if getline(1) =~ '%%' setf tex @@ -402,18 +404,38 @@ export def FTharedoc() endif enddef -# Distinguish between HTML, XHTML and Django +# Distinguish between HTML, XHTML, Django and Angular export def FThtml() var n = 1 - while n < 10 && n <= line("$") + + # Test if the filename follows the Angular component template convention + # Disabled for the reasons mentioned here: #13594 + # if expand('%:t') =~ '^.*\.component\.html$' + # setf htmlangular + # return + # endif + + while n < 40 && n <= line("$") + # Check for Angular + if getline(n) =~ '@\(if\|for\|defer\|switch\)\|\*\(ngIf\|ngFor\|ngSwitch\|ngTemplateOutlet\)\|ng-template\|ng-content\|{{.*}}' + setf htmlangular + return + endif + # Check for XHTML if getline(n) =~ '\\|{#\s\+' + # Check for Django + if getline(n) =~ '{%\s*\(autoescape\|block\|comment\|csrf_token\|cycle\|debug\|extends\|filter\|firstof\|for\|if\|ifchanged\|include\|load\|lorem\|now\|query_string\|regroup\|resetcycle\|spaceless\|templatetag\|url\|verbatim\|widthratio\|with\)\>\|{#\s\+' setf htmldjango return endif + # Check for SuperHTML + if getline(n) =~ '' + setf superhtml + return + endif n += 1 endwhile setf FALLBACK html @@ -449,7 +471,7 @@ export def ProtoCheck(default: string) # recognize Prolog by specific text in the first non-empty line # require a blank after the '%' because Perl uses "%list" and "%translate" var lnum = getline(nextnonblank(1)) - if lnum =~ '\' || lnum =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || lnum =~ ':-' + if lnum =~ '\' || lnum =~ prolog_pattern setf prolog else exe 'setf ' .. default @@ -514,6 +536,25 @@ export def FTm() endif enddef +export def FTmake() + # Check if it is a Microsoft Makefile + unlet! b:make_microsoft + 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 + break + elseif line =~ '^ *ifn\=\(eq\|def\)\>' || line =~ '^ *[-s]\=include\s' + break + elseif line =~ '^ *\w\+\s*[!?:+]=' + break + endif + n += 1 + endwhile + setf make +enddef + export def FTmms() var n = 1 while n < 20 @@ -628,7 +669,7 @@ export def FTpl() # recognize Prolog by specific text in the first non-empty line # require a blank after the '%' because Perl uses "%list" and "%translate" var line = getline(nextnonblank(1)) - if line =~ '\' || line =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || line =~ ':-' + if line =~ '\' || line =~ prolog_pattern setf prolog else setf perl @@ -1265,6 +1306,56 @@ export def FTtyp() setf typst enddef +# Detect Microsoft Developer Studio Project files (Makefile) or Faust DSP +# files. +export def FTdsp() + if exists("g:filetype_dsp") + exe "setf " .. g:filetype_dsp + return + endif + + # Test the filename + if expand('%:t') =~ '^[mM]akefile.*$' + setf make + return + endif + + # Test the file contents + for line in getline(1, 200) + # Chech for comment style + if line =~ '^#.*' + setf make + return + endif + + # Check for common lines + if line =~ '^.*Microsoft Developer Studio Project File.*$' + setf make + return + endif + + if line =~ '^!MESSAGE This is not a valid makefile\..+$' + setf make + return + endif + + # Check for keywords + if line =~ '^!(IF,ELSEIF,ENDIF).*$' + setf make + return + endif + + # Check for common assignments + if line =~ '^SOURCE=.*$' + setf make + return + endif + endfor + + # Otherwise, assume we have a Faust file + setf faust +enddef + # Set the filetype of a *.v file to Verilog, V or Cog based on the first 200 # lines. export def FTv() diff --git a/runtime/autoload/dist/man.vim b/runtime/autoload/dist/man.vim index 708e106..d9dbaf4 100644 --- a/runtime/autoload/dist/man.vim +++ b/runtime/autoload/dist/man.vim @@ -4,6 +4,7 @@ " Maintainer: SungHyun Nam " Autoload Split: Bram Moolenaar " Last Change: 2024 Jan 17 (make it work on AIX, see #13847) +" 2024 Jul 06 (honor command modifiers, #15117) let s:cpo_save = &cpo set cpo-=C @@ -165,7 +166,9 @@ func dist#man#GetPage(cmdmods, ...) endwhile endif if &filetype != "man" - if exists("g:ft_man_open_mode") + if a:cmdmods =~ '\<\(tab\|vertical\|horizontal\)\>' + let open_cmd = a:cmdmods . ' split' + elseif exists("g:ft_man_open_mode") if g:ft_man_open_mode == 'vert' let open_cmd = 'vsplit' elseif g:ft_man_open_mode == 'tab' @@ -174,7 +177,7 @@ func dist#man#GetPage(cmdmods, ...) let open_cmd = 'split' endif else - let open_cmd = a:cmdmods . ' split' + let open_cmd = 'split' endif endif endif diff --git a/runtime/autoload/dist/vim.vim b/runtime/autoload/dist/vim.vim index 021244c..d519406 100644 --- a/runtime/autoload/dist/vim.vim +++ b/runtime/autoload/dist/vim.vim @@ -18,6 +18,10 @@ endif if !has('vim9script') function dist#vim#IsSafeExecutable(filetype, executable) let cwd = getcwd() + if empty(exepath(a:executable)) + echomsg a:executable .. " not found in $PATH" + return v:false + endif return get(g:, a:filetype .. '_exec', get(g:, 'plugin_exec', 0)) && \ (fnamemodify(exepath(a:executable), ':p:h') !=# cwd \ || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1 && diff --git a/runtime/autoload/dist/vim9.vim b/runtime/autoload/dist/vim9.vim index 807140d..8fa9380 100644 --- a/runtime/autoload/dist/vim9.vim +++ b/runtime/autoload/dist/vim9.vim @@ -6,6 +6,10 @@ vim9script # Last Change: 2023 Oct 25 export def IsSafeExecutable(filetype: string, executable: string): bool + if empty(exepath(executable)) + echomsg executable .. " not found in $PATH" + return v:false + endif var cwd = getcwd() return get(g:, filetype .. '_exec', get(g:, 'plugin_exec', 0)) && (fnamemodify(exepath(executable), ':p:h') !=# cwd diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index d8de432..e747ce2 100644 --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -3,7 +3,7 @@ " Maintainer: This runtime file is looking for a new maintainer. " Date: May 03, 2023 " Version: 173a -" Last Change: +" Last Change: {{{1 " 2023 Nov 21 by Vim Project: ignore wildignore when expanding $COMSPEC (v173a) " 2023 Nov 22 by Vim Project: fix handling of very long filename on longlist style (v173a) " 2024 Feb 19 by Vim Project: (announce adoption) @@ -15,6 +15,15 @@ " 2024 May 13 by Vim Project: prefer scp over pscp " 2024 Jun 04 by Vim Project: set bufhidden if buffer changed, nohidden is set and buffer shall be switched (#14915) " 2024 Jun 13 by Vim Project: glob() on Windows fails when a directory name contains [] (#14952) +" 2024 Jun 23 by Vim Project: save ad restore registers when liststyle = WIDELIST (#15077, #15114) +" 2024 Jul 22 by Vim Project: avoid endless recursion (#15318) +" 2024 Jul 23 by Vim Project: escape filename before trying to delete it (#15330) +" 2024 Jul 30 by Vim Project: handle mark-copy to same target directory (#12112) +" 2024 Aug 02 by Vim Project: honor g:netrw_alt{o,v} for :{S,H,V}explore (#15417) +" 2024 Aug 15 by Vim Project: style changes, prevent E121 (#15501) +" 2024 Aug 22 by Vim Project: fix mf-selection highlight (#15551) +" 2024 Aug 22 by Vim Project: adjust echo output of mx command (#15550) +" }}} " Former Maintainer: Charles E Campbell " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " Copyright: Copyright (C) 2016 Charles E. Campbell {{{1 @@ -57,11 +66,6 @@ if exists("s:needspatches") endif let g:loaded_netrw = "v173" -if !exists("s:NOTE") - let s:NOTE = 0 - let s:WARNING = 1 - let s:ERROR = 2 -endif let s:keepcpo= &cpo setl cpo&vim @@ -99,7 +103,7 @@ fun! netrw#ErrorMsg(level,msg,errnum) endif " call Decho("level=".level,'~'.expand("")) - if g:netrw_use_errorwindow == 2 && (v:version > 802 || (v:version == 802 && has("patch486"))) + if g:netrw_use_errorwindow == 2 && exists("*popup_atcursor") " use popup window if type(a:msg) == 3 let msg = [level]+a:msg @@ -215,6 +219,11 @@ if !exists("s:LONGLIST") call s:NetrwInit("s:MAXLIST" ,4) endif +let s:NOTE = 0 +let s:WARNING = 1 +let s:ERROR = 2 +call s:NetrwInit("g:netrw_errorlvl", s:NOTE) + " --------------------------------------------------------------------- " Default option values: {{{2 let g:netrw_localcopycmdopt = "" @@ -224,7 +233,10 @@ let g:netrw_localmovecmdopt = "" " --------------------------------------------------------------------- " Default values for netrw's global protocol variables {{{2 -if (v:version > 802 || (v:version == 802 && has("patch486"))) && has("balloon_eval") && !exists("s:initbeval") && !exists("g:netrw_nobeval") && has("syntax") && exists("g:syntax_on") && has("mouse") +if exists("*popup_atcursor") +\ && has("syntax") +\ && exists("g:syntax_on") +\ && has("mouse") call s:NetrwInit("g:netrw_use_errorwindow",2) else call s:NetrwInit("g:netrw_use_errorwindow",1) @@ -342,7 +354,6 @@ call s:NetrwInit("s:didstarstar",0) call s:NetrwInit("g:netrw_dirhistcnt" , 0) call s:NetrwInit("g:netrw_decompress" , '{ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf", ".xz" : "unxz" }') call s:NetrwInit("g:netrw_dirhistmax" , 10) -call s:NetrwInit("g:netrw_errorlvl" , s:NOTE) call s:NetrwInit("g:netrw_fastbrowse" , 1) call s:NetrwInit("g:netrw_ftp_browse_reject", '^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$') if !exists("g:netrw_ftp_list_cmd") @@ -693,12 +704,11 @@ fun! netrw#Explore(indx,dosplit,style,...) \ ((isdirectory(s:NetrwFile(a:1))))? 'is a directory' : 'is not a directory', \ '~'.expand("")) if a:1 =~ "\\\s" && !filereadable(s:NetrwFile(a:1)) && !isdirectory(s:NetrwFile(a:1)) -" call Decho("re-trying Explore with <".substitute(a:1,'\\\(\s\)','\1','g').">",'~'.expand("")) - call netrw#Explore(a:indx,a:dosplit,a:style,substitute(a:1,'\\\(\s\)','\1','g')) -" call Dret("netrw#Explore : returning from retry") - return -" else " Decho -" call Decho("retry not needed",'~'.expand("")) + let a1 = substitute(a:1, '\\\(\s\)', '\1', 'g') + if a1 != a:1 + call netrw#Explore(a:indx, a:dosplit, a:style, a1) + return + endif endif endif @@ -714,7 +724,6 @@ fun! netrw#Explore(indx,dosplit,style,...) " -or- file has been modified AND file not hidden when abandoned " -or- Texplore used if a:dosplit || (&modified && &hidden == 0 && &bufhidden != "hide") || a:style == 6 -" call Decho("case dosplit=".a:dosplit." modified=".&modified." a:style=".a:style.": dosplit or file has been modified",'~'.expand("")) call s:SaveWinVars() let winsz= g:netrw_winsize if a:indx > 0 @@ -722,57 +731,41 @@ fun! netrw#Explore(indx,dosplit,style,...) endif if a:style == 0 " Explore, Sexplore -" call Decho("style=0: Explore or Sexplore",'~'.expand("")) let winsz= (winsz > 0)? (winsz*winheight(0))/100 : -winsz if winsz == 0|let winsz= ""|endif - exe "noswapfile ".winsz."wincmd s" -" call Decho("exe noswapfile ".winsz."wincmd s",'~'.expand("")) + exe "noswapfile ".(g:netrw_alto ? "below " : "above ").winsz."wincmd s" - elseif a:style == 1 "Explore!, Sexplore! -" call Decho("style=1: Explore! or Sexplore!",'~'.expand("")) + elseif a:style == 1 " Explore!, Sexplore! let winsz= (winsz > 0)? (winsz*winwidth(0))/100 : -winsz if winsz == 0|let winsz= ""|endif - exe "keepalt noswapfile ".winsz."wincmd v" -" call Decho("exe keepalt noswapfile ".winsz."wincmd v",'~'.expand("")) + exe "keepalt noswapfile ".(g:netrw_altv ? "rightbelow " : "leftabove ").winsz."wincmd v" elseif a:style == 2 " Hexplore -" call Decho("style=2: Hexplore",'~'.expand("")) let winsz= (winsz > 0)? (winsz*winheight(0))/100 : -winsz if winsz == 0|let winsz= ""|endif - exe "keepalt noswapfile bel ".winsz."wincmd s" -" call Decho("exe keepalt noswapfile bel ".winsz."wincmd s",'~'.expand("")) + exe "keepalt noswapfile ".(g:netrw_alto ? "below " : "above ").winsz."wincmd s" elseif a:style == 3 " Hexplore! -" call Decho("style=3: Hexplore!",'~'.expand("")) let winsz= (winsz > 0)? (winsz*winheight(0))/100 : -winsz if winsz == 0|let winsz= ""|endif - exe "keepalt noswapfile abo ".winsz."wincmd s" -" call Decho("exe keepalt noswapfile abo ".winsz."wincmd s",'~'.expand("")) + exe "keepalt noswapfile ".(!g:netrw_alto ? "below " : "above ").winsz."wincmd s" elseif a:style == 4 " Vexplore -" call Decho("style=4: Vexplore",'~'.expand("")) let winsz= (winsz > 0)? (winsz*winwidth(0))/100 : -winsz if winsz == 0|let winsz= ""|endif - exe "keepalt noswapfile lefta ".winsz."wincmd v" -" call Decho("exe keepalt noswapfile lefta ".winsz."wincmd v",'~'.expand("")) + exe "keepalt noswapfile ".(g:netrw_altv ? "rightbelow " : "leftabove ").winsz."wincmd v" elseif a:style == 5 " Vexplore! -" call Decho("style=5: Vexplore!",'~'.expand("")) let winsz= (winsz > 0)? (winsz*winwidth(0))/100 : -winsz if winsz == 0|let winsz= ""|endif - exe "keepalt noswapfile rightb ".winsz."wincmd v" -" call Decho("exe keepalt noswapfile rightb ".winsz."wincmd v",'~'.expand("")) + exe "keepalt noswapfile ".(!g:netrw_altv ? "rightbelow " : "leftabove ").winsz."wincmd v" elseif a:style == 6 " Texplore call s:SaveBufVars() -" call Decho("style = 6: Texplore",'~'.expand("")) exe "keepalt tabnew ".fnameescape(curdir) -" call Decho("exe keepalt tabnew ".fnameescape(curdir),'~'.expand("")) call s:RestoreBufVars() endif call s:RestoreWinVars() -" else " Decho -" call Decho("case a:dosplit=".a:dosplit." AND modified=".&modified." AND a:style=".a:style." is not 6",'~'.expand("")) endif NetrwKeepj norm! 0 @@ -4496,7 +4489,15 @@ fun! s:NetrwGetWord() call cursor(line("."),filestart+1) NetrwKeepj norm! ma endif - let rega= @a + + let dict={} + " save the unnamed register and register 0-9 and a + let dict.a=[getreg('a'), getregtype('a')] + for i in range(0, 9) + let dict[i] = [getreg(i), getregtype(i)] + endfor + let dict.unnamed = [getreg(''), getregtype('')] + let eofname= filestart + b:netrw_cpf + 1 if eofname <= col("$") call cursor(line("."),filestart+b:netrw_cpf+1) @@ -4504,8 +4505,10 @@ fun! s:NetrwGetWord() else NetrwKeepj norm! "ay$ endif + let dirname = @a - let @a = rega + call s:RestoreRegister(dict) + " call Decho("2: dirname<".dirname.">",'~'.expand("")) let dirname= substitute(dirname,'\s\+$','','e') " call Decho("3: dirname<".dirname.">",'~'.expand("")) @@ -5573,13 +5576,12 @@ endfun " --------------------------------------------------------------------- " netrw#BrowseXVis: used by gx in visual mode to select a file for browsing {{{2 fun! netrw#BrowseXVis() -" call Dfunc("netrw#BrowseXVis()") - let akeep = @a + let dict={} + let dict.a=[getreg('a'), getregtype('a')] norm! gv"ay let gxfile= @a - let @a = akeep + call s:RestoreRegister(dict) call netrw#BrowseX(gxfile,netrw#CheckIfRemote(gxfile)) -" call Dret("netrw#BrowseXVis") endfun " --------------------------------------------------------------------- @@ -6887,11 +6889,7 @@ fun! s:NetrwMarkFile(islocal,fname) let ykeep = @@ let curbufnr= bufnr("%") - if a:fname =~ '^\a' - let leader= '\<' - else - let leader= '' - endif + let leader= '\(^\|\s\)\zs' if a:fname =~ '\a$' let trailer = '\>[@=|\/\*]\=\ze\%( \|\t\|$\)' else @@ -7154,7 +7152,7 @@ fun! s:NetrwMarkFileCopy(islocal,...) endif " copy marked files while within the same directory (ie. allow renaming) - if simplify(s:netrwmftgt) == simplify(b:netrw_curdir) + if s:StripTrailingSlash(simplify(s:netrwmftgt)) == s:StripTrailingSlash(simplify(b:netrw_curdir)) if len(s:netrwmarkfilelist_{bufnr('%')}) == 1 " only one marked file " call Decho("case: only one marked file",'~'.expand("")) @@ -7231,7 +7229,7 @@ fun! s:NetrwMarkFileCopy(islocal,...) " call Decho("system(".copycmd." '".args."' '".tgt."')",'~'.expand("")) call system(copycmd.g:netrw_localcopycmdopt." '".args."' '".tgt."'") if v:shell_error != 0 - if exists("b:netrw_curdir") && b:netrw_curdir != getcwd() && !g:netrw_keepdir + if exists("b:netrw_curdir") && b:netrw_curdir != getcwd() && g:netrw_keepdir call netrw#ErrorMsg(s:ERROR,"copy failed; perhaps due to vim's current directory<".getcwd()."> not matching netrw's (".b:netrw_curdir.") (see :help netrw-cd)",101) else call netrw#ErrorMsg(s:ERROR,"tried using g:netrw_localcopycmd<".g:netrw_localcopycmd.">; it doesn't work!",80) @@ -7500,7 +7498,13 @@ fun! s:NetrwMarkFileExe(islocal,enbloc) NetrwKeepj call netrw#ErrorMsg(s:ERROR,"command<".xcmd."> failed, aborting",54) break else - echo ret + if ret !=# '' + echo "\n" + " skip trailing new line + echo ret[0:-2] + else + echo ret + endif endif endfor @@ -9779,7 +9783,13 @@ fun! s:NetrwWideListing() " fpl: filenames per line " fpc: filenames per column setl ma noro - let keepa= @a + let dict={} + " save the unnamed register and register 0-9 and a + let dict.a=[getreg('a'), getregtype('a')] + for i in range(0, 9) + let dict[i] = [getreg(i), getregtype(i)] + endfor + let dict.unnamed = [getreg(''), getregtype('')] " call Decho("setl ma noro",'~'.expand("")) let b:netrw_cpf= 0 if line("$") >= w:netrw_bannercnt @@ -9787,7 +9797,8 @@ fun! s:NetrwWideListing() exe 'sil NetrwKeepj '.w:netrw_bannercnt.',$g/^./if virtcol("$") > b:netrw_cpf|let b:netrw_cpf= virtcol("$")|endif' NetrwKeepj call histdel("/",-1) else - let @a= keepa + " restore stored registers + call s:RestoreRegister(dict) " call Dret("NetrwWideListing") return endif @@ -9839,7 +9850,7 @@ fun! s:NetrwWideListing() exe 'nno b :call search(''^.\\|\s\s\zs\S'',''bW'')'."\" " call Decho("NetrwWideListing) setl noma nomod ro",'~'.expand("")) exe "setl ".g:netrw_bufsettings - let @a= keepa + call s:RestoreRegister(dict) " call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("")) " call Dret("NetrwWideListing") return @@ -9851,7 +9862,6 @@ fun! s:NetrwWideListing() sil! nunmap b endif endif - endfun " --------------------------------------------------------------------- @@ -10172,7 +10182,8 @@ fun! s:SetupNetrwStatusLine(statline) endif " set up User9 highlighting as needed - let keepa= @a + let dict={} + let dict.a=[getreg('a'), getregtype('a')] redir @a try hi User9 @@ -10184,7 +10195,7 @@ fun! s:SetupNetrwStatusLine(statline) endif endtry redir END - let @a= keepa + call s:RestoreRegister(dict) endif " set up status line (may use User9 highlighting) @@ -11435,7 +11446,7 @@ fun! s:NetrwLocalRmFile(path,fname,all) let all= a:all let ok = "" NetrwKeepj norm! 0 - let rmfile= s:NetrwFile(s:ComposePath(a:path,a:fname)) + let rmfile= s:NetrwFile(s:ComposePath(a:path,escape(a:fname, '\\'))) " call Decho("rmfile<".rmfile.">",'~'.expand("")) if rmfile !~ '^"' && (rmfile =~ '@$' || rmfile !~ '[\/]$') @@ -11444,7 +11455,7 @@ fun! s:NetrwLocalRmFile(path,fname,all) if !all echohl Statement call inputsave() - let ok= input("Confirm deletion of file<".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ") + let ok= input("Confirm deletion of file <".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ") call inputrestore() echohl NONE if ok == "" @@ -11468,7 +11479,7 @@ fun! s:NetrwLocalRmFile(path,fname,all) if !all echohl Statement call inputsave() - let ok= input("Confirm *recursive* deletion of directory<".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ") + let ok= input("Confirm *recursive* deletion of directory <".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ") call inputrestore() let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e') if ok == "" @@ -11627,6 +11638,13 @@ fun! netrw#WinPath(path) return path endfun +" --------------------------------------------------------------------- +" s:StripTrailingSlash: removes trailing slashes from a path {{{2 +fun! s:StripTrailingSlash(path) + " remove trailing slash + return substitute(a:path, '[/\\]$', '', 'g') +endfun + " --------------------------------------------------------------------- " s:NetrwBadd: adds marked files to buffer list or vice versa {{{2 " cb : bl2mf=0 add marked files to buffer list @@ -11994,6 +12012,16 @@ fun! s:RestoreCursorline() " call Dret("s:RestoreCursorline : restored cul=".&l:cursorline." cuc=".&l:cursorcolumn) endfun +" s:RestoreRegister: restores all registers given in the dict {{{2 +fun! s:RestoreRegister(dict) + for [key, val] in items(a:dict) + if key == 'unnamed' + let key = '' + endif + call setreg(key, val[0], val[1]) + endfor +endfun + " --------------------------------------------------------------------- " s:NetrwDelete: Deletes a file. {{{2 " Uses Steve Hall's idea to insure that Windows paths stay @@ -12801,54 +12829,3 @@ unlet s:keepcpo " Modelines: {{{1 " =============== " vim:ts=8 fdm=marker -" doing autoload/netrw.vim version v172g ~57 -" varname value=0 ~1 -" varname value=0 ~1 -" varname value=1 ~1 -" varname value=2 ~1 -" varname value=3 ~1 -" varname value=4 ~1 -" varname value=2 ~1 -" varname value=-q -O ~1 -" varname value=curl -T ~1 -" varname value=keepj ~1 -" varname value=rcp ~1 -" varname value=rsync ~1 -" varname value=/ ~1 -" varname value=scp -q ~1 -" varname value=sftp ~1 -" varname value=ssh ~1 -" varname value=0 ~1 -" varname value=1 ~1 -" varname value=1 ~1 -" varname value=0 ~1 -" varname value=noma nomod nonu nobl nowrap ro nornu ~1 -" varname value=-1 ~1 -" varname value=1 ~1 -" varname value=gzip ~1 -" varname value=ctags ~1 -" varname value=2 ~1 -" (netrw) COMBAK: cuc=0 cul=0 initialization of s:netrw_cu[cl] -" varname value=/cygdrive ~1 -" varname value=0 ~1 -" varname value=0 ~1 -" varname value={ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf", ".xz" : "unxz" } ~1 -" varname value=10 ~1 -" varname value=0 ~1 -" varname value=1 ~1 -" varname value=^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$ ~1 -" varname value=binary ~1 -" varname value=1 ~1 -" varname value=1 ~1 -" varname value= ~1 -" varname value=mkdir ~1 -" varname value=mkdir ~1 -" varname value=0 ~1 -" varname value=*./[\~ ~1 -" varname value=32 ~1 -" varname value=1 ~1 -" varname value=ssh USEPORT HOSTNAME mkdir ~1 -" varname value=1 ~1 -" varname value=0 ~1 -" varname value=chmod PERM FILENAME ~1 -" varname value=0 ~1 diff --git a/runtime/autoload/typst.vim b/runtime/autoload/typst.vim new file mode 100644 index 0000000..55edd23 --- /dev/null +++ b/runtime/autoload/typst.vim @@ -0,0 +1,50 @@ +" Language: Typst +" Maintainer: Gregory Anders +" Last Change: 2024-07-14 +" Based on: https://github.com/kaarmu/typst.vim + +function! typst#indentexpr() abort + let l:lnum = v:lnum + let s:sw = shiftwidth() + + let [l:plnum, l:pline] = s:get_prev_nonblank(l:lnum - 1) + if l:plnum == 0 | return 0 | endif + + let l:line = getline(l:lnum) + let l:ind = indent(l:plnum) + + let l:synname = synIDattr(synID(l:lnum, 1, 1), 'name') + + " Use last indent for block comments + if l:synname == 'typstCommentBlock' + return l:ind + endif + + if l:pline =~ '\v[{[(]\s*$' + let l:ind += s:sw + endif + + if l:line =~ '\v^\s*[}\])]' + let l:ind -= s:sw + endif + + return l:ind +endfunction + +" Gets the previous non-blank line that is not a comment. +function! s:get_prev_nonblank(lnum) abort + let l:lnum = prevnonblank(a:lnum) + let l:line = getline(l:lnum) + + while l:lnum > 0 && l:line =~ '^\s*//' + let l:lnum = prevnonblank(l:lnum - 1) + let l:line = getline(l:lnum) + endwhile + + return [l:lnum, s:remove_comments(l:line)] +endfunction + +" Removes comments from the given line. +function! s:remove_comments(line) abort + return substitute(a:line, '\s*//.*', '', '') +endfunction diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index d0e706e..4a53fc5 100644 --- a/runtime/autoload/zip.vim +++ b/runtime/autoload/zip.vim @@ -1,11 +1,19 @@ " zip.vim: Handles browsing zipfiles -" AUTOLOAD PORTION -" Date: Mar 12, 2023 -" Version: 33 +" AUTOLOAD PORTION +" Date: 2024 Aug 21 +" Version: 34 " Maintainer: This runtime file is looking for a new maintainer. " Former Maintainer: Charles E Campbell " Last Change: -" 2024 Jun 16 by Vim Project: handle whitespace on Windows properly (#14998) +" 2024 Jun 16 by Vim Project: handle whitespace on Windows properly (#14998) +" 2024 Jul 23 by Vim Project: fix 'x' command +" 2024 Jul 24 by Vim Project: use delete() function +" 2024 Jul 30 by Vim Project: fix opening remote zipfile +" 2024 Aug 04 by Vim Project: escape '[' in name of file to be extracted +" 2024 Aug 05 by Vim Project: workaround for the FreeBSD's unzip +" 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 " 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, @@ -22,16 +30,9 @@ if &cp || exists("g:loaded_zip") finish endif -let g:loaded_zip= "v33" -if v:version < 702 - echohl WarningMsg - echo "***warning*** this version of zip needs vim 7.2 or later" - echohl Normal - finish -endif +let g:loaded_zip= "v34" let s:keepcpo= &cpo set cpo&vim -"DechoTabOn let s:zipfile_escape = ' ?&;\' let s:ERROR = 2 @@ -59,8 +60,28 @@ if !exists("g:zip_extractcmd") let g:zip_extractcmd= g:zip_unzipcmd endif +" --------------------------------------------------------------------- +" required early +" s:Mess: {{{2 +fun! s:Mess(group, msg) + redraw! + exe "echohl " . a:group + echomsg a:msg + echohl Normal +endfun + +if v:version < 901 + " required for defer + call s:Mess('WarningMsg', "***warning*** this version of zip needs vim 9.1 or later") + finish +endif +" sanity checks +if !executable(g:zip_unzipcmd) + call s:Mess('Error', "***error*** (zip#Browse) unzip not available on your system") + finish +endif if !dist#vim#IsSafeExecutable('zip', g:zip_unzipcmd) - echoerr "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!" + call s:Mess('Error', "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!") finish endif @@ -71,47 +92,28 @@ endif " --------------------------------------------------------------------- " zip#Browse: {{{2 fun! zip#Browse(zipfile) -" call Dfunc("zip#Browse(zipfile<".a:zipfile.">)") - " sanity check: insure that the zipfile has "PK" as its first two letters - " (zipped files have a leading PK as a "magic cookie") - if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK' - exe "noswapfile noautocmd noswapfile e ".fnameescape(a:zipfile) -" call Dret("zip#Browse : not a zipfile<".a:zipfile.">") + " sanity check: ensure that the zipfile has "PK" as its first two letters + " (zip files have a leading PK as a "magic cookie") + if filereadable(a:zipfile) && readblob(a:zipfile, 0, 2) != 0z50.4B + exe "noswapfile noautocmd e " .. fnameescape(a:zipfile) return -" else " Decho -" call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - it's a zip file") endif - let repkeep= &report - set report=10 + let dict = s:SetSaneOpts() + defer s:RestoreOpts(dict) " sanity checks - if !exists("*fnameescape") - if &verbose > 1 - echoerr "the zip plugin is not available (your vim doesn't support fnameescape())" - endif - return - endif if !executable(g:zip_unzipcmd) - redraw! - echohl Error | echo "***error*** (zip#Browse) unzip not available on your system" -" call inputsave()|call input("Press to continue")|call inputrestore() - let &report= repkeep -" call Dret("zip#Browse") + call s:Mess('Error', "***error*** (zip#Browse) unzip not available on your system") return endif if !filereadable(a:zipfile) if a:zipfile !~# '^\a\+://' " if it's an url, don't complain, let url-handlers such as vim do its thing - redraw! - echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None -" call inputsave()|call input("Press to continue")|call inputrestore() + call s:Mess('Error', "***error*** (zip#Browse) File not readable <".a:zipfile.">") endif - let &report= repkeep -" call Dret("zip#Browse : file<".a:zipfile."> not readable") return endif -" call Decho("passed sanity checks") if &ma != 1 set ma endif @@ -136,19 +138,15 @@ fun! zip#Browse(zipfile) \ '" Select a file with cursor and press ENTER']) keepj $ -" call Decho("exe silent r! ".g:zip_unzipcmd." -l -- ".s:Escape(a:zipfile,1)) - exe "keepj sil! r! ".g:zip_unzipcmd." -Z -1 -- ".s:Escape(a:zipfile,1) + exe $"keepj sil r! {g:zip_unzipcmd} -Z1 -- {s:Escape(a:zipfile, 1)}" if v:shell_error != 0 - redraw! - echohl WarningMsg | echo "***warning*** (zip#Browse) ".fnameescape(a:zipfile)." is not a zip file" | echohl None -" call inputsave()|call input("Press to continue")|call inputrestore() + call s:Mess('WarningMsg', "***warning*** (zip#Browse) ".fnameescape(a:zipfile)." is not a zip file") keepj sil! %d let eikeep= &ei set ei=BufReadCmd,FileReadCmd exe "keepj r ".fnameescape(a:zipfile) let &ei= eikeep keepj 1d -" call Dret("zip#Browse") return endif @@ -160,63 +158,46 @@ fun! zip#Browse(zipfile) noremap :call ZipBrowseSelect() endif - let &report= repkeep -" call Dret("zip#Browse") endfun " --------------------------------------------------------------------- " ZipBrowseSelect: {{{2 fun! s:ZipBrowseSelect() - " call Dfunc("ZipBrowseSelect() zipfile<".((exists("b:zipfile"))? b:zipfile : "n/a")."> curfile<".expand("%").">") - let repkeep= &report - set report=10 + let dict = s:SetSaneOpts() + defer s:RestoreOpts(dict) let fname= getline(".") if !exists("b:zipfile") -" call Dret("ZipBrowseSelect : b:zipfile doesn't exist!") return endif " sanity check if fname =~ '^"' - let &report= repkeep -" call Dret("ZipBrowseSelect") return endif if fname =~ '/$' - redraw! - echohl Error | echo "***error*** (zip#Browse) Please specify a file, not a directory" | echohl None -" call inputsave()|call input("Press to continue")|call inputrestore() - let &report= repkeep -" call Dret("ZipBrowseSelect") + call s:Mess('Error', "***error*** (zip#Browse) Please specify a file, not a directory") return endif -" call Decho("fname<".fname.">") - " get zipfile to the new-window let zipfile = b:zipfile let curfile = expand("%") -" call Decho("zipfile<".zipfile.">") -" call Decho("curfile<".curfile.">") noswapfile new if !exists("g:zip_nomax") || g:zip_nomax == 0 wincmd _ endif let s:zipfile_{winnr()}= curfile -" call Decho("exe e ".fnameescape("zipfile://".zipfile.'::'.fname)) exe "noswapfile e ".fnameescape("zipfile://".zipfile.'::'.fname) filetype detect - let &report= repkeep -" call Dret("ZipBrowseSelect : s:zipfile_".winnr()."<".s:zipfile_{winnr()}.">") endfun " --------------------------------------------------------------------- " zip#Read: {{{2 fun! zip#Read(fname,mode) - let repkeep= &report - set report=10 + let dict = s:SetSaneOpts() + defer s:RestoreOpts(dict) if has("unix") let zipfile = substitute(a:fname,'zipfile://\(.\{-}\)::[^\\].*$','\1','') @@ -224,23 +205,20 @@ fun! zip#Read(fname,mode) else let zipfile = substitute(a:fname,'^.\{-}zipfile://\(.\{-}\)::[^\\].*$','\1','') let fname = substitute(a:fname,'^.\{-}zipfile://.\{-}::\([^\\].*\)$','\1','') - let fname = substitute(fname, '[', '[[]', 'g') endif + let fname = fname->substitute('[', '[[]', 'g')->escape('?*\\') " sanity check if !executable(substitute(g:zip_unzipcmd,'\s\+.*$','','')) - redraw! - echohl Error | echo "***error*** (zip#Read) sorry, your system doesn't appear to have the ".g:zip_unzipcmd." program" | echohl None -" call inputsave()|call input("Press to continue")|call inputrestore() - let &report= repkeep + call s:Mess('Error', "***error*** (zip#Read) sorry, your system doesn't appear to have the ".g:zip_unzipcmd." program") return endif " the following code does much the same thing as - " exe "keepj sil! r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1) + " exe "keepj sil! r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1) " 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 + exe "sil !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1).' > '.temp sil exe 'keepalt file '.temp sil keepj e! sil exe 'keepalt file '.fnameescape(fn) @@ -251,58 +229,42 @@ fun! zip#Read(fname,mode) " cleanup set nomod - let &report= repkeep endfun " --------------------------------------------------------------------- " zip#Write: {{{2 fun! zip#Write(fname) -" call Dfunc("zip#Write(fname<".a:fname.">) zipfile_".winnr()."<".s:zipfile_{winnr()}.">") - let repkeep= &report - set report=10 + let dict = s:SetSaneOpts() + defer s:RestoreOpts(dict) " sanity checks if !executable(substitute(g:zip_zipcmd,'\s\+.*$','','')) - redraw! - echohl Error | echo "***error*** (zip#Write) sorry, your system doesn't appear to have the ".g:zip_zipcmd." program" | echohl None -" call inputsave()|call input("Press to continue")|call inputrestore() - let &report= repkeep -" call Dret("zip#Write") + 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") - redraw! - echohl Error | echo "***error*** (zip#Write) sorry, mkdir() doesn't work on your system" | echohl None -" call inputsave()|call input("Press to continue")|call inputrestore() - let &report= repkeep -" call Dret("zip#Write") + call s:Mess('Error', "***error*** (zip#Write) sorry, mkdir() doesn't work on your system") return endif let curdir= getcwd() let tmpdir= tempname() -" call Decho("orig tempname<".tmpdir.">") if tmpdir =~ '\.' let tmpdir= substitute(tmpdir,'\.[^.]*$','','e') endif -" call Decho("tmpdir<".tmpdir.">") call mkdir(tmpdir,"p") " attempt to change to the indicated directory if s:ChgDir(tmpdir,s:ERROR,"(zip#Write) cannot cd to temporary directory") - let &report= repkeep -" call Dret("zip#Write") return endif -" call Decho("current directory now: ".getcwd()) " place temporary files under .../_ZIPVIM_/ if isdirectory("_ZIPVIM_") - call s:Rmdir("_ZIPVIM_") + call delete("_ZIPVIM_", "rf") endif call mkdir("_ZIPVIM_") cd _ZIPVIM_ -" call Decho("current directory now: ".getcwd()) if has("unix") let zipfile = substitute(a:fname,'zipfile://\(.\{-}\)::[^\\].*$','\1','') @@ -311,21 +273,17 @@ fun! zip#Write(fname) let zipfile = substitute(a:fname,'^.\{-}zipfile://\(.\{-}\)::[^\\].*$','\1','') let fname = substitute(a:fname,'^.\{-}zipfile://.\{-}::\([^\\].*\)$','\1','') endif -" call Decho("zipfile<".zipfile.">") -" call Decho("fname <".fname.">") if fname =~ '/' let dirpath = substitute(fname,'/[^/]\+$','','e') if has("win32unix") && executable("cygpath") let dirpath = substitute(system("cygpath ".s:Escape(dirpath,0)),'\n','','e') endif -" call Decho("mkdir(dirpath<".dirpath.">,p)") call mkdir(dirpath,"p") endif if zipfile !~ '/' let zipfile= curdir.'/'.zipfile endif -" call Decho("zipfile<".zipfile."> fname<".fname.">") exe "w! ".fnameescape(fname) if has("win32unix") && executable("cygpath") @@ -336,17 +294,13 @@ fun! zip#Write(fname) let fname = substitute(fname, '[', '[[]', 'g') endif -" call Decho(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0)) call system(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0)) if v:shell_error != 0 - redraw! - echohl Error | echo "***error*** (zip#Write) sorry, unable to update ".zipfile." with ".fname | echohl None -" call inputsave()|call input("Press to continue")|call inputrestore() + 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()} -" call Decho("handle writing <".zipfile."> across network as <".netzipfile.">") 1split|enew let binkeep= &binary let eikeep = &ei @@ -358,58 +312,58 @@ fun! zip#Write(fname) q! unlet s:zipfile_{winnr()} endif - + " cleanup and restore current directory cd .. - call s:Rmdir("_ZIPVIM_") + call delete("_ZIPVIM_", "rf") call s:ChgDir(curdir,s:WARNING,"(zip#Write) unable to return to ".curdir."!") - call s:Rmdir(tmpdir) + call delete(tmpdir, "rf") setlocal nomod - let &report= repkeep -" call Dret("zip#Write") endfun " --------------------------------------------------------------------- " zip#Extract: extract a file from a zip archive {{{2 fun! zip#Extract() -" call Dfunc("zip#Extract()") - let repkeep= &report - set report=10 + let dict = s:SetSaneOpts() + defer s:RestoreOpts(dict) let fname= getline(".") -" call Decho("fname<".fname.">") " sanity check if fname =~ '^"' - let &report= repkeep -" call Dret("zip#Extract") return endif if fname =~ '/$' - redraw! - echohl Error | echo "***error*** (zip#Extract) Please specify a file, not a directory" | echohl None - let &report= repkeep -" call Dret("zip#Extract") + call s:Mess('Error', "***error*** (zip#Extract) Please specify a file, not a directory") + return + endif + if filereadable(fname) + call s:Mess('Error', "***error*** (zip#Extract) <" .. fname .."> already exists in directory, not overwriting!") return endif + let target = fname->substitute('\[', '[[]', 'g') + if &shell =~ 'cmd' && has("win32") + let target = target + \ ->substitute('[?*]', '[&]', 'g') + \ ->substitute('[\\]', '?', 'g') + \ ->shellescape() + " there cannot be a file name with '\' in its name, unzip replaces it by _ + let fname = fname->substitute('[\\?*]', '_', 'g') + else + let target = target->escape('*?\\')->shellescape() + endif " extract the file mentioned under the cursor -" call Decho("system(".g:zip_extractcmd." ".shellescape(b:zipfile)." ".shellescape(shell).")") - call system(g:zip_extractcmd." ".shellescape(b:zipfile)." ".shellescape(shell)) -" call Decho("zipfile<".b:zipfile.">") + call system($"{g:zip_extractcmd} -o {shellescape(b:zipfile)} {target}") if v:shell_error != 0 - echohl Error | echo "***error*** ".g:zip_extractcmd." ".b:zipfile." ".fname.": failed!" | echohl NONE + call s:Mess('Error', "***error*** ".g:zip_extractcmd." ".b:zipfile." ".fname.": failed!") elseif !filereadable(fname) - echohl Error | echo "***error*** attempted to extract ".fname." but it doesn't appear to be present!" + call s:Mess('Error', "***error*** attempted to extract ".fname." but it doesn't appear to be present!") else - echo "***note*** successfully extracted ".fname + echomsg "***note*** successfully extracted ".fname endif - " restore option - let &report= repkeep - -" call Dret("zip#Extract") endfun " --------------------------------------------------------------------- @@ -424,48 +378,48 @@ fun! s:Escape(fname,isfilt) else let qnameq= g:zip_shq.escape(a:fname,g:zip_shq).g:zip_shq endif - if exists("+shellslash") && &shellslash && &shell =~ "cmd.exe" - " renormalize directory separator on Windows - let qnameq=substitute(qnameq, '/', '\\', 'g') - endif return qnameq endfun " --------------------------------------------------------------------- -" ChgDir: {{{2 +" s:ChgDir: {{{2 fun! s:ChgDir(newdir,errlvl,errmsg) -" call Dfunc("ChgDir(newdir<".a:newdir."> errlvl=".a:errlvl." errmsg<".a:errmsg.">)") - try exe "cd ".fnameescape(a:newdir) catch /^Vim\%((\a\+)\)\=:E344/ redraw! if a:errlvl == s:NOTE - echo "***note*** ".a:errmsg + echomsg "***note*** ".a:errmsg elseif a:errlvl == s:WARNING - echohl WarningMsg | echo "***warning*** ".a:errmsg | echohl NONE + call s:Mess("WarningMsg", "***warning*** ".a:errmsg) elseif a:errlvl == s:ERROR - echohl Error | echo "***error*** ".a:errmsg | echohl NONE + call s:Mess("Error", "***error*** ".a:errmsg) endif -" call inputsave()|call input("Press to continue")|call inputrestore() -" call Dret("ChgDir 1") return 1 endtry -" call Dret("ChgDir 0") return 0 endfun " --------------------------------------------------------------------- -" s:Rmdir: {{{2 -fun! s:Rmdir(fname) -" call Dfunc("Rmdir(fname<".a:fname.">)") - if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$' - call system("rmdir /S/Q ".s:Escape(a:fname,0)) - else - call system("/bin/rm -rf ".s:Escape(a:fname,0)) - endif -" call Dret("Rmdir") +" s:SetSaneOpts: {{{2 +fun! s:SetSaneOpts() + let dict = {} + let dict.report = &report + let dict.shellslash = &shellslash + + let &report = 10 + let &shellslash = 0 + + return dict +endfun + +" --------------------------------------------------------------------- +" s:RestoreOpts: {{{2 +fun! s:RestoreOpts(dict) + for [key, val] in items(a:dict) + exe $"let &{key} = {val}" + endfor endfun " ------------------------------------------------------------------------ diff --git a/runtime/colors/blue.vim b/runtime/colors/blue.vim index f95cf27..aafa8e9 100644 --- a/runtime/colors/blue.vim +++ b/runtime/colors/blue.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Steven Vertigan " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Mon 08 Jan 2024 09:42:49 AM AEDT +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -22,9 +22,11 @@ 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=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=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 @@ -132,9 +134,11 @@ if s:t_Co >= 256 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=NONE ctermbg=NONE 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 @@ -245,9 +249,11 @@ if s:t_Co >= 16 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 Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Conceal ctermfg=darkcyan 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 @@ -358,6 +364,8 @@ if s:t_Co >= 8 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 Conceal ctermfg=NONE ctermbg=NONE cterm=NONE diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim index b792b90..3a0a218 100644 --- a/runtime/colors/darkblue.vim +++ b/runtime/colors/darkblue.vim @@ -4,7 +4,7 @@ " Maintainer: Original author Bohdan Vlasyuk " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Mon 08 Jan 2024 09:43:03 AM AEDT +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -68,7 +68,7 @@ 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=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=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 @@ -85,6 +85,8 @@ 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 @@ -176,7 +178,7 @@ if s:t_Co >= 256 hi! link MessageWindow Pmenu hi! link PopupNotification Todo hi Normal ctermfg=252 ctermbg=17 cterm=NONE - hi Conceal ctermfg=NONE ctermbg=NONE 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 @@ -193,6 +195,8 @@ if s:t_Co >= 256 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 @@ -238,7 +242,7 @@ endif if s:t_Co >= 16 hi Normal ctermfg=grey ctermbg=black cterm=NONE - hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Conceal ctermfg=darkcyan ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE hi Cursor ctermfg=black ctermbg=yellow cterm=NONE hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE @@ -255,6 +259,8 @@ if s:t_Co >= 16 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 Question ctermfg=green ctermbg=NONE cterm=NONE hi SignColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE @@ -318,6 +324,8 @@ if s:t_Co >= 8 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 Question ctermfg=darkgreen ctermbg=NONE cterm=bold hi Search ctermfg=darkcyan ctermbg=blue cterm=NONE hi SignColumn ctermfg=grey ctermbg=NONE cterm=NONE diff --git a/runtime/colors/delek.vim b/runtime/colors/delek.vim index 16de514..c06fda2 100644 --- a/runtime/colors/delek.vim +++ b/runtime/colors/delek.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer David Schweikert " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:34 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -38,6 +38,8 @@ 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 @@ -45,6 +47,7 @@ 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 @@ -82,7 +85,6 @@ 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 Conceal guifg=#ee0000 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 CursorLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE @@ -112,6 +114,8 @@ if s:t_Co >= 256 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 @@ -119,6 +123,7 @@ if s:t_Co >= 256 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 @@ -156,7 +161,6 @@ if s:t_Co >= 256 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 Conceal ctermfg=196 ctermbg=NONE cterm=NONE hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE hi Title ctermfg=164 ctermbg=NONE cterm=bold hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE @@ -180,6 +184,8 @@ if s:t_Co >= 16 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 @@ -187,6 +193,7 @@ if s:t_Co >= 16 hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Folded ctermfg=darkblue ctermbg=grey cterm=NONE hi Visual ctermfg=black ctermbg=darkgrey cterm=NONE hi VisualNOS ctermfg=NONE ctermbg=darkred cterm=NONE @@ -224,7 +231,6 @@ if s:t_Co >= 16 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 Conceal ctermfg=darkred ctermbg=NONE cterm=NONE hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline @@ -249,6 +255,8 @@ if s:t_Co >= 8 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 @@ -256,6 +264,7 @@ if s:t_Co >= 8 hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE hi Folded ctermfg=darkyellow ctermbg=NONE cterm=NONE hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline @@ -291,7 +300,6 @@ if s:t_Co >= 8 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 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 @@ -398,6 +406,7 @@ endif " 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 diff --git a/runtime/colors/desert.vim b/runtime/colors/desert.vim index e639653..4c34468 100644 --- a/runtime/colors/desert.vim +++ b/runtime/colors/desert.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Hans Fugal " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:34 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -37,6 +37,8 @@ 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 @@ -111,6 +113,8 @@ if s:t_Co >= 256 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 @@ -177,6 +181,8 @@ if s:t_Co >= 16 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 @@ -243,6 +249,8 @@ if s:t_Co >= 8 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 diff --git a/runtime/colors/elflord.vim b/runtime/colors/elflord.vim index 3a72dfb..9dc5a11 100644 --- a/runtime/colors/elflord.vim +++ b/runtime/colors/elflord.vim @@ -3,7 +3,7 @@ " Maintainer: original maintainer Ron Aaron " Website: https://www.github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:35 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -72,6 +72,8 @@ 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 @@ -140,6 +142,8 @@ if s:t_Co >= 256 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 @@ -211,6 +215,8 @@ if s:t_Co >= 16 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 Question ctermfg=green ctermbg=NONE cterm=bold hi Search ctermfg=black ctermbg=yellow cterm=NONE hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE @@ -281,6 +287,8 @@ if s:t_Co >= 8 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 Question ctermfg=darkgreen ctermbg=NONE cterm=NONE hi Search ctermfg=black ctermbg=darkyellow cterm=NONE hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE diff --git a/runtime/colors/evening.vim b/runtime/colors/evening.vim index 2753daa..7ea265d 100644 --- a/runtime/colors/evening.vim +++ b/runtime/colors/evening.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Steven Vertigan " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Mon 08 Jan 2024 09:43:27 AM AEDT +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -75,6 +75,8 @@ 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 @@ -84,7 +86,7 @@ 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=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=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 @@ -183,6 +185,8 @@ if s:t_Co >= 256 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 @@ -192,7 +196,7 @@ if s:t_Co >= 256 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=NONE 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 @@ -294,6 +298,8 @@ if s:t_Co >= 16 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 @@ -303,7 +309,7 @@ if s:t_Co >= 16 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=NONE 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 IncSearch ctermfg=green ctermbg=NONE cterm=reverse @@ -361,6 +367,8 @@ if s:t_Co >= 8 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 diff --git a/runtime/colors/habamax.vim b/runtime/colors/habamax.vim index f32a549..a9cbf52 100644 --- a/runtime/colors/habamax.vim +++ b/runtime/colors/habamax.vim @@ -4,7 +4,7 @@ " Maintainer: Maxim Kim " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Mon 08 Jan 2024 09:39:53 AM AEDT +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -16,13 +16,12 @@ let g:colors_name = 'habamax' let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0) if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d7875f', '#afd7af', '#d7d787', '#87afd7', '#d7afd7', '#87afaf', '#bcbcbc'] + 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 hi! link MessageWindow Pmenu -hi! link PopupNotification Todo hi! link javaScriptFunction Statement hi! link javaScriptIdentifier Statement hi! link sqlKeyword Statement @@ -34,7 +33,6 @@ hi! link vimOper Normal hi! link vimSep Normal hi! link vimParenSep Normal hi! link vimCommentString Comment -hi! link gitCommitSummary Title hi! link markdownUrl String hi Normal guifg=#bcbcbc guibg=#1c1c1c gui=NONE cterm=NONE hi Statusline guifg=#1c1c1c guibg=#9e9e9e gui=NONE cterm=NONE @@ -42,11 +40,11 @@ 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=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold +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=#9e9e9e guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse +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=#ffaf5f guibg=NONE gui=bold cterm=bold +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 @@ -54,71 +52,71 @@ 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=#1c1c1c guibg=#87afaf 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=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE -hi PmenuKind guifg=#d7875f guibg=#3a3a3a gui=NONE cterm=NONE -hi PmenuKindSel guifg=#d75f5f guibg=#afaf87 gui=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=#1c1c1c guibg=#afaf87 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=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse -hi ErrorMsg guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse -hi ModeMsg guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE -hi MoreMsg guifg=#87af87 guibg=NONE gui=NONE cterm=NONE -hi Question guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE -hi WarningMsg guifg=#d7875f guibg=NONE gui=NONE cterm=NONE -hi Todo guifg=#d7d787 guibg=#1c1c1c gui=reverse cterm=reverse +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=#1c1c1c guibg=#87af87 gui=NONE cterm=NONE -hi IncSearch guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE -hi CurSearch guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE -hi WildMenu guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE +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=#d7875f gui=NONE cterm=NONE -hi Cursor guifg=#1c1c1c guibg=#ffaf5f 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=#5f87af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline -hi SpellLocal guifg=NONE guibg=NONE guisp=#87af87 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline -hi SpellRare guifg=NONE guibg=NONE guisp=#d7afd7 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=#d7875f guibg=NONE gui=NONE cterm=NONE -hi String guifg=#87af87 guibg=NONE gui=NONE cterm=NONE -hi Character guifg=#afd7af 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=#afaf87 guibg=NONE gui=NONE cterm=NONE -hi Type guifg=#87afd7 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=#d7d787 guibg=NONE gui=bold cterm=bold +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=#767676 guibg=NONE gui=NONE cterm=NONE +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=#dadada guibg=#5f875f gui=NONE cterm=NONE -hi DiffDelete guifg=#af875f guibg=NONE gui=NONE cterm=NONE -hi Added guifg=#87af87 guibg=NONE gui=NONE cterm=NONE -hi Changed 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 diffSubname guifg=#af87af guibg=NONE gui=NONE cterm=NONE -hi DiffText guifg=#dadada guibg=#878787 gui=NONE cterm=NONE -hi DiffChange guifg=#bcbcbc guibg=#5f5f5f gui=NONE cterm=NONE if s:t_Co >= 256 hi! link Terminal Normal hi! link StatuslineTerm Statusline hi! link StatuslineTermNC StatuslineNC hi! link MessageWindow Pmenu - hi! link PopupNotification Todo hi! link javaScriptFunction Statement hi! link javaScriptIdentifier Statement hi! link sqlKeyword Statement @@ -130,7 +128,6 @@ if s:t_Co >= 256 hi! link vimSep Normal hi! link vimParenSep Normal hi! link vimCommentString Comment - hi! link gitCommitSummary Title hi! link markdownUrl String hi Normal ctermfg=250 ctermbg=234 cterm=NONE hi Statusline ctermfg=234 ctermbg=247 cterm=NONE @@ -138,11 +135,11 @@ if s:t_Co >= 256 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=NONE ctermbg=NONE cterm=bold + hi TabLineSel ctermfg=234 ctermbg=247 cterm=bold hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=247 ctermbg=234 cterm=bold,reverse + hi ToolbarButton ctermfg=243 ctermbg=234 cterm=bold,reverse hi QuickFixLine ctermfg=234 ctermbg=67 cterm=NONE - hi CursorLineNr ctermfg=215 ctermbg=NONE cterm=bold + 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 @@ -150,62 +147,63 @@ if s:t_Co >= 256 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=234 ctermbg=109 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=234 ctermbg=144 cterm=NONE - hi PmenuKind ctermfg=173 ctermbg=237 cterm=NONE - hi PmenuKindSel ctermfg=167 ctermbg=144 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=234 ctermbg=144 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=167 ctermbg=234 cterm=reverse - hi ErrorMsg ctermfg=167 ctermbg=234 cterm=reverse - hi ModeMsg ctermfg=234 ctermbg=186 cterm=NONE - hi MoreMsg ctermfg=108 ctermbg=NONE cterm=NONE - hi Question ctermfg=144 ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=173 ctermbg=NONE cterm=NONE - hi Todo ctermfg=186 ctermbg=234 cterm=reverse + 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=234 ctermbg=108 cterm=NONE - hi IncSearch ctermfg=234 ctermbg=215 cterm=NONE - hi CurSearch ctermfg=234 ctermbg=144 cterm=NONE - hi WildMenu ctermfg=234 ctermbg=186 cterm=NONE + 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=173 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=67 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=108 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=182 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=173 ctermbg=NONE cterm=NONE - hi String ctermfg=108 ctermbg=NONE cterm=NONE - hi Character ctermfg=151 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=144 ctermbg=NONE cterm=NONE - hi Type ctermfg=110 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=186 ctermbg=NONE cterm=bold + hi Title ctermfg=NONE ctermbg=NONE cterm=bold hi Directory ctermfg=109 ctermbg=NONE cterm=bold - hi Conceal ctermfg=243 ctermbg=NONE cterm=NONE + 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=253 ctermbg=65 cterm=NONE - hi DiffDelete ctermfg=137 ctermbg=NONE cterm=NONE - hi Added ctermfg=108 ctermbg=NONE cterm=NONE - hi Changed 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 - hi diffSubname ctermfg=139 ctermbg=NONE cterm=NONE - hi DiffText ctermfg=253 ctermbg=102 cterm=NONE - hi DiffChange ctermfg=250 ctermbg=59 cterm=NONE unlet s:t_Co finish endif @@ -217,11 +215,11 @@ if s:t_Co >= 16 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=NONE ctermbg=NONE cterm=bold + hi TabLineSel ctermfg=black ctermbg=gray cterm=bold hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse - hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE - hi CursorLineNr ctermfg=red ctermbg=NONE cterm=bold + 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 @@ -229,7 +227,7 @@ if s:t_Co >= 16 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=black ctermbg=cyan 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 @@ -239,27 +237,29 @@ if s:t_Co >= 16 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 ModeMsg ctermfg=black ctermbg=yellow cterm=NONE + hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi Question ctermfg=yellow ctermbg=NONE cterm=NONE hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE - hi Todo ctermfg=yellow ctermbg=black cterm=reverse + hi Todo ctermfg=white ctermbg=NONE cterm=bold hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold - hi Search ctermfg=black ctermbg=darkgreen cterm=NONE - hi IncSearch ctermfg=black ctermbg=red cterm=NONE - hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE - hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE - hi debugPC ctermfg=black ctermbg=blue 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 SpellBad ctermfg=darkred ctermbg=NONE cterm=underline - hi SpellCap ctermfg=blue 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 @@ -269,22 +269,21 @@ if s:t_Co >= 16 hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Type ctermfg=blue 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=yellow ctermbg=NONE cterm=bold + hi Title ctermfg=NONE ctermbg=NONE cterm=bold hi Directory ctermfg=cyan ctermbg=NONE cterm=bold - hi Conceal ctermfg=darkgray ctermbg=NONE cterm=NONE + 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=white ctermbg=darkgreen cterm=NONE - hi DiffDelete ctermfg=darkyellow 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=darkcyan ctermbg=NONE cterm=NONE + hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE - hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi DiffText ctermfg=white ctermbg=lightgrey cterm=NONE - hi DiffChange ctermfg=white ctermbg=darkgray cterm=NONE unlet s:t_Co finish endif @@ -293,13 +292,13 @@ 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=black cterm=reverse + hi VertSplit ctermfg=gray ctermbg=gray cterm=NONE hi TabLine ctermfg=black ctermbg=gray cterm=NONE - hi TabLineFill ctermfg=black ctermbg=gray cterm=NONE - hi TabLineSel ctermfg=NONE ctermbg=NONE 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=bold,reverse - hi QuickFixLine ctermfg=black ctermbg=blue 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 @@ -318,52 +317,53 @@ if s:t_Co >= 8 hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE hi PmenuExtra ctermfg=black ctermbg=gray cterm=NONE hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE + hi PmenuMatch ctermfg=black ctermbg=gray cterm=bold + hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse - hi ModeMsg ctermfg=black ctermbg=darkyellow cterm=NONE + hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE - hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse + hi Todo ctermfg=gray ctermbg=NONE cterm=bold hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold - hi Search ctermfg=black ctermbg=darkgreen 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=blue 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=blue 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=darkgreen ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Type ctermfg=blue 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=darkyellow ctermbg=NONE cterm=bold + 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=white ctermbg=darkgreen cterm=NONE - hi DiffDelete ctermfg=darkyellow 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=darkcyan ctermbg=NONE cterm=NONE + hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE - hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi DiffText ctermfg=white ctermbg=black cterm=bold,reverse - hi DiffChange ctermfg=black ctermbg=white cterm=NONE unlet s:t_Co finish endif @@ -437,36 +437,39 @@ if s:t_Co >= 0 endif " Background: dark -" Color: color00 #1C1C1C 234 black +" Color: color00 #1c1c1c 234 black " Color: color08 #767676 243 darkgray -" Color: color01 #D75F5F 167 darkred -" Color: color09 #D7875F 173 red -" Color: color02 #87AF87 108 darkgreen -" Color: color10 #AFD7AF 151 green -" Color: color03 #AFAF87 144 darkyellow -" Color: color11 #D7D787 186 yellow -" Color: color04 #5F87AF 67 blue -" Color: color12 #87AFD7 110 blue -" Color: color05 #AF87AF 139 darkmagenta -" Color: color13 #D7AFD7 182 magenta -" Color: color06 #5F8787 66 darkcyan -" Color: color14 #87AFAF 109 cyan -" Color: color07 #9E9E9E 247 gray -" Color: color15 #BCBCBC 250 white +" 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: colorC #ffaf5f 215 red +" Color: colorlC #5fff00 82 green +" Color: colorV #1f3f5f 109 cyan " Color: colorMP #ff00af 199 magenta -" Color: diffAdd #5f875f 65 darkgreen -" Color: diffDelete #af875f 137 darkyellow -" Color: diffChange #5f5f5f 59 darkgray -" Color: diffText #878787 102 lightgrey +" 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 dd40f34..71ef4ce 100644 --- a/runtime/colors/industry.vim +++ b/runtime/colors/industry.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Shian Lee. " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:36 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -29,6 +29,8 @@ 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 @@ -103,6 +105,8 @@ if s:t_Co >= 256 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 @@ -180,6 +184,8 @@ if s:t_Co >= 16 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 @@ -257,6 +263,8 @@ if s:t_Co >= 8 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 diff --git a/runtime/colors/koehler.vim b/runtime/colors/koehler.vim index 71858f0..f2883fb 100644 --- a/runtime/colors/koehler.vim +++ b/runtime/colors/koehler.vim @@ -3,7 +3,7 @@ " Maintainer: original maintainer Ron Aaron " Website: https://www.github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:36 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -62,7 +62,7 @@ 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=#e5e5e5 guibg=#a9a9a9 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 @@ -77,6 +77,8 @@ 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 @@ -123,7 +125,7 @@ if s:t_Co >= 256 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=254 ctermbg=145 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 @@ -138,6 +140,8 @@ if s:t_Co >= 256 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 @@ -187,7 +191,7 @@ if s:t_Co >= 16 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 Conceal ctermfg=grey ctermbg=grey cterm=NONE + hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Cursor ctermfg=black ctermbg=green cterm=NONE hi Directory ctermfg=darkyellow ctermbg=NONE cterm=NONE hi EndOfBuffer ctermfg=darkred ctermbg=NONE cterm=bold @@ -202,6 +206,8 @@ if s:t_Co >= 16 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 Question ctermfg=blue ctermbg=NONE cterm=bold hi Search ctermfg=white ctermbg=red cterm=NONE hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE @@ -265,6 +271,8 @@ if s:t_Co >= 8 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 Question ctermfg=darkblue ctermbg=NONE cterm=bold hi Search ctermfg=grey ctermbg=darkred cterm=NONE hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE diff --git a/runtime/colors/lunaperche.vim b/runtime/colors/lunaperche.vim index 3546710..5ccba2d 100644 --- a/runtime/colors/lunaperche.vim +++ b/runtime/colors/lunaperche.vim @@ -4,7 +4,7 @@ " Maintainer: Maxim Kim " Website: https://www.github.com/vim/colorschemes " License: Vim License (see `:help license`) -" Last Updated: Mon 08 Jan 2024 09:41:03 AM AEDT +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -120,6 +120,8 @@ if &background ==# 'dark' 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 @@ -158,7 +160,7 @@ if &background ==# 'dark' 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=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + 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 @@ -211,6 +213,8 @@ else 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 @@ -249,7 +253,7 @@ else 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=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + 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 @@ -381,6 +385,8 @@ if s:t_Co >= 256 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 @@ -417,7 +423,7 @@ if s:t_Co >= 256 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=NONE ctermbg=NONE cterm=NONE + 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 @@ -467,6 +473,8 @@ if s:t_Co >= 256 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 @@ -503,7 +511,7 @@ if s:t_Co >= 256 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=NONE ctermbg=NONE cterm=NONE + 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 @@ -559,6 +567,8 @@ if s:t_Co >= 16 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=white ctermbg=red cterm=NONE hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE @@ -594,7 +604,7 @@ if s:t_Co >= 16 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=NONE ctermbg=NONE cterm=NONE + 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 @@ -680,7 +690,7 @@ if s:t_Co >= 16 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 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 @@ -736,6 +746,8 @@ if s:t_Co >= 8 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 diff --git a/runtime/colors/morning.vim b/runtime/colors/morning.vim index 1644b04..bd62d0c 100644 --- a/runtime/colors/morning.vim +++ b/runtime/colors/morning.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Bram Moolenaar " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:37 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -42,6 +42,8 @@ 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 @@ -82,7 +84,7 @@ 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=#0000ff guibg=NONE gui=NONE cterm=NONE +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 @@ -114,6 +116,8 @@ if s:t_Co >= 256 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 @@ -154,7 +158,7 @@ if s:t_Co >= 256 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=21 ctermbg=NONE cterm=NONE + 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 @@ -179,6 +183,8 @@ if s:t_Co >= 16 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 TabLine ctermfg=black ctermbg=white cterm=underline hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse hi TabLineSel ctermfg=black ctermbg=grey cterm=bold @@ -219,7 +225,7 @@ if s:t_Co >= 16 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=blue ctermbg=NONE cterm=NONE + 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 @@ -244,6 +250,8 @@ if s:t_Co >= 8 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 diff --git a/runtime/colors/murphy.vim b/runtime/colors/murphy.vim index a6a08ed..6cdbd6e 100644 --- a/runtime/colors/murphy.vim +++ b/runtime/colors/murphy.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Ron Aaron . " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Mon 08 Jan 2024 09:50:15 AM AEDT +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -38,6 +38,8 @@ 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 @@ -111,6 +113,8 @@ if s:t_Co >= 256 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 @@ -176,6 +180,8 @@ if s:t_Co >= 16 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 @@ -241,6 +247,8 @@ if s:t_Co >= 8 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 diff --git a/runtime/colors/pablo.vim b/runtime/colors/pablo.vim index bd5693e..22bf377 100644 --- a/runtime/colors/pablo.vim +++ b/runtime/colors/pablo.vim @@ -3,7 +3,7 @@ " Maintainer: Original maintainerRon Aaron " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:38 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -37,7 +37,7 @@ 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=#e5e5e5 guibg=#a9a9a9 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 @@ -80,6 +80,8 @@ 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 @@ -110,7 +112,7 @@ if s:t_Co >= 256 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=254 ctermbg=248 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 @@ -153,6 +155,8 @@ if s:t_Co >= 256 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 @@ -178,7 +182,7 @@ if s:t_Co >= 16 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=grey ctermbg=grey cterm=NONE + hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Cursor ctermfg=black ctermbg=white cterm=NONE hi lCursor ctermfg=black ctermbg=white cterm=NONE hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE @@ -221,6 +225,8 @@ if s:t_Co >= 16 hi TabLineSel ctermfg=white ctermbg=black cterm=bold hi ToolbarLine ctermfg=NONE ctermbg=black 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 @@ -245,6 +251,8 @@ if s:t_Co >= 8 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 diff --git a/runtime/colors/peachpuff.vim b/runtime/colors/peachpuff.vim index 392945a..bc485c4 100644 --- a/runtime/colors/peachpuff.vim +++ b/runtime/colors/peachpuff.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer David Ne\v{c}as (Yeti) " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:39 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -39,9 +39,11 @@ 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 PmenuSel guifg=#000000 guibg=#f5c195 gui=bold cterm=bold 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 @@ -81,7 +83,7 @@ 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=#406090 guibg=NONE gui=NONE cterm=NONE +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 @@ -111,9 +113,11 @@ if s:t_Co >= 256 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 PmenuSel ctermfg=16 ctermbg=180 cterm=bold 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 @@ -153,7 +157,7 @@ if s:t_Co >= 256 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=25 ctermbg=NONE cterm=NONE + 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 @@ -178,9 +182,11 @@ if s:t_Co >= 16 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 PmenuSel ctermfg=black ctermbg=yellow cterm=bold 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 @@ -248,6 +254,8 @@ if s:t_Co >= 8 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 diff --git a/runtime/colors/quiet.vim b/runtime/colors/quiet.vim index 1a8603a..83ef067 100644 --- a/runtime/colors/quiet.vim +++ b/runtime/colors/quiet.vim @@ -4,7 +4,7 @@ " Maintainer: Maxence Weynans " Website: https://github.com/vim/colorschemes " License: Vim License (see `:help license`)` -" Last Updated: Fri 15 Dec 2023 20:05:39 +" Last Change: 2024 Aug 05 " Generated by Colortemplate v2.2.3 @@ -13,6 +13,9 @@ let g:colors_name = 'quiet' let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0) +hi! link Added Normal +hi! link Changed Normal +hi! link Removed Normal hi! link Terminal Normal hi! link StatusLineTerm StatusLine hi! link StatusLineTermNC StatusLineNC @@ -74,10 +77,12 @@ if &background ==# 'dark' 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 @@ -144,10 +149,12 @@ else 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 @@ -213,10 +220,12 @@ if s:t_Co >= 256 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 @@ -280,10 +289,12 @@ if s:t_Co >= 256 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 @@ -359,9 +370,11 @@ if s:t_Co >= 16 hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg 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 PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE @@ -425,9 +438,11 @@ if s:t_Co >= 16 hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg 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 PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE @@ -498,9 +513,11 @@ if s:t_Co >= 8 hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg 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 PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE @@ -564,9 +581,11 @@ if s:t_Co >= 8 hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg 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 PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE diff --git a/runtime/colors/retrobox.vim b/runtime/colors/retrobox.vim index 46d269f..fb982c2 100644 --- a/runtime/colors/retrobox.vim +++ b/runtime/colors/retrobox.vim @@ -4,7 +4,7 @@ " Maintainer: Maxim Kim , ported from gruvbox8 of Lifepillar " Website: https://www.github.com/vim/colorschemes " License: Vim License (see `:help license`) -" Last Updated: Fri 15 Dec 2023 20:05:40 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -21,14 +21,15 @@ hi! link Tag Special hi! link lCursor Cursor hi! link MessageWindow PMenu hi! link PopupNotification Todo -hi! link CurSearch Search +hi! link CurSearch IncSearch +hi! link Terminal Normal 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=#303030 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 @@ -49,6 +50,8 @@ if &background ==# 'dark' 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 @@ -60,7 +63,7 @@ if &background ==# 'dark' 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=#83a598 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 @@ -119,7 +122,7 @@ else 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=#e5d4b1 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 @@ -140,6 +143,8 @@ else 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 @@ -151,7 +156,7 @@ else 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=#076678 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 @@ -209,7 +214,7 @@ endif if s:t_Co >= 256 if &background ==# 'dark' hi Normal ctermfg=187 ctermbg=234 cterm=NONE - hi CursorLineNr ctermfg=214 ctermbg=236 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 @@ -230,6 +235,8 @@ if s:t_Co >= 256 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 @@ -241,7 +248,7 @@ if s:t_Co >= 256 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=109 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 @@ -297,7 +304,7 @@ if s:t_Co >= 256 else " Light background hi Normal ctermfg=237 ctermbg=230 cterm=NONE - hi CursorLineNr ctermfg=172 ctermbg=188 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 @@ -318,6 +325,8 @@ if s:t_Co >= 256 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 @@ -329,7 +338,7 @@ if s:t_Co >= 256 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=23 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 @@ -409,6 +418,8 @@ if s:t_Co >= 16 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 @@ -422,7 +433,7 @@ if s:t_Co >= 16 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=Blue 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 @@ -497,6 +508,8 @@ if s:t_Co >= 16 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 @@ -510,7 +523,7 @@ if s:t_Co >= 16 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=Blue 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 @@ -590,6 +603,8 @@ if s:t_Co >= 8 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 @@ -603,7 +618,7 @@ if s:t_Co >= 8 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=Blue 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 @@ -678,6 +693,8 @@ if s:t_Co >= 8 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 @@ -691,7 +708,7 @@ if s:t_Co >= 8 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=Blue 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 @@ -852,7 +869,7 @@ endif " Color: bg1 #ebdbb2 187 Grey " Color: bg2 #e5d4b1 188 Grey " Color: bg3 #bdae93 144 -" Color: bg4 #a89984 137 +" Color: bg4 #a89984 137 Grey " Color: bg5 #ebe1b7 229 Grey " Color: bg6 #ffffd7 231 Grey " Color: fg0 #282828 235 DarkGray @@ -866,6 +883,7 @@ endif " 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 diff --git a/runtime/colors/ron.vim b/runtime/colors/ron.vim index 684b485..4376418 100644 --- a/runtime/colors/ron.vim +++ b/runtime/colors/ron.vim @@ -3,7 +3,7 @@ " Maintainer: original maintainer Ron Aaron " Website: https://www.github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:41 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -58,7 +58,7 @@ 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=#e5e5e5 guibg=#a9a9a9 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 @@ -75,6 +75,8 @@ 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 @@ -123,7 +125,7 @@ if s:t_Co >= 256 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=254 ctermbg=145 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 @@ -140,6 +142,8 @@ if s:t_Co >= 256 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 @@ -191,7 +195,7 @@ if s:t_Co >= 16 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=grey ctermbg=grey cterm=NONE + hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE hi Cursor ctermfg=white ctermbg=green cterm=NONE hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE hi EndOfBuffer ctermfg=yellow ctermbg=darkgrey cterm=NONE @@ -208,6 +212,8 @@ if s:t_Co >= 16 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 Question ctermfg=green ctermbg=black cterm=NONE hi Search ctermfg=black ctermbg=grey cterm=NONE hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE @@ -275,6 +281,8 @@ if s:t_Co >= 8 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 Question ctermfg=darkgreen ctermbg=black cterm=bold hi Search ctermfg=black ctermbg=grey cterm=NONE hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE diff --git a/runtime/colors/shine.vim b/runtime/colors/shine.vim index ec7da8c..58e7378 100644 --- a/runtime/colors/shine.vim +++ b/runtime/colors/shine.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer is Yasuhiro Matsumoto " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:41 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -45,6 +45,8 @@ 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 @@ -79,7 +81,7 @@ 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=#dadada guibg=#767676 gui=NONE cterm=NONE +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 @@ -123,6 +125,8 @@ if s:t_Co >= 256 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 @@ -157,7 +161,7 @@ if s:t_Co >= 256 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=253 ctermbg=243 cterm=NONE + 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 @@ -192,6 +196,8 @@ if s:t_Co >= 16 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 TabLine ctermfg=black ctermbg=grey cterm=underline hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse hi TabLineSel ctermfg=black ctermbg=white cterm=bold @@ -226,7 +232,7 @@ if s:t_Co >= 16 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=grey ctermbg=darkgrey cterm=NONE + 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 @@ -261,6 +267,8 @@ if s:t_Co >= 8 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 TabLine ctermfg=black ctermbg=grey cterm=reverse hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse hi TabLineSel ctermfg=grey ctermbg=black cterm=reverse diff --git a/runtime/colors/slate.vim b/runtime/colors/slate.vim index d58d078..b63a5fb 100644 --- a/runtime/colors/slate.vim +++ b/runtime/colors/slate.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Ralph Amissah " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:41 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -33,10 +33,12 @@ 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 PmenuSel guifg=#262626 guibg=#d7d787 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 @@ -110,10 +112,12 @@ if s:t_Co >= 256 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 PmenuSel ctermfg=235 ctermbg=186 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 @@ -180,10 +184,12 @@ if s:t_Co >= 16 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 PmenuSel ctermfg=black ctermbg=darkyellow 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 @@ -250,10 +256,12 @@ if s:t_Co >= 8 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 PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE 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 diff --git a/runtime/colors/sorbet.vim b/runtime/colors/sorbet.vim index a762dfb..eca239e 100644 --- a/runtime/colors/sorbet.vim +++ b/runtime/colors/sorbet.vim @@ -4,7 +4,7 @@ " Maintainer: Maxence Weynans " Website: https://github.com/vim/colorschemes " License: Vim License (see `:help license`)` -" Last Updated: Fri 15 Dec 2023 20:05:42 +" Last Change: 2024 Aug 05 " Generated by Colortemplate v2.2.3 @@ -51,6 +51,9 @@ 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 @@ -73,10 +76,12 @@ 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 @@ -115,11 +120,13 @@ 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 DiffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE hi debugBreakpoint guifg=#8787af guibg=#000000 gui=bold,reverse cterm=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 @@ -142,10 +149,12 @@ if s:t_Co >= 256 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 @@ -184,7 +193,6 @@ if s:t_Co >= 256 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 DiffRemoved ctermfg=167 ctermbg=NONE cterm=NONE hi debugBreakpoint ctermfg=103 ctermbg=16 cterm=bold,reverse unlet s:t_Co finish @@ -204,6 +212,9 @@ if s:t_Co >= 16 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 Conceal ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse @@ -220,9 +231,11 @@ if s:t_Co >= 16 hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg 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 PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE @@ -256,7 +269,6 @@ if s:t_Co >= 16 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 DiffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse unlet s:t_Co finish @@ -276,6 +288,9 @@ if s:t_Co >= 8 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 Conceal ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse @@ -292,9 +307,11 @@ if s:t_Co >= 8 hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg 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 PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE @@ -328,7 +345,6 @@ if s:t_Co >= 8 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 DiffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse unlet s:t_Co finish diff --git a/runtime/colors/torte.vim b/runtime/colors/torte.vim index 2ad17b0..516f916 100644 --- a/runtime/colors/torte.vim +++ b/runtime/colors/torte.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Thorsten Maerz " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:42 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -48,7 +48,7 @@ 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=#e5e5e5 guibg=#a9a9a9 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 @@ -81,6 +81,8 @@ 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 @@ -121,7 +123,7 @@ if s:t_Co >= 256 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=254 ctermbg=248 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 @@ -154,6 +156,8 @@ if s:t_Co >= 256 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 @@ -187,7 +191,7 @@ if s:t_Co >= 16 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=grey 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 @@ -220,6 +224,8 @@ if s:t_Co >= 16 hi TabLineSel ctermfg=white ctermbg=black cterm=bold hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE 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 @@ -287,6 +293,8 @@ if s:t_Co >= 8 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 diff --git a/runtime/colors/wildcharm.vim b/runtime/colors/wildcharm.vim index ee1f376..15f3eda 100644 --- a/runtime/colors/wildcharm.vim +++ b/runtime/colors/wildcharm.vim @@ -4,7 +4,7 @@ " Maintainer: Maxim Kim " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Mon 08 Jan 2024 09:40:36 AM AEDT +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -26,14 +26,14 @@ if &background ==# 'dark' 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=#d0d0d0 guibg=#000000 gui=reverse cterm=reverse + 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=#767676 gui=NONE cterm=NONE - hi TabLine guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE - hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE - hi TabLineSel guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE + 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=#ffffff gui=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 @@ -43,13 +43,15 @@ if &background ==# 'dark' 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=#000000 guibg=#ffaf00 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=#d7005f guibg=#ffaf00 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=#000000 guibg=#ffaf00 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 @@ -65,7 +67,7 @@ if &background ==# 'dark' 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=#0087d7 guibg=#000000 gui=reverse cterm=reverse + 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 @@ -87,7 +89,7 @@ if &background ==# 'dark' 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=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + 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 @@ -102,14 +104,14 @@ else let g:terminal_ansi_colors = ['#000000', '#af0000', '#008700', '#af5f00', '#005faf', '#870087', '#008787', '#8a8a8a', '#808080', '#d70000', '#5faf5f', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff'] endif hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE - hi Statusline guifg=#ffffff guibg=#5f5f5f 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=#d0d0d0 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=#808080 gui=NONE cterm=NONE - hi TabLineSel guifg=#ffffff guibg=#000000 gui=reverse cterm=reverse + 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=#000000 gui=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 @@ -118,13 +120,15 @@ else 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=#ffffff guibg=#d78700 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=#af0000 guibg=#d78700 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=#ffffff guibg=#d78700 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 @@ -132,7 +136,7 @@ else 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=#8700ff guibg=#ffffff gui=reverse cterm=reverse + 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 @@ -158,11 +162,11 @@ else 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=#8700ff 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=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + 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 @@ -184,14 +188,14 @@ if s:t_Co >= 256 hi! link CurSearch IncSearch if &background ==# 'dark' hi Normal ctermfg=252 ctermbg=16 cterm=NONE - hi Statusline ctermfg=252 ctermbg=16 cterm=reverse + hi Statusline ctermfg=247 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=252 cterm=NONE - hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE - hi TabLineSel ctermfg=231 ctermbg=16 cterm=NONE + 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=231 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 @@ -201,13 +205,15 @@ if s:t_Co >= 256 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=16 ctermbg=214 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=161 ctermbg=214 cterm=NONE + hi PmenuKindSel ctermfg=204 ctermbg=240 cterm=NONE hi PmenuExtra ctermfg=243 ctermbg=236 cterm=NONE - hi PmenuExtraSel ctermfg=16 ctermbg=214 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 @@ -221,17 +227,17 @@ if s:t_Co >= 256 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=32 ctermbg=16 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=231 cterm=reverse - hi SpellCap ctermfg=37 ctermbg=16 cterm=reverse - hi SpellLocal ctermfg=41 ctermbg=16 cterm=reverse - hi SpellRare ctermfg=213 ctermbg=16 cterm=reverse + 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 @@ -243,7 +249,7 @@ if s:t_Co >= 256 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=NONE ctermbg=NONE cterm=NONE + 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 @@ -255,14 +261,14 @@ if s:t_Co >= 256 else " Light background hi Normal ctermfg=16 ctermbg=231 cterm=NONE - hi Statusline ctermfg=231 ctermbg=59 cterm=NONE + hi Statusline ctermfg=231 ctermbg=59 cterm=bold hi StatuslineNC ctermfg=16 ctermbg=252 cterm=NONE - hi VertSplit ctermfg=252 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=240 cterm=NONE - hi TabLineSel ctermfg=231 ctermbg=16 cterm=reverse + 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=16 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 @@ -271,13 +277,15 @@ if s:t_Co >= 256 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=231 ctermbg=172 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=124 ctermbg=172 cterm=NONE + hi PmenuKindSel ctermfg=160 ctermbg=249 cterm=NONE hi PmenuExtra ctermfg=240 ctermbg=254 cterm=NONE - hi PmenuExtraSel ctermfg=231 ctermbg=172 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 @@ -285,7 +293,7 @@ if s:t_Co >= 256 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=93 ctermbg=231 cterm=reverse + 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 @@ -298,10 +306,10 @@ if s:t_Co >= 256 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=231 cterm=reverse - hi SpellCap ctermfg=30 ctermbg=231 cterm=reverse - hi SpellLocal ctermfg=28 ctermbg=231 cterm=reverse - hi SpellRare ctermfg=127 ctermbg=231 cterm=reverse + 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 @@ -309,11 +317,11 @@ if s:t_Co >= 256 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=93 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=NONE ctermbg=NONE cterm=NONE + 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 @@ -330,14 +338,14 @@ endif if s:t_Co >= 16 if &background ==# 'dark' hi Normal ctermfg=grey ctermbg=black cterm=NONE - hi Statusline ctermfg=grey ctermbg=black cterm=reverse + 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=NONE + 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=white cterm=NONE + hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE @@ -353,6 +361,8 @@ if s:t_Co >= 16 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=darkred ctermbg=white cterm=reverse hi ErrorMsg ctermfg=darkred ctermbg=white cterm=reverse @@ -366,17 +376,17 @@ if s:t_Co >= 16 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=darkblue ctermbg=black 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 SpellBad ctermfg=darkred ctermbg=white cterm=reverse - hi SpellCap ctermfg=darkcyan ctermbg=black cterm=reverse - hi SpellLocal ctermfg=green ctermbg=black cterm=reverse - hi SpellRare ctermfg=magenta ctermbg=black cterm=reverse + 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 @@ -388,7 +398,7 @@ if s:t_Co >= 16 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=NONE ctermbg=NONE cterm=NONE + 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 @@ -400,14 +410,14 @@ if s:t_Co >= 16 else " Light background hi Normal ctermfg=black ctermbg=white cterm=NONE - hi Statusline ctermfg=white ctermbg=darkgrey cterm=NONE + hi Statusline ctermfg=white ctermbg=darkgrey cterm=bold hi StatuslineNC ctermfg=black ctermbg=lightgrey cterm=NONE - hi VertSplit ctermfg=lightgrey 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=darkgrey cterm=NONE - hi TabLineSel ctermfg=white ctermbg=black cterm=reverse + 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=black cterm=NONE + hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=NONE hi QuickFixLine ctermfg=white ctermbg=darkmagenta cterm=NONE hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE @@ -423,6 +433,8 @@ if s:t_Co >= 16 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 @@ -430,7 +442,7 @@ if s:t_Co >= 16 hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Todo ctermfg=darkred ctermbg=white cterm=reverse + 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 @@ -443,10 +455,10 @@ if s:t_Co >= 16 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=white cterm=reverse - hi SpellCap ctermfg=darkcyan ctermbg=white cterm=reverse - hi SpellLocal ctermfg=darkgreen ctermbg=white cterm=reverse - hi SpellRare ctermfg=magenta ctermbg=white cterm=reverse + 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 @@ -454,11 +466,11 @@ if s:t_Co >= 16 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=darkred 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=NONE ctermbg=NONE cterm=NONE + 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 @@ -477,10 +489,10 @@ 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=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 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 @@ -498,6 +510,8 @@ if s:t_Co >= 8 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 @@ -544,10 +558,10 @@ if s:t_Co >= 8 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 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 @@ -565,6 +579,8 @@ if s:t_Co >= 8 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 @@ -572,7 +588,7 @@ if s:t_Co >= 8 hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Todo ctermfg=darkred ctermbg=black cterm=reverse + hi Todo ctermfg=blue 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 @@ -706,6 +722,8 @@ endif " 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 @@ -733,7 +751,7 @@ endif " Color: color14 #00afaf 37 cyan " Color: color07 #8a8a8a 245 grey " Color: color15 #ffffff 231 white -" Color: color16 #8700ff 93 darkred +" Color: color16 #5f00d7 56 blue " Color: colorCm #8a8a8a 245 darkgrey " Color: colorLine #EEEEEE 255 grey " Color: colorB #E4E4E4 254 grey @@ -741,7 +759,7 @@ endif " Color: colorTab #d0d0d0 252 lightgrey " Color: colorC #000000 16 black " Color: colorlC #FF00FF 201 magenta -" Color: colorV #5F87AF 67 darkblue +" Color: colorV #0087af 31 darkcyan " Color: colorDim #626262 241 darkgrey " Color: colorSt #5f5f5f 59 darkgrey " Color: colorMP #ff00af 199 magenta diff --git a/runtime/colors/zaibatsu.vim b/runtime/colors/zaibatsu.vim index dba8603..02997c8 100644 --- a/runtime/colors/zaibatsu.vim +++ b/runtime/colors/zaibatsu.vim @@ -4,7 +4,7 @@ " Maintainer: Romain Lafourcade " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:43 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -35,6 +35,8 @@ 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 @@ -138,6 +140,8 @@ if s:t_Co >= 256 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 @@ -244,6 +248,8 @@ if s:t_Co >= 16 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 ColorColumn ctermfg=white ctermbg=darkred cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE @@ -350,6 +356,8 @@ if s:t_Co >= 8 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 ColorColumn ctermfg=white ctermbg=darkred cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE diff --git a/runtime/colors/zellner.vim b/runtime/colors/zellner.vim index 8a15004..7f11fbb 100644 --- a/runtime/colors/zellner.vim +++ b/runtime/colors/zellner.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Ron Aaron " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: Fri 15 Dec 2023 20:05:44 +" Last Change: 2024 Aug 15 " Generated by Colortemplate v2.2.3 @@ -42,6 +42,8 @@ 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 @@ -82,7 +84,7 @@ 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=#ff0000 guibg=NONE gui=NONE cterm=NONE +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 @@ -115,6 +117,8 @@ if s:t_Co >= 256 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 @@ -155,7 +159,7 @@ if s:t_Co >= 256 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=196 ctermbg=NONE cterm=NONE + 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 @@ -183,6 +187,8 @@ if s:t_Co >= 16 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 @@ -223,7 +229,7 @@ if s:t_Co >= 16 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=red ctermbg=NONE cterm=NONE + 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 @@ -251,6 +257,8 @@ if s:t_Co >= 8 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 @@ -288,7 +296,7 @@ if s:t_Co >= 8 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=darkred ctermbg=NONE cterm=NONE + 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 diff --git a/runtime/compiler/pandoc.vim b/runtime/compiler/pandoc.vim index 6c15193..ecc935a 100644 --- a/runtime/compiler/pandoc.vim +++ b/runtime/compiler/pandoc.vim @@ -1,6 +1,7 @@ " Vim compiler file " Compiler: Pandoc " Maintainer: Konfekt +" Last Change: 2024 Aug 20 " " Expects output file extension, say `:make html` or `:make pdf`. " Passes additional arguments to pandoc, say `:make html --self-contained`. @@ -25,31 +26,33 @@ let s:supported_filetypes = silent! function s:PandocFiletype(filetype) abort let ft = a:filetype - if ft ==# 'pandoc' - return 'markdown' - elseif ft ==# 'tex' - return 'latex' - elseif ft ==# 'xml' - " Pandoc does not support XML as a generic input format, but it does support - " EndNote XML and Jats XML out of which the latter seems more universal. - return 'jats' - elseif ft ==# 'text' || empty(ft) - return 'markdown' - elseif index(s:supported_filetypes, &ft) >= 0 - return ft + + if ft ==# 'pandoc' | return 'markdown' + elseif ft ==# 'tex' | return 'latex' + " Pandoc does not support XML as a generic input format, but it does support + " EndNote XML and Jats XML out of which the latter seems more universal. + elseif ft ==# 'xml' | return 'jats' + elseif ft ==# 'text' || empty(ft) | return 'markdown' + elseif index(s:supported_filetypes, &ft) >= 0 | return ft else - echomsg 'Unsupported filetype: ' . ft . ', falling back to Markdown as input format!' + echomsg 'Unsupported filetype: '..ft..', falling back to Markdown as input format!' return 'markdown' endif endfunction -execute 'CompilerSet makeprg=pandoc\ --standalone' . - \ '\ --metadata\ title=%:t:r:S' . - \ '\ --metadata\ lang=' . matchstr(&spelllang, '^\a\a') . - \ '\ --from=' . s:PandocFiletype(&filetype) . - \ '\ ' . escape(get(b:, 'pandoc_compiler_args', get(g:, 'pandoc_compiler_args', '')), ' ') . - \ '\ --output\ %:r:S.$*\ %:S' - -CompilerSet errorformat="%f",\ line\ %l:\ %m + +let b:pandoc_compiler_from = get(b:, 'pandoc_compiler_from', s:PandocFiletype(&filetype)) +let b:pandoc_compiler_lang = get(b:, 'pandoc_compiler_lang', &spell ? matchstr(&spelllang, '^\a\a') : '') + +execute 'CompilerSet makeprg=pandoc'..escape( + \ ' --standalone' . + \ (b:pandoc_compiler_from ==# 'markdown' && (getline(1) =~# '^%\s\+\S\+' || (search('^title:\s+\S+', 'cnw') > 0)) ? + \ '' : ' --metadata title=%:t:r:S') . + \ (empty(b:pandoc_compiler_lang) ? + \ '' : ' --metadata lang='..b:pandoc_compiler_lang) . + \ ' --from='..b:pandoc_compiler_from . + \ ' '..get(b:, 'pandoc_compiler_args', get(g:, 'pandoc_compiler_args', '')) . + \ ' --output %:r:S.$* -- %:S', ' ') +CompilerSet errorformat=\"%f\",\ line\ %l:\ %m let &cpo = s:keepcpo unlet s:keepcpo diff --git a/runtime/compiler/typst.vim b/runtime/compiler/typst.vim new file mode 100644 index 0000000..33e5581 --- /dev/null +++ b/runtime/compiler/typst.vim @@ -0,0 +1,15 @@ +" Vim compiler file +" Language: Typst +" Maintainer: Gregory Anders +" Last Change: 2024-07-14 +" Based on: https://github.com/kaarmu/typst.vim + +if exists('current_compiler') + finish +endif +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'] + +execute 'CompilerSet makeprg=' . join(s:makeprg, '\ ') diff --git a/runtime/doc/Make_mvc.mak b/runtime/doc/Make_mvc.mak index f2fbc52..c387ef8 100644 --- a/runtime/doc/Make_mvc.mak +++ b/runtime/doc/Make_mvc.mak @@ -12,7 +12,7 @@ # Correct the following line for the where executeable file vim is installed. # Please do not put the path in quotes. -VIMEXE = D:\Programs\Vim\vim90\vim.exe +VIMPROG = D:\Programs\Vim\vim90\vim.exe # Correct the following line for the directory where iconv installed. # Please do not put the path in quotes. @@ -63,7 +63,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) - @"$(VIMEXE)" --clean -esX -V1 -u doctags.vim + @"$(VIMPROG)" --clean -esX -V1 -u doctags.vim uganda.nsis.txt : uganda.??? @@ -105,7 +105,7 @@ perlhtml : tags $(DOCS) # Check URLs in the help with "curl" or "powershell". test_urls : - "$(VIMEXE)" --clean -S test_urls.vim + "$(VIMPROG)" --clean -S test_urls.vim clean : $(RM) doctags.exe doctags.obj diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 30a4f08..785128e 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -6,8 +6,7 @@ AWK = awk -# Set to $(VIMTARGET) when executed from src/Makefile. -VIMEXE = vim +VIMPROG = ../../src/vim # include the config.mk from the source directory. It's only needed to set # AWK, used for "make html". Comment this out if the include gives problems. @@ -23,9 +22,9 @@ include Make_all.mak all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED) # Use Vim to generate the tags file. Can only be used when Vim has been -# compiled and installed. Supports multiple languages. +# compiled. Supports multiple languages. vimtags: $(DOCS) - @$(VIMEXE) --clean -esX -V1 -u doctags.vim + @$(VIMPROG) --clean -esX -V1 -u doctags.vim # Use "doctags" to generate the tags file. Only works for English! tags: doctags $(DOCS) @@ -36,19 +35,19 @@ doctags: doctags.c $(CC) doctags.c -o doctags vim.man: vim.1 - nroff -man $< | sed -e s/.//g > $@ + nroff -man $? | sed -e s/.//g > $@ evim.man: evim.1 - nroff -man $< | sed -e s/.//g > $@ + nroff -man $? | sed -e s/.//g > $@ vimdiff.man: vimdiff.1 - nroff -man $< | sed -e s/.//g > $@ + nroff -man $? | sed -e s/.//g > $@ vimtutor.man: vimtutor.1 - nroff -man $< | sed -e s/.//g > $@ + nroff -man $? | sed -e s/.//g > $@ xxd.man: xxd.1 - nroff -man $< | sed -e s/.//g > $@ + nroff -man $? | sed -e s/.//g > $@ uganda.nsis.txt : uganda.??? for dpn in $?; do \ @@ -57,7 +56,7 @@ uganda.nsis.txt : uganda.??? $${dpn} | uniq > $${trg%txt}$${dpn##*.}; \ done # This files needs to be in dos fileformat for NSIS. - $(VIMEXE) -e -X -u NONE --cmd "set notitle noicon nocp noml viminfo=" \ + $(VIMPROG) -e -X -u NONE --cmd "set notitle noicon nocp noml viminfo=" \ -c "argdo write ++ff=dos" -c "qa" uganda.nsis.??? # Awk version of .txt to .html conversion. @@ -75,10 +74,10 @@ $(HTMLS): tags.ref # index.html is the starting point for HTML, but for the help files it is # help.txt. Therefore use vimindex.html for index.txt. index.html: help.txt - $(AWK) -f makehtml.awk $< >$@ + $(AWK) -f makehtml.awk $? >$@ vimindex.html: index.txt - $(AWK) -f makehtml.awk $< >$@ + $(AWK) -f makehtml.awk $? >$@ tags.ref tags.html: tags $(AWK) -f maketags.awk tags >tags.html @@ -91,7 +90,7 @@ perlhtml: tags $(DOCS) # Check URLs in the help with "curl". test_urls: - $(VIMEXE) --clean -S test_urls.vim + $(VIMPROG) --clean -S test_urls.vim clean: -rm -f doctags *.html tags.ref @@ -152,88 +151,91 @@ os_risc.txt: os_win32.txt: touch $@ -# Note that $< works with GNU make while $> works for BSD make. -# Is there a solution that works for both?? +# In *BSD, the variable '$<' is used in suffix-transformation rules (in GNU this +# is called "implicit rules", and in MS Windows it is called "inference rules"). +# For code portability, it is better to use the '$?' variable for explicit rules. +# Especially since there is only one dependency and it should presumably always +# be newer than the target file. vim-da.UTF-8.1: vim-da.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ vimdiff-da.UTF-8.1: vimdiff-da.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ vimtutor-da.UTF-8.1: vimtutor-da.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ vim-de.UTF-8.1: vim-de.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ vim-fr.UTF-8.1: vim-fr.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ evim-fr.UTF-8.1: evim-fr.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ vimdiff-fr.UTF-8.1: vimdiff-fr.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ vimtutor-fr.UTF-8.1: vimtutor-fr.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ xxd-fr.UTF-8.1: xxd-fr.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ vim-it.UTF-8.1: vim-it.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ evim-it.UTF-8.1: evim-it.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ vimdiff-it.UTF-8.1: vimdiff-it.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ vimtutor-it.UTF-8.1: vimtutor-it.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ xxd-it.UTF-8.1: xxd-it.1 - iconv -f latin1 -t utf-8 $< >$@ + iconv -f latin1 -t UTF-8 $? >$@ vim-pl.UTF-8.1: vim-pl.1 - iconv -f latin2 -t utf-8 $< >$@ + iconv -f latin2 -t UTF-8 $? >$@ evim-pl.UTF-8.1: evim-pl.1 - iconv -f latin2 -t utf-8 $< >$@ + iconv -f latin2 -t UTF-8 $? >$@ vimdiff-pl.UTF-8.1: vimdiff-pl.1 - iconv -f latin2 -t utf-8 $< >$@ + iconv -f latin2 -t UTF-8 $? >$@ vimtutor-pl.UTF-8.1: vimtutor-pl.1 - iconv -f latin2 -t utf-8 $< >$@ + iconv -f latin2 -t UTF-8 $? >$@ xxd-pl.UTF-8.1: xxd-pl.1 - iconv -f latin2 -t utf-8 $< >$@ + iconv -f latin2 -t UTF-8 $? >$@ vim-ru.UTF-8.1: vim-ru.1 - iconv -f KOI8-R -t utf-8 $< >$@ + iconv -f KOI8-R -t UTF-8 $? >$@ evim-ru.UTF-8.1: evim-ru.1 - iconv -f KOI8-R -t utf-8 $< >$@ + iconv -f KOI8-R -t UTF-8 $? >$@ vimdiff-ru.UTF-8.1: vimdiff-ru.1 - iconv -f KOI8-R -t utf-8 $< >$@ + iconv -f KOI8-R -t UTF-8 $? >$@ vimtutor-ru.UTF-8.1: vimtutor-ru.1 - iconv -f KOI8-R -t utf-8 $< >$@ + iconv -f KOI8-R -t UTF-8 $? >$@ xxd-ru.UTF-8.1: xxd-ru.1 - iconv -f KOI8-R -t utf-8 $< >$@ + iconv -f KOI8-R -t UTF-8 $? >$@ vim-tr.UTF-8.1: vim-tr.1 - iconv -f latin5 -t utf-8 $< >$@ + iconv -f latin5 -t UTF-8 $? >$@ evim-tr.UTF-8.1: evim-tr.1 - iconv -f latin5 -t utf-8 $< >$@ + iconv -f latin5 -t UTF-8 $? >$@ vimdiff-tr.UTF-8.1: vimdiff-tr.1 - iconv -f latin5 -t utf-8 $< >$@ + iconv -f latin5 -t UTF-8 $? >$@ vimtutor-tr.UTF-8.1: vimtutor-tr.1 - iconv -f latin5 -t utf-8 $< >$@ + iconv -f latin5 -t UTF-8 $? >$@ diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 037f89c..f200a30 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 9.1. Last change: 2024 May 05 +*autocmd.txt* For Vim version 9.1. Last change: 2024 Aug 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -54,20 +54,20 @@ Recommended use: without the autocommand being repeated. Example in Vim9 script: > - autocmd_add({replace: true, + autocmd_add([{replace: true, group: 'DemoGroup', event: 'BufEnter', pattern: '*.txt', cmd: 'call DemoBufEnter()' - }) + }]) In legacy script: > - call autocmd_add(#{replace: v:true, + call autocmd_add([#{replace: v:true, \ group: 'DemoGroup', \ event: 'BufEnter', \ pattern: '*.txt', \ cmd: 'call DemoBufEnter()' - \ }) + \ }]) ============================================================================== 2. Defining autocommands *autocmd-define* @@ -379,6 +379,7 @@ Name triggered by ~ |CursorHold| the user doesn't press a key for a while |CursorHoldI| the user doesn't press a key for a while in Insert mode |CursorMoved| the cursor was moved in Normal mode +|CursorMovedC| the cursor was moved in the |Command-line| |CursorMovedI| the cursor was moved in Insert mode |WinNewPre| before creating a new window @@ -438,6 +439,8 @@ Name triggered by ~ |CompleteDone| after Insert mode completion is done, after clearing info +|KeyInputPre| just before a key is processed + |User| to be used in combination with ":doautocmd" |SigUSR1| after the SIGUSR1 signal has been detected @@ -748,6 +751,13 @@ CursorMoved After the cursor was moved in Normal or Visual Careful: This is triggered very often, don't do anything that the user does not expect or that is slow. + *CursorMovedC* +CursorMovedC After the cursor was moved in the command + line. Be careful not to mess up the command + line, it may cause Vim to lock up. + is set to a single character, + indicating the type of command-line. + |cmdwin-char| *CursorMovedI* CursorMovedI After the cursor was moved in Insert mode. Not triggered when the popup menu is visible. @@ -906,12 +916,12 @@ FilterWritePre Before writing a file for a filter command or *FocusGained* FocusGained When Vim got input focus. Only for the GUI version and a few console versions where this - can be detected. + can be detected. |xterm-focus-event| *FocusLost* FocusLost When Vim lost input focus. Only for the GUI version and a few console versions where this - can be detected. May also happen when a - dialog pops up. + can be detected. |xterm-focus-event| + May also happen when a dialog pops up. *FuncUndefined* FuncUndefined When a user function is used but it isn't defined. Useful for defining a function only @@ -969,6 +979,26 @@ InsertLeavePre Just before leaving Insert mode. Also when *InsertLeave* InsertLeave Just after leaving Insert mode. Also when using CTRL-O |i_CTRL-O|. But not for |i_CTRL-C|. + *KeyInputPre* +KeyInputPre Just before a key is processed after mappings + have been applied. The pattern is matched + against a string that indicates the current + mode, which is the same as what is returned by + `mode(1)`. + The |v:char| variable indicates the key typed + and can be changed during the event to process + a different key. When |v:char| is not a + single character or a special key, the first + character is used. + The following values of |v:event| are set: + typed The key is typed or not. + typedchar The (actual) typed key since + the last |KeyInputPre| call. + Note: "typedchar" may be empty if successive + |KeyInputPre| autocmds are processed. + It is not allowed to change the text + |textlock| or the current mode. + {only with the +eval feature} *MenuPopup* MenuPopup Just before showing the popup menu (under the right mouse button). Useful for adjusting the @@ -1400,8 +1430,10 @@ WinLeave Before leaving a window. If the window to be *WinNewPre* WinNewPre Before creating a new window. Triggered before commands that modify window layout by - creating a split or new tab page. Not done for - the first window, when Vim has just started. + creating a split. + Not done when creating tab pages and for the + first window, as the window structure is not + initialized yet and so is generally not safe. It is not allowed to modify window layout while executing commands for the WinNewPre event. diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index a824531..4192b81 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -1,4 +1,4 @@ -*builtin.txt* For Vim version 9.1. Last change: 2024 Jun 17 +*builtin.txt* For Vim version 9.1. Last change: 2024 Aug 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -28,9 +28,9 @@ acos({expr}) Float arc cosine of {expr} add({object}, {item}) List/Blob append {item} to {object} and({expr}, {expr}) Number bitwise AND append({lnum}, {text}) Number append {text} below line {lnum} -appendbufline({expr}, {lnum}, {text}) +appendbufline({buf}, {lnum}, {text}) Number append {text} below line {lnum} - in buffer {expr} + in buffer {buf} argc([{winid}]) Number number of files in the argument list argidx() Number current index in the argument list arglistid([{winnr} [, {tabnr}]]) Number argument list id @@ -67,6 +67,8 @@ autocmd_get([{opts}]) List return a list of autocmds balloon_gettext() String current text in the balloon balloon_show({expr}) none show {expr} inside the balloon balloon_split({msg}) List split {msg} as used for a balloon +bindtextdomain({package}, {path}) + Bool bind text domain to specified path blob2list({blob}) List convert {blob} into a list of numbers browse({save}, {title}, {initdir}, {default}) String put up a file requester @@ -153,8 +155,8 @@ diff_filler({lnum}) Number diff filler lines about {lnum} diff_hlID({lnum}, {col}) Number diff highlighting at {lnum}/{col} digraph_get({chars}) String get the |digraph| of {chars} digraph_getlist([{listall}]) List get all |digraph|s -digraph_set({chars}, {digraph}) Boolean register |digraph| -digraph_setlist({digraphlist}) Boolean register multiple |digraph|s +digraph_set({chars}, {digraph}) Bool register |digraph| +digraph_setlist({digraphlist}) Bool register multiple |digraph|s echoraw({expr}) none output {expr} as-is empty({expr}) Number |TRUE| if {expr} is empty environ() Dict return environment variables @@ -277,7 +279,7 @@ gettabvar({nr}, {varname} [, {def}]) gettabwinvar({tabnr}, {winnr}, {name} [, {def}]) any {name} in {winnr} in tab page {tabnr} gettagstack([{nr}]) Dict get the tag stack of window {nr} -gettext({text}) String lookup translation of {text} +gettext({text} [, {package}]) String lookup translation of {text} getwininfo([{winid}]) List list of info about each window getwinpos([{timeout}]) List X and Y coord in pixels of Vim window getwinposx() Number X coord in pixels of the Vim window @@ -306,6 +308,7 @@ hlget([{name} [, {resolve}]]) List get highlight group attributes hlset({list}) Number set highlight group attributes hostname() String name of the machine Vim is running on iconv({expr}, {from}, {to}) String convert encoding of {expr} +id({item}) String get unique identity string of item indent({lnum}) Number indent of line {lnum} index({object}, {expr} [, {start} [, {ic}]]) Number index in {object} where {expr} appears @@ -429,6 +432,7 @@ popup_menu({what}, {options}) Number create a popup window used as a menu popup_move({id}, {options}) none set position of popup window {id} popup_notification({what}, {options}) Number create a notification popup window +popup_setbuf({id}, {buf}) Bool set the buffer for the popup window {id} popup_setoptions({id}, {options}) none set options for popup window {id} popup_settext({id}, {text}) none set the text of popup window {id} @@ -525,9 +529,9 @@ searchpos({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]]) server2client({clientid}, {string}) Number send reply string serverlist() String get a list of available servers -setbufline({expr}, {lnum}, {text}) +setbufline({buf}, {lnum}, {text}) Number set line {lnum} to {text} in buffer - {expr} + {buf} setbufvar({buf}, {varname}, {val}) none set {varname} in buffer {buf} to {val} setcellwidths({list}) none set character cell width overrides @@ -1217,6 +1221,16 @@ balloon_split({msg}) *balloon_split()* Return type: list or list +bindtextdomain({package}, {path}) *bindtextdomain()* + Bind a specific {package} to a {path} so that the + |gettext()| function can be used to get language-specific + translations for a package. {path} is the directory name + for the translations. See |package-translation|. + + Returns v:true on success and v:false on failure (out of + memory). + + Return type: |vim9-boolean| blob2list({blob}) *blob2list()* Return a List containing the number value of each byte in Blob @@ -2518,8 +2532,10 @@ executable({expr}) *executable()* This function checks if an executable with the name {expr} exists. {expr} must be the name of the program without any arguments. + executable() uses the value of $PATH and/or the normal - searchpath for programs. *PATHEXT* + searchpath for programs. + *PATHEXT* On MS-Windows the ".exe", ".bat", etc. can optionally be included. Then the extensions in $PATHEXT are tried. Thus if "foo.exe" does not exist, "foo.exe.bat" can be found. If @@ -2529,11 +2545,14 @@ executable({expr}) *executable()* then the name is also tried without adding an extension. On MS-Windows it only checks if the file exists and is not a directory, not if it's really executable. - On MS-Windows an executable in the same directory as Vim is - normally found. Since this directory is added to $PATH it - should also work to execute it |win32-PATH|. This can be - disabled by setting the $NoDefaultCurrentDirectoryInExePath - environment variable. *NoDefaultCurrentDirectoryInExePath* + On MS-Windows an executable in the same directory as the Vim + executable is always found. Since this directory is added to + $PATH it should also work to execute it |win32-PATH|. + *NoDefaultCurrentDirectoryInExePath* + On MS-Windows an executable in Vim's current working directory + is also normally found, but this can be disabled by setting + the $NoDefaultCurrentDirectoryInExePath environment variable. + The result is a Number: 1 exists 0 does not exist @@ -2579,7 +2598,7 @@ execute({command} [, {silent}]) *execute()* Can also be used as a |method|: > GetCommand()->execute() < - Return type: |Number| + Return type: |String| exepath({expr}) *exepath()* @@ -3563,7 +3582,7 @@ garbagecollect([{atexit}]) *garbagecollect()* Return type: |String| -get({list}, {idx} [, {default}]) *get()* +get({list}, {idx} [, {default}]) *get()* *get()-list* Get item {idx} from |List| {list}. When this item is not available return {default}. Return zero when {default} is omitted. @@ -3572,7 +3591,7 @@ get({list}, {idx} [, {default}]) *get()* < Return type: any, depending on {list} -get({blob}, {idx} [, {default}]) +get({blob}, {idx} [, {default}]) *get()-blob* Get byte {idx} from |Blob| {blob}. When this byte is not available return {default}. Return -1 when {default} is omitted. @@ -3581,7 +3600,7 @@ get({blob}, {idx} [, {default}]) < Return type: |Number| -get({dict}, {key} [, {default}]) +get({dict}, {key} [, {default}]) *get()-dict* Get item with key {key} from |Dictionary| {dict}. When this item is not available return {default}. Return zero when {default} is omitted. Useful example: > @@ -3593,18 +3612,32 @@ get({dict}, {key} [, {default}]) < Return type: any, depending on {dict} -get({func}, {what}) - Get item {what} from Funcref {func}. Possible values for +get({func}, {what}) *get()-func* + Get item {what} from |Funcref| {func}. Possible values for {what} are: - "name" The function name - "func" The function - "dict" The dictionary - "args" The list with arguments + "name" The function name + "func" The function + "dict" The dictionary + "args" The list with arguments + "arity" A dictionary with information about the number of + arguments accepted by the function (minus the + {arglist}) with the following fields: + required the number of positional arguments + optional the number of optional arguments, + in addition to the required ones + varargs |TRUE| if the function accepts a + variable number of arguments |...| + + Note: There is no error, if the {arglist} of + the Funcref contains more arguments than the + Funcref expects, it's not validated. + Returns zero on error. + Preferably used as a |method|: > myfunc->get(what) < - Return type: any, depending on {func} + Return type: any, depending on {func} and {what} *getbufinfo()* getbufinfo([{buf}]) @@ -4036,6 +4069,7 @@ getcompletion({pat}, {type} [, {filtered}]) *getcompletion()* customlist,{func} custom completion, defined via {func} diff_buffer |:diffget| and |:diffput| completion dir directory names + dir_in_path directory names in |'cdpath'| environment environment variable names event autocommand events expression Vim expression @@ -4774,6 +4808,8 @@ getregion({pos1}, {pos2} [, {opts}]) *getregion()* < Can also be used as a |method|: > getpos('.')->getregion(getpos("'a")) +< + Return type: list < getregionpos({pos1}, {pos2} [, {opts}]) *getregionpos()* @@ -4811,7 +4847,7 @@ getregionpos({pos1}, {pos2} [, {opts}]) *getregionpos()* Can also be used as a |method|: > getpos('.')->getregionpos(getpos("'a")) < - Return type: list + Return type: list>> getregtype([{regname}]) *getregtype()* @@ -4977,16 +5013,20 @@ gettagstack([{winnr}]) *gettagstack()* Return type: dict -gettext({text}) *gettext()* +gettext({text} [, {package}]) *gettext()* Translate String {text} if possible. - This is mainly for use in the distributed Vim scripts. When - generating message translations the {text} is extracted by - xgettext, the translator can add the translated message in the - .po file and Vim will lookup the translation when gettext() is - called. + This is intended for use in Vim scripts. When generating + message translations the {text} is extracted by `xgettext`, + the translator can add translated messages into the .po file + and Vim will lookup the translation when gettext() is called. For {text} double quoted strings are preferred, because - xgettext does not understand escaping in single quoted - strings. + `xgettext` does not support single quoted escaped text. + + When the {package} is specified, the translation is looked up + for that specific package. This is mainly required for + third-party Vim scripts. You need to specify a path to the + translations with the |bindtextdomain()| function before + using the gettext() function. Return type: |String| @@ -5590,6 +5630,34 @@ iconv({string}, {from}, {to}) *iconv()* Return type: |String| +id({item}) *id()* + The result is a unique String associated with the {item} and + not with the {item}'s contents. It is only valid while the + {item} exists and is referenced. It is valid only in the + instance of vim that produces the result. The whole idea is + that `id({item})` does not change if the contents of {item} + changes. This is useful as a `key` for creating an identity + dictionary, rather than one based on equals. + + This operation does not reference {item} and there is no + function to convert the `id` to the {item}. It may be useful to + have a map of `id` to {item}. The following > + var referenceMap: dict + var id = item->id() + referenceMap[id] = item +< prevents {item} from being garbage collected and provides a + way to get the {item} from the `id`. + + {item} may be a List, Dictionary, Object, Job, Channel or + Blob. If the item is not a permitted type, or it is a null + value, then an empty String is returned. + + Can also be used as a |method|: > + GetItem()->id() +< + Return type: |String| + + indent({lnum}) *indent()* The result is a Number, which is indent of line {lnum} in the current buffer. The indent is counted in spaces, the value @@ -6883,10 +6951,10 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]]) matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]]) Same as |matchadd()|, but requires a list of positions {pos} instead of a pattern. This command is faster than |matchadd()| - because it does not require to handle regular expressions and - sets buffer line boundaries to redraw screen. It is supposed - to be used when fast match additions and deletions are - required, for example to highlight matching parentheses. + because it does not handle regular expressions and it sets + buffer line boundaries to redraw screen. It is supposed to be + used when fast match additions and deletions are required, for + example to highlight matching parentheses. {pos} is a list of positions. Each position can be one of these: @@ -8078,7 +8146,7 @@ pyxeval({expr}) *pyxeval()* See also: |pyeval()|, |py3eval()| Can also be used as a |method|: > - < GetExpr()->pyxeval() + GetExpr()->pyxeval() < Return type: any, depending on {expr} @@ -9486,7 +9554,8 @@ setline({lnum}, {text}) *setline()* Set line {lnum} of the current buffer to {text}. To insert lines use |append()|. To set lines in another buffer use |setbufline()|. - Any text properties in {lnum} are cleared |text-prop-cleared|. + Any text properties in {lnum} are cleared. See + |text-prop-cleared| {lnum} is used like with |getline()|. When {lnum} is just below the last line the {text} will be @@ -10270,8 +10339,8 @@ spellsuggest({word} [, {max} [, {capital}]]) *spellsuggest()* split({string} [, {pattern} [, {keepempty}]]) *split()* Make a |List| out of {string}. When {pattern} is omitted or - empty each white-separated sequence of characters becomes an - item. + empty each white space separated sequence of characters + becomes an item. Otherwise the string is split where {pattern} matches, removing the matched characters. 'ignorecase' is not used here, add \c to ignore case. |/\c| @@ -11039,7 +11108,7 @@ synconcealed({lnum}, {col}) *synconcealed()* Note: Doesn't consider |matchadd()| highlighting items, since syntax and matching highlighting are two different mechanisms |syntax-vs-match|. -< + Return type: list diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 50ff4ec..2304712 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 9.1. Last change: 2024 May 18 +*change.txt* For Vim version 9.1. Last change: 2024 Jul 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -95,13 +95,14 @@ For inserting text see |insert.txt|. These commands delete text. You can repeat them with the `.` command (except `:d`) and undo them. Use Visual mode to delete blocks of text. See |registers| for an explanation of registers. - + *d-special* An exception for the d{motion} command: If the motion is not linewise, the start and end of the motion are not in the same line, and there are only blanks before the start and there are no non-blanks after the end of the motion, the delete becomes linewise. This means that the delete also removes the line of blanks that you might expect to remain. Use the |o_v| operator to -force the motion to be characterwise. +force the motion to be characterwise or remove the "z" flag from 'cpoptions' +(see |cpo-z|) to disable this peculiarity. Trying to delete an empty region of text (e.g., "d0" in the first column) is an error when 'cpoptions' includes the 'E' flag. @@ -251,7 +252,7 @@ blank; this is probably a bug, because "dw" deletes all the blanks; use the If you prefer "cw" to include the space after a word, use this mapping: > :map cw dwi -Or use "caw" (see |aw|). +Alternatively use "caw" (see also |aw| and |cpo-z|). *:c* *:ch* *:change* :{range}c[hange][!] Replace lines of text with some different text. @@ -1272,13 +1273,13 @@ Vim fills these registers with text from yank and delete commands. Numbered register 0 contains the text from the most recent yank command, unless the command specified another register with ["x]. Numbered register 1 contains the text deleted by the most recent delete or -change command, unless the command specified another register or the text is -less than one line (the small delete register is used then). An exception is -made for the delete operator with these movement commands: |%|, |(|, |)|, |`|, -|/|, |?|, |n|, |N|, |{| and |}|. Register "1 is always used then (this is Vi -compatible). The "- register is used as well if the delete is within a line. -Note that these characters may be mapped. E.g. |%| is mapped by the matchit -plugin. +change command (even when the command specified another register), unless the +text is less than one line (the small delete register is used then). An +exception is made for the delete operator with these movement commands: |%|, +|(|, |)|, |`|, |/|, |?|, |n|, |N|, |{| and |}|. +Register "1 is always used then (this is Vi compatible). The "- register is +used as well if the delete is within a line. Note that these characters may be +mapped. E.g. |%| is mapped by the matchit plugin. With each successive deletion or change, Vim shifts the previous contents of register 1 into register 2, 2 into 3, and so forth, losing the previous contents of register 9. @@ -1413,7 +1414,7 @@ The next three commands always work on whole lines. :[range]m[ove] {address} *:m* *:mo* *:move* *E134* Move the lines given by [range] to below the line given by {address}. - Any text properties in [range] are cleared + Any text properties in [range] are cleared. See |text-prop-cleared|. ============================================================================== diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt index f294679..c1fae51 100644 --- a/runtime/doc/channel.txt +++ b/runtime/doc/channel.txt @@ -1,4 +1,4 @@ -*channel.txt* For Vim version 9.1. Last change: 2024 Jun 13 +*channel.txt* For Vim version 9.1. Last change: 2024 Jul 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -981,8 +981,9 @@ job_start({command} [, {options}]) *job_start()* invoked. {command} can be a String. This works best on MS-Windows. On - Unix it is split up in white-separated parts to be passed to - execvp(). Arguments in double quotes can contain white space. + Unix it is split up in white space separated parts to be + passed to execvp(). Arguments in double quotes can contain + white space. {command} can be a List, where the first item is the executable and further items are the arguments. All items are converted diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 214571f..d1ef7ba 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 9.1. Last change: 2024 Apr 27 +*cmdline.txt* For Vim version 9.1. Last change: 2024 Aug 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -379,7 +379,8 @@ terminals) :keepp[atterns] {command} *:keepp* *:keeppatterns* Execute {command}, without adding anything to the search - history + history and, in case of |:s| or |:&|, without modifying the + last substitute pattern or substitute string. ============================================================================== 2. Command-line completion *cmdline-completion* diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index ca8f0ae..4d477cf 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 9.1. Last change: 2024 Apr 12 +*editing.txt* For Vim version 9.1. Last change: 2024 Jul 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1804,7 +1804,7 @@ There are three different types of searching: stop-directories are appended to the path (for the 'path' option) or to the filename (for the 'tags' option) with a ';'. If you want several stop-directories separate them with ';'. If you want no stop-directory - ("search upward till the root directory) just use ';'. > + ("search upward till the root directory") just use ';'. > /usr/include/sys;/usr < will search in: > /usr/include/sys @@ -1817,7 +1817,7 @@ There are three different types of searching: If Vim's current path is /u/user_x/work/release and you do > :set path=include;/u/user_x -< and then search for a file with |gf| the file is searched in: > +< and then search for a file with |gf| the file is searched in: > /u/user_x/work/release/include /u/user_x/work/include /u/user_x/include @@ -1829,7 +1829,7 @@ There are three different types of searching: 3) Combined up/downward search: If Vim's current path is /u/user_x/work/release and you do > set path=**;/u/user_x -< and then search for a file with |gf| the file is searched in: > +< and then search for a file with |gf| the file is searched in: > /u/user_x/work/release/** /u/user_x/work/** /u/user_x/** @@ -1841,10 +1841,10 @@ There are three different types of searching: In the above example you might want to set path to: > :set path=**,/u/user_x/** -< This searches: - /u/user_x/work/release/** ~ - /u/user_x/** ~ - This searches the same directories, but in a different order. +< This searches: > + /u/user_x/work/release/** + /u/user_x/** +< This searches the same directories, but in a different order. Note that completion for ":find", ":sfind", and ":tabfind" commands do not currently work with 'path' items that contain a URL or use the double star diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 18cd2c1..e2c6967 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 9.1. Last change: 2024 Jun 01 +*eval.txt* For Vim version 9.1. Last change: 2024 Jul 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1995,7 +1995,8 @@ v:beval_winid The |window-ID| of the window, over which the mouse pointer *v:char* *char-variable* v:char Argument for evaluating 'formatexpr' and used for the typed character when using in an abbreviation |:map-|. - It is also used by the |InsertCharPre| and |InsertEnter| events. + It is also used by the |InsertCharPre|, |InsertEnter| and + |KeyInputPre| events. *v:charconvert_from* *charconvert_from-variable* v:charconvert_from @@ -3123,9 +3124,10 @@ text... let lconst[0] = 2 " Error! let lconst[1][0] = 'b' " OK < *E995* - |:const| does not allow to for changing a variable: > + It is an error to specify an existing variable with + |:const|. > :let x = 1 - :const x = 2 " Error! + :const x = 1 " Error! < *E996* Note that environment variables, option values and register values cannot be used here, since they cannot diff --git a/runtime/doc/evim-it.1 b/runtime/doc/evim-it.1 index 75be4e8..778b54d 100644 --- a/runtime/doc/evim-it.1 +++ b/runtime/doc/evim-it.1 @@ -1,4 +1,4 @@ -.TH EVIM 1 "16 febbraio 2002 " +.TH EVIM 1 "12 agosto 2024" .SH NOME evim \- Vim "facile", impostato in modo da poter essere usato come editore non-modale .SH SINTASSI @@ -34,8 +34,12 @@ Occorre usare CTRL-Q per ottenere il comportamenti di CTRL-V in Vim nativo. Vedere vim(1). .SH FILE .TP 15 -/usr/local/lib/vim/evim.vim +/usr/local/share/vim??/evim.vim Lo script caricato per inizializzare eVim. +.br +.I vim?? +è il numero breve di versione, p.es. vim91 per +.B Vim 9.1 .SH AKA [Also Known As] noto anche come "Vim per semplici". Quando is usa evim si suppone che si prenda un fazzoletto, diff --git a/runtime/doc/evim-it.UTF-8.1 b/runtime/doc/evim-it.UTF-8.1 index 04bec41..914bec5 100644 --- a/runtime/doc/evim-it.UTF-8.1 +++ b/runtime/doc/evim-it.UTF-8.1 @@ -1,4 +1,4 @@ -.TH EVIM 1 "16 febbraio 2002 " +.TH EVIM 1 "12 agosto 2024" .SH NOME evim \- Vim "facile", impostato in modo da poter essere usato come editore non-modale .SH SINTASSI @@ -34,8 +34,12 @@ Occorre usare CTRL-Q per ottenere il comportamenti di CTRL-V in Vim nativo. Vedere vim(1). .SH FILE .TP 15 -/usr/local/lib/vim/evim.vim +/usr/local/share/vim??/evim.vim Lo script caricato per inizializzare eVim. +.br +.I vim?? +è il numero breve di versione, p.es. vim91 per +.B Vim 9.1 .SH AKA [Also Known As] noto anche come "Vim per semplici". Quando is usa evim si suppone che si prenda un fazzoletto, diff --git a/runtime/doc/evim-ru.1 b/runtime/doc/evim-ru.1 index 6d6f5de..dab75ce 100644 --- a/runtime/doc/evim-ru.1 +++ b/runtime/doc/evim-ru.1 @@ -1,59 +1,69 @@ -.TH EVIM 1 "2002 February 16" -.SH éíñ -evim \- ÐÒÏÓÔÏÊ Vim, ÐÏÚ×ÏÌÑÅÔ ÒÅÄÁËÔÉÒÏ×ÁÔØ ÆÁÊÌ Ó ÐÏÍÏÝØÀ Vim × ÂÅÚÒÅÖÉÍÎÏÍ ÒÅÖÉÍÅ -.SH ëïíáîäîáñ óôòïëá +.TH EVIM 1 "12 Á×ÇÕÓÔÁ 2024" +.SH îáúîáþåîéå +ðÒÏÇÒÁÍÍÁ evim \[em] ÜÔÏ ÕÐÒÏÝ£ÎÎÙÊ Vim, ËÏÔÏÒÁÑ ÐÒÏÉÚ×ÏÄÉÔ ÚÁÐÕÓË ÒÅÄÁËÔÏÒÁ Vim +× ÂÅÚÒÅÖÉÍÎÏÍ ×ÁÒÉÁÎÔÅ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÆÁÊÌÏ×. +.SH ëòáôëéê ïâúïò .br .B evim -[ËÌÀÞÉ] [ÆÁÊÌ ..] +[ÁÒÇÕÍÅÎÔÙ] [ÆÁÊÌ ...] .br .B eview .SH ïðéóáîéå -ëÏÍÁÎÄÁ +ðÏ ËÏÍÁÎÄÅ .B evim -ÚÁÐÕÓËÁÅÔ +ÚÁÐÕÓËÁÅÔÓÑ ÒÅÄÁËÔÏÒ .B Vim -É ÎÁÓÔÒÁÉ×ÁÅÔ ÒÑÄ ÏÐÃÉÊ ÔÁËÉÍ ÏÂÒÁÚÏÍ, ÞÔÏ ÏÎ ÎÁÞÉÎÁÅÔ ×ÅÓÔÉ ÓÅÂÑ -ËÁË ÏÂÙÞÎÙÊ ÂÅÚÒÅÖÉÍÎÙÊ ÒÅÄÁËÔÏÒ. ÷ ÜÔÏÍ ÒÅÖÉÍÅ Vim ÎÁÐÏÍÉÎÁÅÔ -Notepad ÉÚ MS-Windows. +É ×ÙÐÏÌÎÑÅÔÓÑ ÎÁÓÔÒÏÊËÁ ÒÑÄÁ ÐÁÒÁÍÅÔÒÏ× ÔÁËÉÍ ÏÂÒÁÚÏÍ, ÞÔÏÂÙ ÅÇÏ ÒÁÂÏÔÁ ÂÙÌÁ ËÁË +Õ ÐÒÏÓÔÙÈ ÂÅÚÒÅÖÉÍÎÙÈ ÒÅÄÁËÔÏÒÏ×. ÷ ÜÔÏÍ ÒÅÖÉÍÅ ÒÅÄÁËÔÏÒ Vim ÎÁÐÏÍÉÎÁÅÔ +ÒÅÄÁËÔÏÒ Notepad ÉÚ MS Windows. +÷ÁÒÉÁÎÔ ÒÅÄÁËÔÏÒÁ .B eVim -×ÓÅÇÄÁ ÚÁÐÕÓËÁÅÔÓÑ Ó ÐÏÄÄÅÒÖËÏÊ ÇÒÁÆÉÞÅÓËÏÇÏ ÉÎÔÅÒÆÅÊÓÁ, ÞÔÏÂÙ ÏÂÅÓÐÅÞÉÔØ -ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÍÅÎÀ É ÉÎÓÔÒÕÍÅÎÔÁÌØÎÏÊ ÐÁÎÅÌÉ. +×ÓÅÇÄÁ ÚÁÐÕÓËÁÅÔÓÑ Ó ÐÏÄÄÅÒÖËÏÊ ÇÒÁÆÉÞÅÓËÏÇÏ ÉÎÔÅÒÆÅÊÓÁ, ÞÔÏÂÙ ÂÙÌÁ ×ÏÚÍÏÖÎÏÓÔØ +×ÚÁÉÍÏÄÅÊÓÔ×ÉÑ Ó ÐÒÏÇÒÁÍÍÏÊ ÞÅÒÅÚ ÍÅÎÀ É ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×. .PP -üÔÁ ËÏÍÁÎÄÁ ÓÏÚÄÁÎÁ ÄÌÑ ÔÅÈ, ËÔÏ ÐÏ ËÁËÉÍ-ÔÏ ÐÒÉÞÉÎÁÍ ÎÅ × ÓÏÓÔÏÑÎÉÉ -ÒÁÂÏÔÁÔØ Ó Vim × ÏÂÙÞÎÏÍ ÒÅÖÉÍÅ. òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÆÁÊÌÏ× ÐÒÉ ÜÔÏÍ ÐÒÏÉÓÈÏÄÉÔ -ÇÏÒÁÚÄÏ ÍÅÎÅÅ ÜÆÆÅËÔÉ×ÎÏ, ÞÅÍ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÏÂÙÞÎÏÇÏ Vim. +üÔÏÔ ×ÁÒÉÁÎÔ ÒÅÄÁËÔÏÒÁ ÓÄÅÌÁÎ ÄÌÑ ÔÅÈ, ËÔÏ ÐÏ ËÁËÉÍ-ÔÏ ÐÒÉÞÉÎÁÍ ÎÅ × ÓÏÓÔÏÑÎÉÉ +ÒÁÂÏÔÁÔØ Ó ÏÂÙÞÎÙÍ ÒÅÄÁËÔÏÒÏÍ Vim. òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÆÁÊÌÏ× ÐÒÉ ÜÔÏÍ ÐÒÏÉÓÈÏÄÉÔ +ÇÏÒÁÚÄÏ ÍÅÎÅÅ ÜÆÆÅËÔÉ×ÎÏ, ÞÅÍ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÓÔÁÎÄÁÒÔÎÏÇÏ ×ÁÒÉÁÎÔÁ ÒÅÄÁËÔÏÒÁ. .PP -ëÏÍÁÎÄÁ +ðÏ ËÏÍÁÎÄÅ .B eview -×ÙÐÏÌÎÑÅÔ ÐÏÞÔÉ ÔÕ ÖÅ ÓÁÍÕÀ ÚÁÄÁÞÕ, ÎÏ ÆÁÊÌ ÏÔËÒÙ×ÁÅÔÓÑ × ÒÅÖÉÍÅ "ÔÏÌØËÏ -ÄÌÑ ÞÔÅÎÉÑ". éÓÐÏÌØÚÏ×ÁÎÉÅ ÜÔÏÊ ËÏÍÁÎÄÙ ÐÏÌÎÏÓÔØÀ ÉÄÅÎÔÉÞÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ -evim \-R. +×ÙÐÏÌÎÑÀÔÓÑ ÐÏÞÔÉ ÔÅ ÖÅ ÓÁÍÙÅ ÄÅÊÓÔ×ÉÑ, ÎÏ ÆÁÊÌ ÂÕÄÅÔ ÏÔËÒÙÔ "ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ". +éÓÐÏÌØÚÏ×ÁÎÉÅ ÜÔÏÊ ËÏÍÁÎÄÙ ÐÏÌÎÏÓÔØÀ ÉÄÅÎÔÉÞÎÏ ËÏÍÁÎÄÅ evim \-R. .PP -ðÏÄÒÏÂÎÅÅ Ï Vim, ËÌÀÞÁÈ ÚÁÐÕÓËÁ É Ô.Ð. ÓÍÏÔÒÉÔÅ ÎÁ ÓÔÒÁÎÉÃÅ ÓÐÒÁ×ÏÞÎÉËÁ +ðÏÄÒÏÂÎÅÅ Ï ÒÅÄÁËÔÏÒÅ Vim, ÁÒÇÕÍÅÎÔÁÈ ÚÁÐÕÓËÁ É Ô. Ð. ÓÍÏÔÒÉÔÅ × ÓÐÒÁ×ÏÞÎÉËÅ vim(1). .PP -ðÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ +ðÏ ËÏÍÁÎÄÅ .B evim -×ËÌÀÞÁÅÔÓÑ ÏÐÃÉÑ 'insertmode', ÞÔÏ ÐÏÚ×ÏÌÑÅÔ ××ÏÄÉÔØ ÔÅËÓÔ ÎÁÐÒÑÍÕÀ. +ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎ ÐÁÒÁÍÅÔÒ 'insertmode', ÞÔÏ ÏÂÅÓÐÅÞÉ×ÁÅÔ ××ÏÄ ÔÅËÓÔÁ ÎÁÐÒÑÍÕÀ × +ÂÕÆÅÒ. .br -ëÒÏÍÅ ÔÏÇÏ, ÎÁÓÔÒÁÉ×ÁÀÔÓÑ ÐÒÉ×ÑÚËÉ, ÐÏÚ×ÏÌÑÀÝÉÅ ÉÓÐÏÌØÚÏ×ÁÔØ ËÎÏÐËÉ MS-Windows -ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄ ËÏÐÉÒÏ×ÁÎÉÑ É ×ËÌÅÊËÉ. CTRL-X ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ×ÙÒÅÚÁÎÉÑ -ÔÅËÓÔÁ, CTRL-C ÄÌÑ ËÏÐÉÒÏ×ÁÎÉÑ É CTRL-V ÄÌÑ ×ËÌÅÊËÉ. þÔÏÂÙ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ -ÉÚÎÁÞÁÌØÎÙÍ ÚÎÁÞÅÎÉÅÍ ËÎÏÐËÉ CTRL-V, ÉÓÐÏÌØÚÕÊÔÅ CTRL-Q. -.SH ðáòáíåôòù úáðõóëá -óÍ. vim(1). +ëÒÏÍÅ ÔÏÇÏ, ÎÁÓÔÒÁÉ×ÁÀÔÓÑ ËÌÁ×ÉÁÔÕÒÎÙÅ ËÏÍÁÎÄÙ, ÐÏÚ×ÏÌÑÀÝÉÅ ×ÙÐÏÌÎÑÔØ +ËÏÐÉÒÏ×ÁÎÉÅ É ×ÓÔÁ×ËÕ ÔÅËÓÔÁ, ÉÓÐÏÌØÚÕÑ ÔÁËÉÅ ÖÅ ËÏÍÂÉÎÁÃÉÉ ËÌÁ×ÉÛ, +ËÁË × MS Windows. +ëÌÁ×ÉÛÉ CTRL+X ÉÓÐÏÌØÚÕÀÔÓÑ ÄÌÑ ×ÙÒÅÚÁÎÉÑ ÔÅËÓÔÁ, CTRL+C ÄÌÑ ËÏÐÉÒÏ×ÁÎÉÑ +É CTRL+V ÄÌÑ ×ÓÔÁ×ËÉ. +þÔÏÂÙ ×ÙÐÏÌÎÉÔØ ÔÕ ÖÅ ËÏÍÁÎÄÕ, ËÏÔÏÒÁÑ ÒÁÎØÛÅ ÂÙÌÁ ÎÁÚÎÁÞÅÎÁ ÎÁ ËÌÁ×ÉÛÉ CTRL+V, +ÉÓÐÏÌØÚÕÊÔÅ ËÌÁ×ÉÛÉ CTRL+Q. +.SH áòçõíåîôù ëïíáîäîïê óôòïëé +óÍ. ÓÐÒÁ×ÏÞÎÉË vim(1). .SH æáêìù .TP 15 -/usr/local/lib/vim/evim.vim +/usr/local/share/vim/vim??/evim.vim óÃÅÎÁÒÉÊ, ËÏÔÏÒÙÊ ÚÁÇÒÕÖÁÅÔÓÑ ÄÌÑ ÉÎÉÃÉÁÌÉÚÁÃÉÉ eVim. -.SH AKA -eVim ÔÁËÖÅ ÉÚ×ÅÓÔÅÎ ËÁË "Vim ÄÌÑ ÞÁÊÎÉËÏ×". +.br +úÄÅÓØ +.I "vim??" +ÏÚÎÁÞÁÅÔ ÓÏËÒÁÝ£ÎÎÕÀ ÚÁÐÉÓØ ÎÏÍÅÒÁ ×ÅÒÓÉÉ, ÎÁÐÒÉÍÅÒ, vim91 ÄÌÑ ×ÅÒÓÉÉ ÒÅÄÁËÔÏÒÁ +.B Vim 9.1 +.SH äòõçéíé óìï÷áíé +÷ÁÒÉÁÎÔ eVim ÔÁËÖÅ ÉÚ×ÅÓÔÅÎ ËÁË "Vim ÄÌÑ ÞÁÊÎÉËÏ×". äÌÑ ÎÁÉÌÕÞÛÅÇÏ ÜÆÆÅËÔÁ ÒÅËÏÍÅÎÄÕÅÔÓÑ ×Ï ×ÒÅÍÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÐÏ×ÑÚÁÔØ ÎÁ ÇÏÌÏ×Å ÐÌÁÔÏË, ÐÒÅÄ×ÁÒÉÔÅÌØÎÏ ÚÁ×ÑÚÁ× ÎÁ ËÁÖÄÏÍ ËÏÎÃÅ ÐÏ ÕÚÅÌËÕ. -.SH óíïôòé ôáëöå +.SH óíïôòéôå ôáëöå vim(1) .SH á÷ôïòù -âÏÌØÛÁÑ ÞÁÓÔØ +âÏÌØÛÁÑ ÞÁÓÔØ ÒÅÄÁËÔÏÒÁ .B Vim -ÓÏÚÄÁÎÁ âÒÁÍÏÍ íÏÏÌÅÎÁÁÒÏÍ (Bram Moolenaar), ËÏÔÏÒÏÍÕ ÐÏÍÏÇÁÅÔ ÏÇÒÏÍÎÏÅ -ËÏÌÉÞÅÓÔ×Ï ÌÀÄÅÊ. óÍ. ÍÅÎÀ óÐÒÁ×ËÁ/âÌÁÇÏÄÁÒÎÏÓÔÉ. +ÂÙÌÁ ÓÏÚÄÁÎÁ âÒÁÍÏÍ íÏÌÅÎÁÒÏÍ (Bram Moolenaar), ËÏÔÏÒÏÍÕ ÐÏÍÏÇÁÌÏ ÏÇÒÏÍÎÏÅ +ËÏÌÉÞÅÓÔ×Ï ÌÀÄÅÊ. óÍ. ÍÅÎÀ óÐÒÁ×ËÁ ÐÕÎËÔ óÏÁ×ÔÏÒÙ. diff --git a/runtime/doc/evim-ru.UTF-8.1 b/runtime/doc/evim-ru.UTF-8.1 index 581c364..8ac2669 100644 --- a/runtime/doc/evim-ru.UTF-8.1 +++ b/runtime/doc/evim-ru.UTF-8.1 @@ -1,59 +1,69 @@ -.TH EVIM 1 "2002 February 16" -.SH ИМЯ -evim \- проÑтой Vim, позволÑет редактировать файл Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Vim в безрежимном режиме -.SH КОМÐÐДÐÐЯ СТРОКР+.TH EVIM 1 "12 авгуÑта 2024" +.SH ÐÐЗÐÐЧЕÐИЕ +Программа evim \[em] Ñто упрощённый Vim, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ запуÑк редактора Vim +в безрежимном варианте Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð². +.SH КРÐТКИЙ ОБЗОР .br .B evim -[ключи] [файл ..] +[аргументы] [файл ...] .br .B eview .SH ОПИСÐÐИЕ -Команда +По команде .B evim -запуÑкает +запуÑкаетÑÑ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¾Ñ€ .B Vim -и наÑтраивает Ñ€Ñд опций таким образом, что он начинает веÑти ÑÐµÐ±Ñ -как обычный безрежимный редактор. Ð’ Ñтом режиме Vim напоминает -Notepad из MS-Windows. +и выполнÑетÑÑ Ð½Ð°Ñтройка Ñ€Ñда параметров таким образом, чтобы его работа была как +у проÑÑ‚Ñ‹Ñ… безрежимных редакторов. Ð’ Ñтом режиме редактор Vim напоминает +редактор Notepad из MS Windows. +Вариант редактора .B eVim -вÑегда запуÑкаетÑÑ Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ графичеÑкого интерфейÑа, чтобы обеÑпечить -иÑпользование меню и инÑтрументальной панели. +вÑегда запуÑкаетÑÑ Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ графичеÑкого интерфейÑа, чтобы была возможноÑÑ‚ÑŒ +взаимодейÑÑ‚Ð²Ð¸Ñ Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð¾Ð¹ через меню и панель инÑтрументов. .PP -Эта команда Ñоздана Ð´Ð»Ñ Ñ‚ÐµÑ…, кто по каким-то причинам не в ÑоÑтоÑнии -работать Ñ Vim в обычном режиме. Редактирование файлов при Ñтом проиÑходит -гораздо менее Ñффективно, чем при иÑпользовании обычного Vim. +Этот вариант редактора Ñделан Ð´Ð»Ñ Ñ‚ÐµÑ…, кто по каким-то причинам не в ÑоÑтоÑнии +работать Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ редактором Vim. Редактирование файлов при Ñтом проиÑходит +гораздо менее Ñффективно, чем при иÑпользовании Ñтандартного варианта редактора. .PP -Команда +По команде .B eview -выполнÑет почти ту же Ñамую задачу, но файл открываетÑÑ Ð² режиме "только -Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ". ИÑпользование Ñтой команды полноÑтью идентично иÑпользованию -evim \-R. +выполнÑÑŽÑ‚ÑÑ Ð¿Ð¾Ñ‡Ñ‚Ð¸ те же Ñамые дейÑтвиÑ, но файл будет открыт "только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ". +ИÑпользование Ñтой команды полноÑтью идентично команде evim \-R. .PP -Подробнее о Vim, ключах запуÑка и Ñ‚.п. Ñмотрите на Ñтранице Ñправочника +Подробнее о редакторе Vim, аргументах запуÑка и Ñ‚. п. Ñмотрите в Ñправочнике vim(1). .PP -При иÑпользовании +По команде .B evim -включаетÑÑ Ð¾Ð¿Ñ†Ð¸Ñ 'insertmode', что позволÑет вводить текÑÑ‚ напрÑмую. +будет уÑтановлен параметр 'insertmode', что обеÑпечивает ввод текÑта напрÑмую в +буфер. .br -Кроме того, наÑтраиваютÑÑ Ð¿Ñ€Ð¸Ð²Ñзки, позволÑющие иÑпользовать кнопки MS-Windows -Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ вклейки. CTRL-X иÑпользуетÑÑ Ð´Ð»Ñ Ð²Ñ‹Ñ€ÐµÐ·Ð°Ð½Ð¸Ñ -текÑта, CTRL-C Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ CTRL-V Ð´Ð»Ñ Ð²ÐºÐ»ÐµÐ¹ÐºÐ¸. Чтобы воÑпользоватьÑÑ -изначальным значением кнопки CTRL-V, иÑпользуйте CTRL-Q. -.SH ПÐРÐМЕТРЫ ЗÐПУСКР-См. vim(1). +Кроме того, наÑтраиваютÑÑ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð½Ñ‹Ðµ команды, позволÑющие выполнÑÑ‚ÑŒ +копирование и вÑтавку текÑта, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ‚Ð°ÐºÐ¸Ðµ же комбинации клавиш, +как в MS Windows. +Клавиши CTRL+X иÑпользуютÑÑ Ð´Ð»Ñ Ð²Ñ‹Ñ€ÐµÐ·Ð°Ð½Ð¸Ñ Ñ‚ÐµÐºÑта, CTRL+C Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ +и CTRL+V Ð´Ð»Ñ Ð²Ñтавки. +Чтобы выполнить ту же команду, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ñ€Ð°Ð½ÑŒÑˆÐµ была назначена на клавиши CTRL+V, +иÑпользуйте клавиши CTRL+Q. +.SH ÐРГУМЕÐТЫ КОМÐÐДÐОЙ СТРОКИ +См. Ñправочник vim(1). .SH ФÐЙЛЫ .TP 15 -/usr/local/lib/vim/evim.vim +/usr/local/share/vim/vim??/evim.vim Сценарий, который загружаетÑÑ Ð´Ð»Ñ Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸ eVim. -.SH AKA -eVim также извеÑтен как "Vim Ð´Ð»Ñ Ñ‡Ð°Ð¹Ð½Ð¸ÐºÐ¾Ð²". +.br +ЗдеÑÑŒ +.I "vim??" +означает Ñокращённую запиÑÑŒ номера верÑии, например, vim91 Ð´Ð»Ñ Ð²ÐµÑ€Ñии редактора +.B Vim 9.1 +.SH ДРУГИМИ СЛОВÐМИ +Вариант eVim также извеÑтен как "Vim Ð´Ð»Ñ Ñ‡Ð°Ð¹Ð½Ð¸ÐºÐ¾Ð²". Ð”Ð»Ñ Ð½Ð°Ð¸Ð»ÑƒÑ‡ÑˆÐµÐ³Ð¾ Ñффекта рекомендуетÑÑ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð²Ñзать на голове платок, предварительно завÑзав на каждом конце по узелку. -.SH СМОТРИ ТÐКЖЕ +.SH СМОТРИТЕ ТÐКЖЕ vim(1) .SH ÐВТОРЫ -Ð‘Ð¾Ð»ÑŒÑˆÐ°Ñ Ñ‡Ð°ÑÑ‚ÑŒ +Ð‘Ð¾Ð»ÑŒÑˆÐ°Ñ Ñ‡Ð°ÑÑ‚ÑŒ редактора .B Vim -Ñоздана Брамом Мооленааром (Bram Moolenaar), которому помогает огромное -количеÑтво людей. См. меню Справка/БлагодарноÑти. +была Ñоздана Брамом Моленаром (Bram Moolenaar), которому помогало огромное +количеÑтво людей. См. меню Справка пункт Соавторы. diff --git a/runtime/doc/evim.1 b/runtime/doc/evim.1 index bb859ce..a67bda3 100644 --- a/runtime/doc/evim.1 +++ b/runtime/doc/evim.1 @@ -1,4 +1,4 @@ -.TH EVIM 1 "2002 February 16" +.TH EVIM 1 "2024 August 12" .SH NAME evim \- easy Vim, edit a file with Vim and setup for modeless editing .SH SYNOPSIS @@ -34,8 +34,12 @@ Use CTRL-Q to obtain the original meaning of CTRL-V. See vim(1). .SH FILES .TP 15 -/usr/local/lib/vim/evim.vim +/usr/local/share/vim/vim??/evim.vim The script loaded to initialize eVim. +.br +.I vim?? +is short version number, like vim91 for +.B Vim 9.1 .SH AKA Also Known As "Vim for gumbies". When using evim you are expected to take a handkerchief, diff --git a/runtime/doc/evim.man b/runtime/doc/evim.man index 8b8db81..f966f82 100644 --- a/runtime/doc/evim.man +++ b/runtime/doc/evim.man @@ -1,4 +1,4 @@ -EVIM(1) EVIM(1) +EVIM(1) General Commands Manual EVIM(1) @@ -10,7 +10,7 @@ SYNOPSIS eview DESCRIPTION - eVim starts Vim and sets options to make it behave like a modeless edi- + eVim starts Vim and sets options to make it behave like a modeless edi†tor. This is still Vim but used as a point-and-click editor. This feels a lot like using Notepad on MS-Windows. eVim will always run in the GUI, to enable the use of menus and toolbar. @@ -32,8 +32,9 @@ OPTIONS See vim(1). FILES - /usr/local/lib/vim/evim.vim + /usr/local/share/vim/vim??/evim.vim The script loaded to initialize eVim. + vim?? is short version number, like vim91 for Vim 9.1 AKA Also Known As "Vim for gumbies". When using evim you are expected to @@ -49,4 +50,4 @@ AUTHOR - 2002 February 16 EVIM(1) + 2024 August 12 EVIM(1) diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 927b75c..a7ed928 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 9.1. Last change: 2024 May 23 +*filetype.txt* For Vim version 9.1. Last change: 2024 Aug 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -149,6 +149,7 @@ variables can be used to overrule the filetype used for certain extensions: *.csh g:filetype_csh |ft-csh-syntax| *.dat g:filetype_dat *.def g:filetype_def + *.dsp g:filetype_dsp *.f g:filetype_f |ft-forth-syntax| *.frm g:filetype_frm |ft-form-syntax| *.fs g:filetype_fs |ft-forth-syntax| @@ -622,6 +623,17 @@ any #lang directive overrides, use the following command: > let g:freebasic_lang = "fblite" +GDSCRIPT *ft-gdscript-plugin* + +By default the following options are set, based on Godot official docs: > + + setlocal noexpandtab softtabstop=0 shiftwidth=0 + +To disable this behavior, set the following variable in your vimrc: > + + let g:gdscript_recommended_style = 0 + + GIT COMMIT *ft-gitcommit-plugin* One command, :DiffGitCached, is provided to show a diff of the current commit @@ -629,6 +641,17 @@ in the preview window. It is equivalent to calling "git diff --cached" plus any arguments given to the command. +GO *ft-go-plugin* + +By default the following options are set, based on Golang official docs: > + + setlocal noexpandtab softtabstop=0 shiftwidth=0 + +To disable this behavior, set the following variable in your vimrc: > + + let g:go_recommended_style = 0 + + GPROF *ft-gprof-plugin* The gprof filetype plugin defines a mapping to jump from a function @@ -730,9 +753,13 @@ Global mapping: nmap ManPreGetPage Local mappings: +ManBS +h Clear backspace characters from the buffer CTRL-] Jump to the manual page for the word under the cursor. CTRL-T Jump back to the previous manual page. -q Same as the |:quit| command. + +The mappings can be disabled with: > + let g:no_man_maps = 1 To use a vertical split instead of horizontal: > let g:ft_man_open_mode = 'vert' @@ -741,8 +768,8 @@ To use a new tab: > To enable |folding|, use this: > let g:ft_man_folding_enable = 1 -If you do not like the default folding, use an |autocommand| to add your desired -folding style instead. For example: > +If you do not like the default folding, use an |autocommand| to add your +desired folding style instead. For example: > autocmd FileType man setlocal foldmethod=indent foldenable If you would like :Man {number} {name} to behave like man {number} {name} by @@ -885,6 +912,10 @@ You can change the default by defining the variable g:tex_flavor to the format let g:tex_flavor = "latex" Currently no other formats are recognized. +TYPST *ft-typst-plugin* + + *g:typst_conceal* +When |TRUE| the Typst filetype plugin will set the 'conceallevel' option to 2. VIM *ft-vim-plugin* diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index 3b55919..071de9c 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 9.1. Last change: 2024 May 11 +*gui.txt* For Vim version 9.1. Last change: 2024 Jul 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -970,7 +970,7 @@ name and all existing submenus below it are affected. 5.7 Examples for Menus *menu-examples* -Here is an example on how to add menu items with menu's! You can add a menu +Here is an example on how to add menu items with menus. You can add a menu item for the keyword under the cursor. The register "z" is used. > :nmenu Words.Add\ Var wb"zye:menu! Words.z z diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index d26592a..c595d9d 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 9.1. Last change: 2023 Jan 09 +*index.txt* For Vim version 9.1. Last change: 2023 Jul 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -213,10 +213,12 @@ tag char note action in Normal mode ~ || 1 go to N newer entry in jump list |CTRL-I| CTRL-I 1 same as || 1 same as "j" +|| 1 same as CTRL-F |CTRL-J| CTRL-J 1 same as "j" CTRL-K not used |CTRL-L| CTRL-L redraw screen || 1 cursor to the first CHAR N lines lower +|| 1 same as CTRL-F |CTRL-M| CTRL-M 1 same as |CTRL-N| CTRL-N 1 same as "j" |CTRL-O| CTRL-O 1 go to N older entry in jump list @@ -287,9 +289,11 @@ tag char note action in Normal mode ~ |star| * 1 search forward for the Nth occurrence of the ident under the cursor |+| + 1 same as +|| 1 same as CTRL-F |,| , 1 repeat latest f, t, F or T in opposite direction N times |-| - 1 cursor to the first CHAR N lines higher +|| 1 same as CTRL-B |.| . 2 repeat last change with count replaced with N |/| /{pattern} 1 search forward for the Nth occurrence of @@ -753,7 +757,7 @@ tag char note action in Normal mode ~ search pattern and Visually select it |gP| ["x]gP 2 put the text [from register x] before the cursor N times, leave the cursor after it -|gQ| gQ switch to "Ex" mode with Vim editing +|gQ| gQ switch to "Ex" mode with Vim editing |gR| gR 2 enter Virtual Replace mode |gT| gT go to the previous tab page |gU| gU{motion} 2 make Nmove text uppercase diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 6ebd83e..3894e5c 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 9.1. Last change: 2024 Jan 04 +*insert.txt* For Vim version 9.1. Last change: 2024 Aug 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1183,6 +1183,18 @@ items: user_data custom data which is associated with the item and available in |v:completed_item|; it can be any type; defaults to an empty string + hl_group an additional highlight group whose attributes are + combined with |hl-PmenuSel| and |hl-Pmenu| or + |hl-PmenuMatchSel| and |hl-PmenuMatch| highlight + attributes in the popup menu to apply cterm and gui + properties (with higher priority) like strikethrough + to the completion items + kind_hlgroup an additional highlight group specifically for setting + the highlight attributes of the completion kind. When + this field is present, it will override the + |hl-PmenuKind| highlight group, allowing for the + customization of ctermfg and guifg properties for the + completion kind All of these except "icase", "equal", "dup" and "empty" must be a string. If an item does not meet these requirements then an error message is given and @@ -1995,13 +2007,25 @@ These two commands will keep on asking for lines, until you type a line containing only a ".". Watch out for lines starting with a backslash, see |line-continuation|. -When in Ex mode (see |-e|) a backslash at the end of the line can be used to -insert a NUL character. To be able to have a line ending in a backslash use -two backslashes. This means that the number of backslashes is halved, but -only at the end of the line. - -NOTE: These commands cannot be used with |:global| or |:vglobal|. -":append" and ":insert" don't work properly in between ":if" and +Text typed after a "|" command separator is used first. So the following +command in ex mode: > + :a|one + two + . + :visual +appends the following text, after the cursor line: > + one + two +< +In |Ex-mode|, when these commands are used with |:global| or |:vglobal| then +the lines are obtained from the text following the command. Separate lines +with a NL escaped with a backslash: > + :global/abc/insert\ + one line\ + another line +The final "." is not needed then. + +NOTE: ":append" and ":insert" don't work properly in between ":if" and ":endif", ":for" and ":endfor", ":while" and ":endwhile". *:start* *:startinsert* diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index 365f49a..432a986 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 9.1. Last change: 2024 May 05 +*map.txt* For Vim version 9.1. Last change: 2024 Jul 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1631,6 +1631,7 @@ completion can be enabled: -complete=compiler compilers -complete=cscope |:cscope| suboptions -complete=dir directory names + -complete=dir_in_path directory names in |'cdpath'| -complete=environment environment variable names -complete=event autocommand events -complete=expression Vim expression diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 3bb2bfb..f02092b 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 9.1. Last change: 2024 Jun 09 +*mbyte.txt* For Vim version 9.1. Last change: 2024 Jul 17 VIM REFERENCE MANUAL by Bram Moolenaar et al. @@ -493,7 +493,7 @@ The GUI fully supports multibyte characters. It is also possible in a terminal, if the terminal supports the same encoding that Vim uses. Thus this is less flexible. -For example, you can run Vim in a xterm with added multibyte support and/or +For example, you can run Vim in an xterm with added multibyte support and/or |XIM|. Examples are kterm (Kanji term) and hanterm (for Korean), Eterm (Enlightened terminal) and rxvt. @@ -1379,7 +1379,7 @@ Motif. Use the ":hi Menu font={fontname}" command for this. |:highlight| TYPING UTF-8 *utf-8-typing* If you are using X-Windows, you should find an input method that supports -UTF-8. +the UTF-8 encoding. If your system does not provide support for typing UTF-8, you can use the 'keymap' feature. This allows writing a keymap file, which defines a UTF-8 diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt index 82c9772..9a15bdf 100644 --- a/runtime/doc/mlang.txt +++ b/runtime/doc/mlang.txt @@ -1,4 +1,4 @@ -*mlang.txt* For Vim version 9.1. Last change: 2022 Sep 17 +*mlang.txt* For Vim version 9.1. Last change: 2024 Jul 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -59,7 +59,9 @@ use of "-" and "_". :lan[guage] tim[e] {name} :lan[guage] col[late] {name} Set the current language (aka locale) to {name}. - The locale {name} must be a valid locale on your + The POSIX format of {name} is: > + language[_territory][.encoding] +< The locale {name} must be a valid locale on your system. Some systems accept aliases like "en" or "en_US", but some only accept the full specification like "en_US.ISO_8859-1". On Unix systems you can use diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 8c07fbf..3e45884 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 9.1. Last change: 2023 Dec 27 +*motion.txt* For Vim version 9.1. Last change: 2024 Jul 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -351,6 +351,7 @@ gg Goto line [count], default first line, on the first *:[range]* :[range] Set the cursor on the last line number in [range]. + In Ex mode, print the lines in [range]. [range] can also be just one line number, e.g., ":1" or ":'m". In contrast with |G| this command does not modify the @@ -433,7 +434,7 @@ WORD before the fold. Special case: "cw" and "cW" are treated like "ce" and "cE" if the cursor is on a non-blank. This is because "cw" is interpreted as change-word, and a -word does not include the following white space. +word does not include the following white space (see also |cw|). Another special case: When using the "w" motion in combination with an operator and the last word moved over is at the end of a line, the end of diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 6ec4031..3ec8a3a 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 9.1. Last change: 2024 Jun 17 +*options.txt* For Vim version 9.1. Last change: 2024 Aug 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -76,7 +76,8 @@ achieve special effects. These options come in three forms: :se[t] {option}:{value} Set string or number option to {value}. For numeric options the value can be given in decimal, - hex (preceded with 0x) or octal (preceded with '0'). + hex (preceded with 0x) or octal (preceded with '0' or + '0o'). The old value can be inserted by typing 'wildchar' (by default this is a or CTRL-E if 'compatible' is set). Many string options with fixed syntax and names @@ -1476,7 +1477,7 @@ A jump table for the options with a short description can be found at |Q_op|. applying 'breakindent', even if the resulting text should normally be narrower. This prevents text indented almost to the right window border - occupying lot of vertical space when broken. + occupying lots of vertical space when broken. (default: 20) shift:{n} After applying 'breakindent', the wrapped line's beginning will be shifted by the given number of @@ -2257,8 +2258,9 @@ A jump table for the options with a short description can be found at |Q_op|. Also see 'preserveindent'. *'cpoptions'* *'cpo'* *cpo* -'cpoptions' 'cpo' string (Vim default: "aABceFs", - Vi default: all flags) +'cpoptions' 'cpo' string (Vim default: "aABceFsz", + Vi default: all flags, except "#{|&/\." + |$VIM_POSIX|: all flags) global A sequence of single character flags. When a character is present this indicates Vi-compatible behavior. This is used for things where @@ -2486,6 +2488,9 @@ A jump table for the options with a short description can be found at |Q_op|. *cpo-Z* Z When using "w!" while the 'readonly' option is set, don't reset 'readonly'. + *cpo-z* + z Special casing the "cw" and "d" command (see |cw| and + |d-special|). *cpo-!* ! When redoing a filter command, use the last used external command, whatever it was. Otherwise the last @@ -4727,7 +4732,7 @@ A jump table for the options with a short description can be found at |Q_op|. in Insert mode as specified with the 'indentkeys' option. When this option is not empty, it overrules the 'cindent' and 'smartindent' indenting. When 'lisp' is set, this option is - is only used when 'lispoptions' contains "expr:1". + only used when 'lispoptions' contains "expr:1". When 'paste' is set this option is not used for indenting. The expression is evaluated with |v:lnum| set to the line number for which the indent is to be computed. The cursor is also in this line @@ -5090,7 +5095,7 @@ A jump table for the options with a short description can be found at |Q_op|. part can be in one of two forms: 1. A list of pairs. Each pair is a "from" character immediately followed by the "to" character. Examples: "aA", "aAbBcC". - 2. A list of "from" characters, a semi-colon and a list of "to" + 2. A list of "from" characters, a semicolon and a list of "to" characters. Example: "abc;ABC" Example: "aA,fgh;FGH,cCdDeE" Special characters need to be preceded with a backslash. These are @@ -5172,7 +5177,7 @@ A jump table for the options with a short description can be found at |Q_op|. update use |:redraw|. This may occasionally cause display errors. It is only meant to be set temporarily when performing an operation where redrawing may cause - flickering or cause a slow down. + flickering or cause a slowdown. *'linebreak'* *'lbr'* *'nolinebreak'* *'nolbr'* 'linebreak' 'lbr' boolean (default off) @@ -5913,6 +5918,20 @@ A jump table for the options with a short description can be found at |Q_op|. (without "unsigned" it would become "9-2019"). Using CTRL-X on "0" or CTRL-A on "18446744073709551615" (2^64 - 1) has no effect, overflow is prevented. + blank If included, treat numbers as signed or unsigned based on + preceding whitespace. If a number with a leading dash has its + dash immediately preceded by a non-whitespace character (i.e., + not a tab or a " "), the negative sign won't be considered as + part of the number. For example: + Using CTRL-A on "14" in "Carbon-14" results in "Carbon-15" + (without "blank" it would become "Carbon-13"). + Using CTRL-X on "8" in "Carbon -8" results in "Carbon -9" + (because -8 is preceded by whitespace. If "unsigned" was + set, it would result in "Carbon -7"). + If this format is included, overflow is prevented as if + "unsigned" were set. If both this format and "unsigned" are + included, "unsigned" will take precedence. + Numbers which simply begin with a digit in the range 1-9 are always considered decimal. This also happens for numbers that are not recognized as octal or hex. @@ -6160,7 +6179,7 @@ A jump table for the options with a short description can be found at |Q_op|. :set path+= < To use an environment variable, you probably need to replace the separator. Here is an example to append $INCL, in which directory - names are separated with a semi-colon: > + names are separated with a semicolon: > :let &path = &path .. "," .. substitute($INCL, ';', ',', 'g') < Replace the ';' with a ':' or whatever separator is used. Note that this doesn't work when $INCL contains a comma or white space. @@ -6739,7 +6758,7 @@ A jump table for the options with a short description can be found at |Q_op|. import/ files that are found by `:import` indent/ indent scripts |indent-expression| keymap/ key mapping files |mbyte-keymap| - lang/ menu translations |:menutrans| + lang/ message translations |:menutrans| and |multi-lang| menu.vim GUI menus |menu.vim| pack/ packages |:packadd| plugin/ plugin scripts |write-plugin| @@ -7227,7 +7246,7 @@ A jump table for the options with a short description can be found at |Q_op|. POSIX default: "AS") global *E1336* This option helps to avoid all the |hit-enter| prompts caused by file - messages, for example with CTRL-G, and to avoid some other messages. + messages, for example with CTRL-G, and to avoid some other messages. It is a list of flags: flag meaning when present ~ f use "(3 of 5)" instead of "(file 3 of 5)" *shm-f* @@ -7684,7 +7703,7 @@ A jump table for the options with a short description can be found at |Q_op|. minus two. timeout:{millisec} Limit the time searching for suggestions to - {millisec} milli seconds. Applies to the following + {millisec} milliseconds. Applies to the following methods. When omitted the limit is 5000. When negative there is no limit. {only works when built with the |+reltime| feature} @@ -8086,6 +8105,19 @@ A jump table for the options with a short description can be found at |Q_op|. 'S' flag in 'cpoptions'. Only normal file name characters can be used, "/\*?[|<>" are illegal. + *'tabclose'* *'tcl'* +'tabclose' 'tcl' string (default "") + global + This option controls the behavior when closing tab pages (e.g., using + |:tabclose|). When empty Vim goes to the next (right) tab page. + + Possible values (comma-separated list): + left If included, go to the previous tab page instead of + the next one. + uselast If included, go to the previously used tab page if + possible. This option takes precedence over the + others. + *'tabline'* *'tal'* 'tabline' 'tal' string (default empty) global diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 183806a..4351944 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 9.1. Last change: 2024 Jun 03 +*pattern.txt* For Vim version 9.1. Last change: 2024 Jun 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -151,13 +151,17 @@ CTRL-C Interrupt current (search) command. Use CTRL-Break on executing autocommands |autocmd-searchpat|. Same thing for when invoking a user function. + While typing the search pattern the current match will be shown if the 'incsearch' option is on. Remember that you still have to finish the search command with to actually position the cursor at the displayed match. Or use to abandon the search. + *nohlsearch-auto* All matches for the last used search pattern will be highlighted if you set -the 'hlsearch' option. This can be suspended with the |:nohlsearch| command. +the 'hlsearch' option. This can be suspended with the |:nohlsearch| command +or auto suspended with nohlsearch plugin. See |nohlsearch-install|. + When 'shortmess' does not include the "S" flag, Vim will automatically show an index, on which the cursor is. This can look like this: > diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index aeaca0b..a4dee26 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 9.1. Last change: 2024 May 11 +*pi_netrw.txt* For Vim version 9.1. Last change: 2024 Jul 13 ------------------------------------------------ NETRW REFERENCE MANUAL by Charles E. Campbell @@ -15,7 +15,7 @@ Copyright: Copyright (C) 2017 Charles E Campbell *netrw-copyright* merchantability. No guarantees of suitability for any purpose. By using this plugin, you agree that in no event will the copyright holder be liable for any damages resulting from the use of this - software. Use at your own risk! + software. Use at your own risk! For bug reports, see |bugs|. *netrw* *dav* *ftp* *netrw-file* *rcp* *scp* @@ -3859,12 +3859,7 @@ netrw: thereby making it easier to associate which part of the debugging trace is due to which command. - Please send that information to 's maintainer along - with the o/s you're using and the vim version that you're using - (see |:version|) (remove the embedded NOSPAM first) > - - NcampObell@SdrPchip.AorgM-NOSPAM -< + For bug reports, please see |bugs|. ============================================================================== 12. History *netrw-history* {{{1 diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt index 1ad4fb9..b9e992b 100644 --- a/runtime/doc/popup.txt +++ b/runtime/doc/popup.txt @@ -1,4 +1,4 @@ -*popup.txt* For Vim version 9.1. Last change: 2024 Jun 08 +*popup.txt* For Vim version 9.1. Last change: 2024 Jun 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -186,6 +186,7 @@ Manipulating a popup window: |popup_move()| change the position and size of a popup |popup_setoptions()| override options of a popup |popup_settext()| replace the popup buffer contents + |popup_setbuf()| set the buffer for the popup window Closing popup windows: |popup_close()| close one popup @@ -574,6 +575,18 @@ popup_notification({what}, {options}) *popup_notification()* Return type: |Number| +popup_setbuf({id}, {buf}) *popup_setbuf()* + Set buffer {buf} to be displayed in popup win {id}. For the + use of {buf}, see |bufname()| function. + May change window size or position to adjust for the size + of the buffer text. + + Can also be used as a |method|: > + GetPopup()->popup_setbuf(bufnr('foobar')) +< + Return type: |vim9-boolean| + + popup_setoptions({id}, {options}) *popup_setoptions()* Override options in popup {id} with entries in {options}. These options can be set: @@ -613,9 +626,8 @@ popup_setoptions({id}, {options}) *popup_setoptions()* popup_settext({id}, {text}) *popup_settext()* - Set the text of the buffer in popup win {id}. {text} is the - same as supplied to |popup_create()|, except that a buffer - number is not allowed. + Set the text of the buffer in popup win {id}. {text} is + a string or a list of strings to be displayed in the popup. Does not change the window size or position, other than caused by the different text. diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index e2aef24..e44c5d5 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 9.1. Last change: 2024 Jun 16 +*quickfix.txt* For Vim version 9.1. Last change: 2024 Aug 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1006,7 +1006,7 @@ Another option is using 'makeencoding'. ============================================================================== 5. Using :vimgrep and :grep *grep* *lid* -Vim has two ways to find matches for a pattern: Internal and external. The +Vim has two ways to find matches for a pattern: internal and external. The advantage of the internal grep is that it works on all systems and uses the powerful Vim search patterns. An external grep program can be used when the Vim grep does not do what you want. @@ -1035,7 +1035,7 @@ commands can be combined to create a NewGrep command: > command! -nargs=+ NewGrep execute 'silent grep! ' | copen 42 -5.1 using Vim's internal grep +5.1 Using Vim's internal grep *:vim* *:vimgrep* *E682* *E683* :vim[grep][!] /{pattern}/[g][j][f] {file} ... @@ -1092,8 +1092,8 @@ commands can be combined to create a NewGrep command: > :vim[grep][!] {pattern} {file} ... Like above, but instead of enclosing the pattern in a - non-ID character use a white-separated pattern. The - pattern must start with an ID character. + non-ID character use a white space separated pattern. + The pattern must start with an ID character. Example: > :vimgrep Error *.c < @@ -1345,6 +1345,13 @@ Additional arguments can be passed to pandoc: - either by appending them to make, say `:make html --self-contained` . - or setting them in `b:pandoc_compiler_args` or `g:pandoc_compiler_args`. +The `--from` argument is an educated guess using the buffer file type; +it can be overridden by setting `b:pandoc_compiler_from`. +Likewise the `--metadata lang` argument is set using `&spelllang`; +it can be overridden by setting `b:pandoc_compiler_lang`. +If `--from=markdown` is assumed and no title set in a title header or +YAML block, then the filename (without extension) is used as the title. + PERL *quickfix-perl* *compiler-perl* The Perl compiler plugin doesn't actually compile, but invokes Perl's internal @@ -1414,6 +1421,17 @@ shells and OSes and also does not allow to use other available TeX options, if any. If your TeX doesn't support "-interaction=nonstopmode", please report it with different means to express \nonstopmode from the command line. +TYPST COMPILER *compiler-typst* + +Vim includes a compiler plugin for Typst files. This compiler is enabled +automatically in Typst buffers by the Typst filetype plugin |ft-typst-plugin|. +Run |:make| to compile the current Typst file. + + *g:typst_cmd* +By default Vim will use "typst" as the command to run the Typst compiler. This +can be changed by setting the |g:typst_cmd| variable: > + let g:typst_cmd = "/path/to/other/command" + ============================================================================= 7. The error format *error-file-format* diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 517fa30..42b5228 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -935,6 +935,7 @@ Short explanation of each option: *option-list* 'switchbuf' 'swb' sets behavior when switching to another buffer 'synmaxcol' 'smc' maximum column to find syntax items 'syntax' 'syn' syntax to be loaded for current buffer +'tabclose' 'tcl' which tab page to focus when closing a tab 'tabline' 'tal' custom format for the console tab pages line 'tabpagemax' 'tpm' maximum number of tab pages for |-p| and "tab all" 'tabstop' 'ts' number of spaces that in file uses diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index e95b6a1..726aec3 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 9.1. Last change: 2023 May 26 +*repeat.txt* For Vim version 9.1. Last change: 2024 Aug 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -735,6 +735,10 @@ Your directory layout would be like this: start/foobar/autoload/foo.vim " loaded when foo command used start/foobar/doc/foo.txt " help for foo.vim start/foobar/doc/tags " help tags + start/foobar/lang//LC_MESSAGES/foobar.mo + " messages for the plugin in the + " language. These files are + " optional. opt/fooextra/plugin/extra.vim " optional plugin, defines commands opt/fooextra/autoload/extra.vim " loaded when extra command used opt/fooextra/doc/extra.txt " help for extra.vim @@ -744,24 +748,346 @@ This allows for the user to do: > mkdir ~/.vim/pack cd ~/.vim/pack git clone https://github.com/you/foobar.git myfoobar - +< Here "myfoobar" is a name that the user can choose, the only condition is that it differs from other packages. In your documentation you explain what the plugins do, and tell the user how to load the optional plugin: > :packadd! fooextra - +< You could add this packadd command in one of your plugins, to be executed when the optional plugin is needed. + *package-doc* *package-documentation* Run the `:helptags` command to generate the doc/tags file. Including this generated file in the package means that the user can drop the package in the pack directory and the help command works right away. Don't forget to re-run the command after changing the plugin help: > :helptags path/start/foobar/doc :helptags path/opt/fooextra/doc - +< + *package-translation* +In order for a plugin to display translated messages, a few steps are +required. +The author of the plugin who likes to translate messages must define the name +of the package and the location of the directory where the translations can be +found using the |bindtextdomain()| function: > + :call bindtextdomain("foobar", + \ fnamemodify(expand("