patch 8.2.5154: still mentioning version8, some cosmetic issues

Problem:    Still mentioning version8, some cosmetic issues.
Solution:   Prefer mentioning version9, cosmetic improvements.

.github/CODEOWNERS

@@ -53,13 +53,17 @@ runtime/compiler/fbc.vim		@dkearns
 runtime/compiler/gawk.vim		@dkearns
 runtime/compiler/gjs.vim		@dkearns
 runtime/compiler/haml.vim		@tpope
+runtime/compiler/icon.vim		@dkearns
 runtime/compiler/javac.vim		@dkearns
 runtime/compiler/jest.vim		@dkearns
 runtime/compiler/jjs.vim		@dkearns
 runtime/compiler/jshint.vim		@dkearns
 runtime/compiler/jsonlint.vim		@dkearns
 runtime/compiler/lazbuild.vim		@dkearns
+runtime/compiler/perl.vim		@petdance @heptite
+runtime/compiler/perlcritic.vim		@petdance @dkearns
 runtime/compiler/php.vim		@dkearns
+runtime/compiler/podchecker.vim		@petdance @dkearns
 runtime/compiler/powershell.vim		@heaths
 runtime/compiler/rake.vim		@tpope @dkearns
 runtime/compiler/rhino.vim		@dkearns
@@ -111,6 +115,7 @@ runtime/ftplugin/gprof.vim		@dpelle
 runtime/ftplugin/haml.vim		@tpope
 runtime/ftplugin/hgcommit.vim		@k-takata
 runtime/ftplugin/i3config.vim		@hiqua
+runtime/ftplugin/icon.vim		@dkearns
 runtime/ftplugin/indent.vim		@dkearns
 runtime/ftplugin/javascript.vim		@dkearns
 runtime/ftplugin/javascriptreact.vim	@dkearns
@@ -129,7 +134,9 @@ runtime/ftplugin/nsis.vim		@k-takata
 runtime/ftplugin/octave.vim		@dkearns
 runtime/ftplugin/pascal.vim		@dkearns
 runtime/ftplugin/pbtxt.vim		@lakshayg
+runtime/ftplugin/perl.vim		@petdance @dkearns
 runtime/ftplugin/pdf.vim		@tpope
+runtime/ftplugin/pod.vim		@petdance @dkearns
 runtime/ftplugin/postscr.vim		@mrdubya
 runtime/ftplugin/ps1.vim		@heaths
 runtime/ftplugin/ps1xml.vim		@heaths
@@ -141,15 +148,18 @@ runtime/ftplugin/scss.vim		@tpope
 runtime/ftplugin/solution.vim		@dkearns
 runtime/ftplugin/spec.vim		@ignatenkobrain
 runtime/ftplugin/systemverilog.vim	@Kocha
+runtime/ftplugin/tap.vim		@petdance
 runtime/ftplugin/tcsh.vim		@dkearns
 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/wget.vim		@dkearns
 runtime/ftplugin/wget2.vim		@dkearns
 runtime/ftplugin/xml.vim		@chrisbra
+runtime/ftplugin/xs.vim			@petdance
 runtime/ftplugin/zsh.vim		@chrisbra
 runtime/indent/basic.vim		@dkearns
 runtime/indent/bst.vim			@tpope
@@ -178,6 +188,7 @@ runtime/indent/mma.vim			@dkearns
 runtime/indent/nginx.vim		@chr4
 runtime/indent/nsis.vim			@k-takata
 runtime/indent/occam.vim		@dkearns
+runtime/indent/perl.vim			@petdance
 runtime/indent/postscr.vim		@mrdubya
 runtime/indent/prolog.vim		@dkearns
 runtime/indent/ps1.vim			@heaths
@@ -241,6 +252,7 @@ runtime/syntax/haml.vim			@tpope
 runtime/syntax/haskell.vim		@coot
 runtime/syntax/hgcommit.vim		@k-takata
 runtime/syntax/i3config.vim		@hiqua
+runtime/syntax/icon.vim			@dkearns
 runtime/syntax/indent.vim		@dkearns
 runtime/syntax/kconfig.vim		@chrisbra
 runtime/syntax/less.vim			@genoma
@@ -254,6 +266,7 @@ runtime/syntax/mailcap.vim		@dkearns
 runtime/syntax/make.vim			@rohieb
 runtime/syntax/maple.vim		@cecamp
 runtime/syntax/markdown.vim		@tpope
+runtime/syntax/mason.vim		@petdance
 runtime/syntax/meson.vim		@Liambeguin
 runtime/syntax/modula3.vim		@dkearns
 runtime/syntax/netrw.vim		@cecamp
@@ -263,7 +276,9 @@ runtime/syntax/nsis.vim			@k-takata
 runtime/syntax/pascal.vim		@dkearns
 runtime/syntax/pbtxt.vim		@lakshayg
 runtime/syntax/pdf.vim			@tpope
+runtime/syntax/perl.vim			@petdance
 runtime/syntax/php.vim			@TysonAndre
+runtime/syntax/pod.vim			@petdance
 runtime/syntax/postscr.vim		@mrdubya
 runtime/syntax/privoxy.vim		@dkearns
 runtime/syntax/prolog.vim		@XVilka
@@ -287,18 +302,23 @@ runtime/syntax/sshdconfig.vim		@Jakuje
 runtime/syntax/sudoers.vim		@e-kwsm
 runtime/syntax/systemverilog.vim	@Kocha
 runtime/syntax/tags.vim			@cecamp
+runtime/syntax/tap.vim			@petdance
 runtime/syntax/tcsh.vim			@dkearns
 runtime/syntax/teraterm.vim		@k-takata
 runtime/syntax/tex.vim			@cecamp
 runtime/syntax/tidy.vim			@dkearns
 runtime/syntax/tmux.vim			@ericpruitt
 runtime/syntax/toml.vim			@averms
+runtime/syntax/tt2.vim			@petdance
+runtime/syntax/tt2html.vim		@petdance
+runtime/syntax/tt2js.vim		@petdance
 runtime/syntax/vim.vim			@cecamp
 runtime/syntax/wget.vim			@dkearns
 runtime/syntax/wget2.vim		@dkearns
 runtime/syntax/xbl.vim			@dkearns
 runtime/syntax/xmath.vim		@cecamp
 runtime/syntax/xml.vim			@chrisbra
+runtime/syntax/xs.vim			@petdance
 runtime/syntax/xslt.vim			@Boobies
 runtime/syntax/xxd.vim			@cecamp
 runtime/syntax/yacc.vim			@cecamp
@@ -309,8 +329,16 @@ runtime/tutor/tutor.fr			@dpelle
 runtime/tutor/tutor.fr.utf-8		@dpelle
 src/iscygpty.*				@k-takata
 src/libvterm/				@leonerd
+src/po/ca.po				@nfdisco
 src/po/de.po				@chrisbra
 src/po/eo.po				@dpelle
+src/po/es.po				@victorhck
+src/po/fi.po				@flammie
 src/po/fr.po				@dpelle
 src/po/ga.po				@kscanne
+src/po/it.po				@azc100
+src/po/ja.po				@k-takata
+src/po/sr.po				@eevan78
+src/po/tr.po				@bitigchi
+src/po/uk.po				@sakhnik
 src/xxd/				@jnweiger

.github/workflows/ci.yml

@@ -61,7 +61,8 @@ jobs:
             extra: vimtags
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repository from github
+        uses: actions/checkout@v3
 
       - name: Install packages
         run: |
@@ -176,7 +177,7 @@ jobs:
           sudo bash ci/setup-xvfb.sh
 
       - name: Cache snd-dummy
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ env.SND_DUMMY_DIR }}
           key: linux-${{ env.LINUX_VERSION }}-snd-dummy
@@ -295,7 +296,8 @@ jobs:
         features: [tiny, normal, huge]
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repository from github
+        uses: actions/checkout@v3
 
       - name: Install packages
         if: matrix.features == 'huge'
@@ -353,7 +355,7 @@ jobs:
           make ${TEST}
 
   windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     env:
       # Interfaces
@@ -369,6 +371,7 @@ jobs:
       # Python 2
       PYTHON_VER: 27
       PYTHON_VER_DOT: '2.7'
+      PYTHON_DIR: 'C:\Python27'
       # Python 3
       PYTHON3_VER: 310
       PYTHON3_VER_DOT: '3.10'
@@ -421,18 +424,26 @@ jobs:
         run: |
           git config --global core.autocrlf input
           echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
-          python_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON_VER_DOT}/InstallPath/@")
+          if [ "${{ matrix.arch }}" = "x86" ]; then
+            choco install python2 --forcex86
+          else
+            choco install python2
+          fi
           python3_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}${{ matrix.pyreg }}/InstallPath/@")
-          echo "PYTHON_DIR=$python_dir" >> $GITHUB_ENV
           echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV
 
       - uses: msys2/setup-msys2@v2
         if: matrix.toolchain == 'mingw'
         with:
+          update: true
+          install: tar
+          pacboy: >-
+            make:p gcc:p
           msystem: ${{ matrix.msystem }}
           release: false
 
-      - uses: actions/checkout@v3
+      - name: Checkout repository from github
+        uses: actions/checkout@v3
 
       - name: Create a list of download URLs
         shell: cmd
@@ -442,7 +453,7 @@ jobs:
           echo %WINPTY_URL%>> urls.txt
 
       - name: Cache downloaded files
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: downloads
           key: ${{ runner.os }}-${{ matrix.bits }}-${{ hashFiles('urls.txt') }}

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
         # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
 
     steps:
-    - name: Checkout repository
+    - name: Checkout repository from github
       uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.

.github/workflows/coverity.yml

@@ -13,7 +13,8 @@ jobs:
       DEBIAN_FRONTEND: noninteractive
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repository from github
+        uses: actions/checkout@v3
 
       - name: Download Coverity
         run: |

Filelist

@@ -574,7 +574,6 @@ SRC_DOS =	\
 		src/testdir/Make_ming.mak \
 		src/testdir/dos.vim \
 		src/uninstall.c \
-		src/vim.def \
 		src/vim.rc \
 		src/vim.manifest \
 		src/vimrun.c \
@@ -1018,6 +1017,7 @@ LANG_GEN = \
 		runtime/spell/README.txt \
 		runtime/spell/??/*.diff \
 		runtime/spell/??/main.aap \
+		runtime/spell/sr/README_sr.txt \
 		runtime/spell/tet/*.diff \
 		runtime/spell/tet/main.aap \
 		runtime/spell/check/main.aap \

Makefile

@@ -56,7 +56,7 @@ indenttest:
 	cd runtime/indent && \
 		$(MAKE) clean && \
 		$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
-		
+
 
 #########################################################################
 # 2. Creating the various distribution files.
@@ -93,8 +93,7 @@ MINOR = 2
 #   READMEdir/Contents, MAJOR/MINOR above, VIMMAJOR and VIMMINOR in
 #   src/Makefile, README.txt, README.md, src/README.md, READMEdir/README*.txt,
 #   runtime/doc/*.txt and make nsis/gvim_version.nsh.
-#   For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.def,
-#   src/vim.manifest.
+#   For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.manifest.
 # - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, Lua, Cscope and
 #   "huge" features.  Add MZscheme if you can make it work.
 #   Use "make reconfig" after selecting the configure arguments.

runtime/autoload/dist/man.vim

@@ -0,0 +1,196 @@
+" Vim filetype plugin autoload file
+" Language:	man
+" Maintainer:	Jason Franklin <vim@justemail.net>
+" Maintainer:	SungHyun Nam <goweol@gmail.com>
+" Autoload Split: Bram Moolenaar
+" Last Change: 	2022 Jun 18
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+let s:man_tag_depth = 0
+
+let s:man_sect_arg = ""
+let s:man_find_arg = "-w"
+try
+  if !has("win32") && $OSTYPE !~ 'cygwin\|linux' && system('uname -s') =~ "SunOS" && system('uname -r') =~ "^5"
+    let s:man_sect_arg = "-s"
+    let s:man_find_arg = "-l"
+  endif
+catch /E145:/
+  " Ignore the error in restricted mode
+endtry
+
+func dist#man#PreGetPage(cnt)
+  if a:cnt == 0
+    let old_isk = &iskeyword
+    if &ft == 'man'
+      setl iskeyword+=(,)
+    endif
+    let str = expand("<cword>")
+    let &l:iskeyword = old_isk
+    let page = substitute(str, '(*\(\k\+\).*', '\1', '')
+    let sect = substitute(str, '\(\k\+\)(\([^()]*\)).*', '\2', '')
+    if match(sect, '^[0-9 ]\+$') == -1
+      let sect = ""
+    endif
+    if sect == page
+      let sect = ""
+    endif
+  else
+    let sect = a:cnt
+    let page = expand("<cword>")
+  endif
+  call dist#man#GetPage('', sect, page)
+endfunc
+
+func s:GetCmdArg(sect, page)
+
+  if empty(a:sect)
+    return shellescape(a:page)
+  endif
+
+  return s:man_sect_arg . ' ' . shellescape(a:sect) . ' ' . shellescape(a:page)
+endfunc
+
+func s:FindPage(sect, page)
+  let l:cmd = printf('man %s %s', s:man_find_arg, s:GetCmdArg(a:sect, a:page))
+  call system(l:cmd)
+
+  if v:shell_error
+    return 0
+  endif
+
+  return 1
+endfunc
+
+func dist#man#GetPage(cmdmods, ...)
+  if a:0 >= 2
+    let sect = a:1
+    let page = a:2
+  elseif a:0 >= 1
+    let sect = ""
+    let page = a:1
+  else
+    return
+  endif
+
+  " To support:	    nmap K :Man <cword>
+  if page == '<cword>'
+    let page = expand('<cword>')
+  endif
+
+  if !exists('g:ft_man_no_sect_fallback') || (g:ft_man_no_sect_fallback == 0)
+    if sect != "" && s:FindPage(sect, page) == 0
+      let sect = ""
+    endif
+  endif
+  if s:FindPage(sect, page) == 0
+    let msg = 'man.vim: no manual entry for "' . page . '"'
+    if !empty(sect)
+      let msg .= ' in section ' . sect
+    endif
+    echomsg msg
+    return
+  endif
+  exec "let s:man_tag_buf_".s:man_tag_depth." = ".bufnr("%")
+  exec "let s:man_tag_lin_".s:man_tag_depth." = ".line(".")
+  exec "let s:man_tag_col_".s:man_tag_depth." = ".col(".")
+  let s:man_tag_depth = s:man_tag_depth + 1
+
+  let open_cmd = 'edit'
+
+  " Use an existing "man" window if it exists, otherwise open a new one.
+  if &filetype != "man"
+    let thiswin = winnr()
+    exe "norm! \<C-W>b"
+    if winnr() > 1
+      exe "norm! " . thiswin . "\<C-W>w"
+      while 1
+	if &filetype == "man"
+	  break
+	endif
+	exe "norm! \<C-W>w"
+	if thiswin == winnr()
+	  break
+	endif
+      endwhile
+    endif
+    if &filetype != "man"
+      if exists("g:ft_man_open_mode")
+        if g:ft_man_open_mode == 'vert'
+	  let open_cmd = 'vsplit'
+        elseif g:ft_man_open_mode == 'tab'
+	  let open_cmd = 'tabedit'
+        else
+	  let open_cmd = 'split'
+        endif
+      else
+	let open_cmd = a:cmdmods . ' split'
+      endif
+    endif
+  endif
+
+  silent execute open_cmd . " $HOME/" . page . '.' . sect . '~'
+
+  " Avoid warning for editing the dummy file twice
+  setl buftype=nofile noswapfile
+
+  setl fdc=0 ma nofen nonu nornu
+  %delete _
+  let unsetwidth = 0
+  if empty($MANWIDTH)
+    let $MANWIDTH = winwidth(0)
+    let unsetwidth = 1
+  endif
+
+  " Ensure Vim is not recursively invoked (man-db does this) when doing ctrl-[
+  " on a man page reference by unsetting MANPAGER.
+  " Some versions of env(1) do not support the '-u' option, and in such case
+  " we set MANPAGER=cat.
+  if !exists('s:env_has_u')
+    call system('env -u x true')
+    let s:env_has_u = (v:shell_error == 0)
+  endif
+  let env_cmd = s:env_has_u ? 'env -u MANPAGER' : 'env MANPAGER=cat'
+  let env_cmd .= ' GROFF_NO_SGR=1'
+  let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page) . ' | col -b'
+  silent exec "r !" . man_cmd
+
+  if unsetwidth
+    let $MANWIDTH = ''
+  endif
+  " Remove blank lines from top and bottom.
+  while line('$') > 1 && getline(1) =~ '^\s*$'
+    1delete _
+  endwhile
+  while line('$') > 1 && getline('$') =~ '^\s*$'
+    $delete _
+  endwhile
+  1
+  setl ft=man nomod
+  setl bufhidden=hide
+  setl nobuflisted
+  setl noma
+endfunc
+
+func dist#man#PopPage()
+  if s:man_tag_depth > 0
+    let s:man_tag_depth = s:man_tag_depth - 1
+    exec "let s:man_tag_buf=s:man_tag_buf_".s:man_tag_depth
+    exec "let s:man_tag_lin=s:man_tag_lin_".s:man_tag_depth
+    exec "let s:man_tag_col=s:man_tag_col_".s:man_tag_depth
+    exec s:man_tag_buf."b"
+    exec s:man_tag_lin
+    exec "norm! ".s:man_tag_col."|"
+    exec "unlet s:man_tag_buf_".s:man_tag_depth
+    exec "unlet s:man_tag_lin_".s:man_tag_depth
+    exec "unlet s:man_tag_col_".s:man_tag_depth
+    unlet s:man_tag_buf s:man_tag_lin s:man_tag_col
+  endif
+endfunc
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: set sw=2 ts=8 noet:

runtime/autoload/dist/script.vim

@@ -189,6 +189,10 @@ def DetectFromHashBang(firstline: string)
   elseif name =~ 'gforth\>'
     set ft=forth
 
+    # Icon
+  elseif name =~ 'icon\>'
+    set ft=icon
+
   endif
 enddef
 

runtime/colors/blue.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:33 2022
+" Last Updated: Sat 11 Jun 2022 11:16:14 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -27,7 +27,7 @@ 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 Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#005faf gui=NONE cterm=NONE
-hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
+hi CursorIM guifg=#000000 guibg=#ffdf00 gui=NONE cterm=NONE
 hi CursorLineNr guifg=#ffdf00 guibg=#005faf gui=bold cterm=NONE
 hi EndOfBuffer guifg=#ffdf00 guibg=#000087 gui=NONE cterm=NONE
 hi Error guifg=#ff7f50 guibg=#000087 gui=reverse cterm=reverse
@@ -52,11 +52,6 @@ hi SpellLocal guifg=#ffffff guibg=NONE guisp=#ffffff gui=undercurl cterm=underli
 hi SpellRare guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline
 hi StatusLine guifg=#000087 guibg=#5fffff gui=NONE cterm=NONE
 hi StatusLineNC guifg=#000087 guibg=#008787 gui=NONE cterm=NONE
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
-hi! link TabLine StatusLineNC
-hi! link TabLineFill StatusLineNC
-hi! link TabLineSel StatusLine
 hi ToolbarButton guifg=#ffffff guibg=#005faf gui=NONE cterm=NONE
 hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi VertSplit guifg=#008787 guibg=NONE gui=NONE cterm=NONE
@@ -66,6 +61,19 @@ hi WarningMsg guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
 hi WildMenu guifg=#000087 guibg=#ffdf00 gui=NONE cterm=NONE
 hi debugBreakpoint guifg=#00ff00 guibg=#000087 gui=reverse cterm=reverse
 hi debugPC guifg=#5fffff guibg=#000087 gui=reverse cterm=reverse
+hi Directory guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
+hi Title guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
+hi Comment guifg=#878787 guibg=NONE gui=bold cterm=NONE
+hi Constant guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
+hi Identifier guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
+hi Ignore guifg=#878787 guibg=NONE gui=NONE cterm=NONE
+hi PreProc guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
+hi Special guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
+hi Statement guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
+hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+hi Type guifg=#ffa500 guibg=NONE gui=bold cterm=NONE
+hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+hi Label guifg=#ffdf00 guibg=NONE gui=NONE cterm=NONE
 hi! link Terminal Normal
 hi! link Debug Special
 hi! link diffAdded String
@@ -81,21 +89,14 @@ hi! link lCursor Cursor
 hi! link LineNrAbove LineNr
 hi! link LineNrBelow LineNr
 hi! link CurSearch Search
+hi! link CursorLineNr CursorLine
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
-hi Directory guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
-hi Comment guifg=#878787 guibg=NONE gui=bold cterm=NONE
-hi Constant guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#878787 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi Type guifg=#ffa500 guibg=NONE gui=bold cterm=NONE
-hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi Label guifg=#ffdf00 guibg=NONE gui=NONE cterm=NONE
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link TabLine StatusLineNC
+hi! link TabLineFill StatusLineNC
+hi! link TabLineSel StatusLine
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
@@ -134,7 +135,7 @@ if s:t_Co >= 256
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=25 cterm=NONE
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
+  hi CursorIM ctermfg=16 ctermbg=220 cterm=NONE
   hi CursorLineNr ctermfg=220 ctermbg=25 cterm=NONE
   hi EndOfBuffer ctermfg=220 ctermbg=18 cterm=NONE
   hi Error ctermfg=209 ctermbg=18 cterm=reverse
@@ -159,11 +160,6 @@ if s:t_Co >= 256
   hi SpellRare ctermfg=176 ctermbg=NONE cterm=underline
   hi StatusLine ctermfg=18 ctermbg=87 cterm=NONE
   hi StatusLineNC ctermfg=18 ctermbg=30 cterm=NONE
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
   hi ToolbarButton ctermfg=231 ctermbg=25 cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
   hi VertSplit ctermfg=30 ctermbg=NONE cterm=NONE
@@ -173,6 +169,19 @@ if s:t_Co >= 256
   hi WildMenu ctermfg=18 ctermbg=220 cterm=NONE
   hi debugBreakpoint ctermfg=46 ctermbg=18 cterm=reverse
   hi debugPC ctermfg=87 ctermbg=18 cterm=reverse
+  hi Directory ctermfg=87 ctermbg=NONE cterm=NONE
+  hi Title ctermfg=176 ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=102 ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=87 ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=250 ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=102 ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=46 ctermbg=NONE cterm=NONE
+  hi Special ctermfg=176 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=231 ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=214 ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Label ctermfg=220 ctermbg=NONE cterm=NONE
   hi! link Terminal Normal
   hi! link Debug Special
   hi! link diffAdded String
@@ -188,21 +197,14 @@ if s:t_Co >= 256
   hi! link LineNrAbove LineNr
   hi! link LineNrBelow LineNr
   hi! link CurSearch Search
+  hi! link CursorLineNr CursorLine
   hi! link CursorLineFold CursorLine
   hi! link CursorLineSign CursorLine
-  hi Directory ctermfg=87 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=176 ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=102 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=87 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=250 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=102 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=176 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=231 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Label ctermfg=220 ctermbg=NONE cterm=NONE
+  hi! link StatusLineTerm StatusLine
+  hi! link StatusLineTermNC StatusLineNC
+  hi! link TabLine StatusLineNC
+  hi! link TabLineFill StatusLineNC
+  hi! link TabLineSel StatusLine
   hi! link Boolean Constant
   hi! link Character Constant
   hi! link Conditional Statement
@@ -244,7 +246,7 @@ if s:t_Co >= 16
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
+  hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
   hi CursorLineNr ctermfg=yellow ctermbg=blue cterm=NONE
   hi EndOfBuffer ctermfg=yellow ctermbg=darkblue cterm=NONE
   hi Error ctermfg=red ctermbg=darkblue cterm=reverse
@@ -269,11 +271,6 @@ if s:t_Co >= 16
   hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
   hi StatusLine ctermfg=darkblue ctermbg=cyan cterm=NONE
   hi StatusLineNC ctermfg=darkblue ctermbg=darkcyan cterm=NONE
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
   hi ToolbarButton ctermfg=white ctermbg=blue cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
   hi VertSplit ctermfg=darkcyan ctermbg=NONE cterm=NONE
@@ -283,6 +280,19 @@ if s:t_Co >= 16
   hi WildMenu ctermfg=darkblue ctermbg=yellow cterm=NONE
   hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
   hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=white ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
   hi! link Terminal Normal
   hi! link Debug Special
   hi! link diffAdded String
@@ -298,21 +308,14 @@ if s:t_Co >= 16
   hi! link LineNrAbove LineNr
   hi! link LineNrBelow LineNr
   hi! link CurSearch Search
+  hi! link CursorLineNr CursorLine
   hi! link CursorLineFold CursorLine
   hi! link CursorLineSign CursorLine
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
-  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=white ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi! link StatusLineTerm StatusLine
+  hi! link StatusLineTermNC StatusLineNC
+  hi! link TabLine StatusLineNC
+  hi! link TabLineFill StatusLineNC
+  hi! link TabLineSel StatusLine
   hi! link Boolean Constant
   hi! link Character Constant
   hi! link Conditional Statement
@@ -344,6 +347,116 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=darkyellow ctermbg=blue cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Pmenu ctermfg=black ctermbg=cyan cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=magenta cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=green cterm=NONE
+  hi CursorColumn ctermfg=blue ctermbg=yellow cterm=bold,reverse
+  hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
+  hi EndOfBuffer ctermfg=yellow ctermbg=blue cterm=NONE
+  hi Error ctermfg=red ctermbg=blue cterm=reverse
+  hi ErrorMsg ctermfg=gray ctermbg=red cterm=NONE
+  hi FoldColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=blue ctermbg=yellow cterm=NONE
+  hi IncSearch ctermfg=magenta ctermbg=black cterm=reverse
+  hi LineNr ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ModeMsg ctermfg=blue ctermbg=green cterm=NONE
+  hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi Search ctermfg=yellow ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=red ctermbg=yellow cterm=reverse
+  hi SpellCap ctermfg=green ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=gray ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=magenta ctermbg=yellow cterm=reverse
+  hi StatusLine ctermfg=cyan ctermbg=blue cterm=bold,reverse
+  hi StatusLineNC ctermfg=blue ctermbg=cyan cterm=NONE
+  hi ToolbarButton ctermfg=blue ctermbg=gray cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=black ctermbg=cyan cterm=NONE
+  hi VisualNOS ctermfg=cyan ctermbg=gray cterm=NONE
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=blue ctermbg=yellow cterm=NONE
+  hi debugBreakpoint ctermfg=green ctermbg=blue cterm=reverse
+  hi debugPC ctermfg=cyan ctermbg=blue cterm=reverse
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=black ctermbg=NONE cterm=bold
+  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=red ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi! link Terminal Normal
+  hi! link Debug Special
+  hi! link diffAdded String
+  hi! link diffRemoved WarningMsg
+  hi! link diffOnly WarningMsg
+  hi! link diffNoEOL WarningMsg
+  hi! link diffIsA WarningMsg
+  hi! link diffIdentical WarningMsg
+  hi! link diffDiffer WarningMsg
+  hi! link diffCommon WarningMsg
+  hi! link diffBDiffer WarningMsg
+  hi! link lCursor Cursor
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link CurSearch Search
+  hi! link CursorLineNr CursorLine
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineSign CursorLine
+  hi! link StatusLineTerm StatusLine
+  hi! link StatusLineTermNC StatusLineNC
+  hi! link TabLine StatusLineNC
+  hi! link TabLineFill StatusLineNC
+  hi! link TabLineSel StatusLine
+  hi! link Boolean Constant
+  hi! link Character Constant
+  hi! link Conditional Statement
+  hi! link Define PreProc
+  hi! link Delimiter Special
+  hi! link Exception Statement
+  hi! link Float Constant
+  hi! link Function Identifier
+  hi! link Include PreProc
+  hi! link Keyword Statement
+  hi! link Macro PreProc
+  hi! link Number Constant
+  hi! link Operator Type
+  hi! link PreCondit PreProc
+  hi! link Repeat Statement
+  hi! link SpecialChar Special
+  hi! link SpecialComment Special
+  hi! link StorageClass Type
+  hi! link String Constant
+  hi! link Structure Type
+  hi! link Tag Special
+  hi! link Typedef Type
+  hi! link Terminal Normal
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -444,4 +557,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/darkblue.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original author Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:33 2022
+" Last Updated: Sat 11 Jun 2022 14:37:41 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -18,88 +18,18 @@ let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#000000', '#8b0000', '#90f020', '#ffa500', '#00008b', '#8b008b', '#008b8b', '#c0c0c0', '#808080', '#ffa0a0', '#90f020', '#ffff60', '#0030ff', '#ff00ff', '#90fff0', '#ffffff']
 endif
-hi Normal guifg=#c0c0c0 guibg=#000040 gui=NONE cterm=NONE
 hi! link Terminal Normal
-hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ColorColumn guifg=#c0c0c0 guibg=#8b0000 gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#ffff60 gui=NONE cterm=NONE
 hi! link CursorColumn CursorLine
 hi! link CursorIM Cursor
-hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff60 guibg=#666666 gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#ff80ff gui=NONE cterm=NONE
-hi DiffAdd guifg=NONE guibg=#0030ff gui=NONE cterm=NONE
-hi DiffChange guifg=NONE guibg=#404080 gui=NONE cterm=NONE
-hi DiffDelete guifg=#000040 guibg=#008b8b gui=NONE cterm=NONE
-hi DiffText guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
 hi! link EndOfBuffer NonText
-hi Error guifg=#ffa0a0 guibg=NONE gui=reverse cterm=reverse
 hi! link ErrorMsg Error
-hi FoldColumn guifg=#808080 guibg=NONE gui=bold cterm=NONE
-hi Folded guifg=#808080 guibg=NONE gui=bold cterm=NONE
-hi IncSearch guifg=#ffffff guibg=#0030ff gui=reverse cterm=reverse
-hi LineNr guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
 hi! link LineNrAbove LineNr
 hi! link LineNrBelow LineNr
-hi MatchParen guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi ModeMsg guifg=#90fff0 guibg=NONE gui=NONE cterm=NONE
-hi MoreMsg guifg=#006400 guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#0030ff guibg=NONE gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#0030ff gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=#0030ff guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi Question guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
-hi Search guifg=#90fff0 guibg=#0030ff gui=NONE cterm=NONE
-hi SignColumn guifg=#808080 guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#90f020 guibg=NONE guisp=#90f020 gui=undercurl cterm=underline
-hi SpellLocal guifg=#90fff0 guibg=NONE guisp=#90fff0 gui=undercurl cterm=underline
-hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi StatusLine guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
-hi StatusLineNC guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
-hi TabLine guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
-hi! link TabLineFill TabLine
-hi TabLineSel guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#0030ff gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi VertSplit guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
-hi Visual guifg=#8080ff guibg=#ffffff gui=reverse cterm=reverse
-hi VisualNOS guifg=#8080ff guibg=#c0c0c0 gui=reverse,underline cterm=reverse,underline
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#ffff60 guibg=#000000 gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#90f020 guibg=#00008b gui=reverse cterm=reverse
-hi debugPC guifg=#90fff0 guibg=#00008b gui=reverse cterm=reverse
-hi! link Terminal Normal
-hi! link Debug Special
-hi! link diffAdded String
-hi! link diffRemoved WarningMsg
-hi! link diffOnly WarningMsg
-hi! link diffNoEOL WarningMsg
-hi! link diffIsA WarningMsg
-hi! link diffIdentical WarningMsg
-hi! link diffDiffer WarningMsg
-hi! link diffCommon WarningMsg
-hi! link diffBDiffer WarningMsg
-hi! link lCursor Cursor
-hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
-hi Directory guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
-hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#90fff0 guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
-hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffff60 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi Type guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
+hi! link TabLineFill TabLine
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
@@ -123,68 +53,112 @@ hi! link String Constant
 hi! link Structure Type
 hi! link Tag Special
 hi! link Typedef Type
+hi! link Debug Special
+hi! link diffAdded String
+hi! link diffRemoved WarningMsg
+hi! link diffOnly WarningMsg
+hi! link diffNoEOL WarningMsg
+hi! link diffIsA WarningMsg
+hi! link diffIdentical WarningMsg
+hi! link diffDiffer WarningMsg
+hi! link diffCommon WarningMsg
+hi! link diffBDiffer WarningMsg
+hi! link lCursor Cursor
+hi! link CurSearch Search
+hi Normal guifg=#c0c0c0 guibg=#000040 gui=NONE cterm=NONE
+hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi ColorColumn guifg=#c0c0c0 guibg=#8b0000 gui=NONE cterm=NONE
+hi Cursor guifg=#000000 guibg=#ffff60 gui=NONE cterm=NONE
+hi QuickFixLine guifg=#000000 guibg=#ff80ff gui=NONE cterm=NONE
+hi Error guifg=#ffa0a0 guibg=NONE gui=reverse cterm=reverse
+hi FoldColumn guifg=#808080 guibg=NONE gui=bold cterm=NONE
+hi Folded guifg=#808080 guibg=NONE gui=bold cterm=NONE
+hi IncSearch guifg=#ffffff guibg=#0030ff gui=reverse cterm=reverse
+hi LineNr guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
+hi MatchParen guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+hi ModeMsg guifg=#90fff0 guibg=NONE gui=NONE cterm=NONE
+hi MoreMsg guifg=#006400 guibg=NONE gui=NONE cterm=NONE
+hi NonText guifg=#0030ff guibg=NONE gui=NONE cterm=NONE
+hi Pmenu guifg=#ffffff guibg=#0030ff gui=NONE cterm=NONE
+hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi PmenuSel guifg=#0030ff guibg=#ffffff gui=NONE cterm=NONE
+hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
+hi Question guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
+hi SignColumn guifg=#808080 guibg=NONE gui=NONE cterm=NONE
+hi SpecialKey guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
+hi SpellCap guifg=#90f020 guibg=NONE guisp=#90f020 gui=undercurl cterm=underline
+hi SpellLocal guifg=#90fff0 guibg=NONE guisp=#90fff0 gui=undercurl cterm=underline
+hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
+hi StatusLine guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
+hi StatusLineNC guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
+hi TabLine guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
+hi ToolbarButton guifg=#ffffff guibg=#0030ff gui=NONE cterm=NONE
+hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi VertSplit guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
+hi Visual guifg=#8080ff guibg=#ffffff gui=reverse cterm=reverse
+hi VisualNOS guifg=#8080ff guibg=#c0c0c0 gui=reverse,underline cterm=reverse,underline
+hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
+hi WildMenu guifg=#ffff60 guibg=#000000 gui=NONE cterm=NONE
+hi debugBreakpoint guifg=#90f020 guibg=#00008b gui=reverse cterm=reverse
+hi debugPC guifg=#90fff0 guibg=#00008b gui=reverse cterm=reverse
+hi Directory guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
+hi Title guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
+hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
+hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
+hi Identifier guifg=#90fff0 guibg=NONE gui=NONE cterm=NONE
+hi Ignore guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
+hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
+hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
+hi Statement guifg=#ffff60 guibg=NONE gui=NONE cterm=NONE
+hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+hi Type guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
+hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
+hi TabLineSel guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
+hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
+hi CursorLineNr guifg=#ffff60 guibg=#666666 gui=NONE cterm=NONE
+hi Search guifg=#90fff0 guibg=#0030ff gui=NONE cterm=NONE
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
-  hi Normal ctermfg=252 ctermbg=17 cterm=NONE
   hi! link Terminal Normal
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ColorColumn ctermfg=252 ctermbg=88 cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=227 cterm=NONE
   hi! link CursorColumn CursorLine
   hi! link CursorIM Cursor
-  hi CursorLine ctermfg=NONE ctermbg=59 cterm=NONE
-  hi CursorLineNr ctermfg=227 ctermbg=59 cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=213 cterm=NONE
-  hi DiffAdd ctermfg=NONE ctermbg=27 cterm=NONE
-  hi DiffChange ctermfg=NONE ctermbg=61 cterm=NONE
-  hi DiffDelete ctermfg=17 ctermbg=30 cterm=NONE
-  hi DiffText ctermfg=NONE ctermbg=30 cterm=NONE
   hi! link EndOfBuffer NonText
-  hi Error ctermfg=217 ctermbg=NONE cterm=reverse
   hi! link ErrorMsg Error
-  hi FoldColumn ctermfg=102 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=102 ctermbg=NONE cterm=NONE
-  hi IncSearch ctermfg=231 ctermbg=27 cterm=reverse
-  hi LineNr ctermfg=118 ctermbg=NONE cterm=NONE
   hi! link LineNrAbove LineNr
   hi! link LineNrBelow LineNr
-  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ModeMsg ctermfg=123 ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=22 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=27 ctermbg=NONE cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=27 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=27 ctermbg=231 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi Question ctermfg=118 ctermbg=NONE cterm=NONE
-  hi Search ctermfg=123 ctermbg=27 cterm=NONE
-  hi SignColumn ctermfg=102 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=30 ctermbg=NONE cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=118 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=123 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=17 ctermbg=252 cterm=NONE
-  hi StatusLineNC ctermfg=16 ctermbg=102 cterm=NONE
   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
-  hi TabLine ctermfg=16 ctermbg=102 cterm=NONE
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineSign CursorLine
   hi! link TabLineFill TabLine
-  hi TabLineSel ctermfg=17 ctermbg=252 cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=27 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=16 ctermbg=102 cterm=NONE
-  hi Visual ctermfg=105 ctermbg=231 cterm=reverse
-  hi VisualNOS ctermfg=105 ctermbg=252 cterm=reverse,underline
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=227 ctermbg=16 cterm=NONE
-  hi debugBreakpoint ctermfg=118 ctermbg=18 cterm=reverse
-  hi debugPC ctermfg=123 ctermbg=18 cterm=reverse
-  hi! link Terminal Normal
+  hi! link Boolean Constant
+  hi! link Character Constant
+  hi! link Conditional Statement
+  hi! link Define PreProc
+  hi! link Delimiter Special
+  hi! link Exception Statement
+  hi! link Float Constant
+  hi! link Function Identifier
+  hi! link Include PreProc
+  hi! link Keyword Statement
+  hi! link Label Statement
+  hi! link Macro PreProc
+  hi! link Number Constant
+  hi! link Operator Statement
+  hi! link PreCondit PreProc
+  hi! link Repeat Statement
+  hi! link SpecialChar Special
+  hi! link SpecialComment Special
+  hi! link StorageClass Type
+  hi! link String Constant
+  hi! link Structure Type
+  hi! link Tag Special
+  hi! link Typedef Type
   hi! link Debug Special
   hi! link diffAdded String
   hi! link diffRemoved WarningMsg
@@ -197,8 +171,43 @@ if s:t_Co >= 256
   hi! link diffBDiffer WarningMsg
   hi! link lCursor Cursor
   hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Normal ctermfg=252 ctermbg=17 cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=252 ctermbg=88 cterm=NONE
+  hi Cursor ctermfg=16 ctermbg=227 cterm=NONE
+  hi QuickFixLine ctermfg=16 ctermbg=213 cterm=NONE
+  hi Error ctermfg=217 ctermbg=NONE cterm=reverse
+  hi FoldColumn ctermfg=102 ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=102 ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=231 ctermbg=27 cterm=reverse
+  hi LineNr ctermfg=118 ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ModeMsg ctermfg=123 ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=22 ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=27 ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=231 ctermbg=27 cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=27 ctermbg=231 cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
+  hi Question ctermfg=118 ctermbg=NONE cterm=NONE
+  hi SignColumn ctermfg=102 ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=30 ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=118 ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=123 ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=17 ctermbg=252 cterm=NONE
+  hi StatusLineNC ctermfg=16 ctermbg=102 cterm=NONE
+  hi TabLine ctermfg=16 ctermbg=102 cterm=NONE
+  hi ToolbarButton ctermfg=231 ctermbg=27 cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit ctermfg=16 ctermbg=102 cterm=NONE
+  hi Visual ctermfg=105 ctermbg=231 cterm=reverse
+  hi VisualNOS ctermfg=105 ctermbg=252 cterm=reverse,underline
+  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=227 ctermbg=16 cterm=NONE
+  hi debugBreakpoint ctermfg=118 ctermbg=18 cterm=reverse
+  hi debugPC ctermfg=123 ctermbg=18 cterm=reverse
   hi Directory ctermfg=30 ctermbg=NONE cterm=NONE
   hi Title ctermfg=201 ctermbg=NONE cterm=NONE
   hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
@@ -211,29 +220,10 @@ if s:t_Co >= 256
   hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi Type ctermfg=118 ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Label Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Statement
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
+  hi TabLineSel ctermfg=17 ctermbg=252 cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=59 cterm=NONE
+  hi CursorLineNr ctermfg=227 ctermbg=59 cterm=NONE
+  hi Search ctermfg=123 ctermbg=27 cterm=NONE
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -244,28 +234,15 @@ endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi! link Terminal Normal
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
   hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
-  hi! link CursorColumn CursorLine
-  hi! link CursorIM Cursor
-  hi CursorLine ctermfg=NONE ctermbg=darkgrey cterm=NONE
-  hi CursorLineNr ctermfg=yellow ctermbg=darkgrey cterm=NONE
   hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
-  hi DiffAdd ctermfg=NONE ctermbg=blue cterm=NONE
-  hi DiffChange ctermfg=NONE ctermbg=darkblue cterm=NONE
-  hi DiffDelete ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi DiffText ctermfg=NONE ctermbg=darkcyan cterm=NONE
-  hi! link EndOfBuffer NonText
   hi Error ctermfg=red ctermbg=NONE cterm=reverse
-  hi! link ErrorMsg Error
   hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=white ctermbg=blue cterm=reverse
   hi LineNr ctermfg=green ctermbg=NONE cterm=NONE
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ModeMsg ctermfg=cyan ctermbg=NONE cterm=NONE
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
@@ -275,7 +252,6 @@ if s:t_Co >= 16
   hi PmenuSel ctermfg=blue ctermbg=white cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
-  hi Search ctermfg=cyan ctermbg=blue cterm=NONE
   hi SignColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
@@ -284,11 +260,7 @@ if s:t_Co >= 16
   hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=underline
   hi StatusLine ctermfg=black ctermbg=grey cterm=NONE
   hi StatusLineNC ctermfg=black ctermbg=darkgrey cterm=NONE
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
   hi TabLine ctermfg=black ctermbg=darkgrey cterm=NONE
-  hi! link TabLineFill TabLine
-  hi TabLineSel ctermfg=black ctermbg=grey cterm=NONE
   hi ToolbarButton ctermfg=white ctermbg=blue cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
   hi VertSplit ctermfg=black ctermbg=darkgrey cterm=NONE
@@ -298,21 +270,6 @@ if s:t_Co >= 16
   hi WildMenu ctermfg=yellow ctermbg=black cterm=NONE
   hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
   hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
-  hi! link Terminal Normal
-  hi! link Debug Special
-  hi! link diffAdded String
-  hi! link diffRemoved WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
   hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
@@ -325,29 +282,6 @@ if s:t_Co >= 16
   hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi Type ctermfg=green ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Label Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Statement
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
   hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
@@ -360,6 +294,67 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=grey ctermbg=black cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=grey ctermbg=darkmagenta cterm=NONE
+  hi Error ctermfg=darkred ctermbg=grey cterm=reverse
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold,reverse
+  hi IncSearch ctermfg=grey ctermbg=darkblue cterm=reverse
+  hi LineNr ctermfg=green ctermbg=NONE cterm=bold
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ModeMsg ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=grey ctermbg=blue cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=blue ctermbg=grey cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Search ctermfg=darkcyan ctermbg=blue cterm=NONE
+  hi SignColumn ctermfg=grey ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi StatusLine ctermfg=darkblue ctermbg=grey cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi TabLine ctermfg=grey ctermbg=black cterm=reverse
+  hi TabLineSel ctermfg=darkblue ctermbg=grey cterm=bold,reverse
+  hi ToolbarButton ctermfg=darkblue ctermbg=grey cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=blue ctermbg=grey cterm=reverse
+  hi VisualNOS ctermfg=blue ctermbg=grey cterm=reverse,underline
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=yellow ctermbg=black cterm=NONE
+  hi debugBreakpoint ctermfg=darkgreen ctermbg=darkblue cterm=reverse
+  hi debugPC ctermfg=darkcyan ctermbg=darkblue cterm=reverse
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -466,4 +461,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/delek.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer David Schweikert <david@schweikert.ch>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:34 2022
+" Last Updated: Sun Jun 12 10:50:30 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -18,11 +18,18 @@ let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#ffffff', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#bcbcbc', '#ee0000', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#000000']
 endif
+hi! link Terminal Normal
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
+hi! link ErrorMsg Error
 hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi StatusLine guifg=#ffff00 guibg=#00008b gui=bold cterm=NONE
+hi StatusLine guifg=#ffff00 guibg=#00008b gui=bold cterm=bold
 hi StatusLineNC guifg=#ffd700 guibg=#00008b gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#ffff00 guibg=#0000ff gui=bold cterm=NONE
+hi StatusLineTerm guifg=#ffff00 guibg=#0000ff gui=bold cterm=bold
 hi StatusLineTermNC guifg=#e4e4e4 guibg=#0000ff gui=NONE cterm=NONE
 hi VertSplit guifg=#e4e4e4 guibg=#00008b gui=NONE cterm=NONE
 hi Pmenu guifg=#000000 guibg=#add8e6 gui=NONE cterm=NONE
@@ -31,9 +38,9 @@ hi PmenuSbar guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#008b8b 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=NONE
+hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold
 hi ToolbarLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#bcbcbc gui=bold cterm=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 Folded guifg=#00008b guibg=#e4e4e4 gui=NONE cterm=NONE
@@ -42,21 +49,20 @@ hi VisualNOS guifg=NONE guibg=#ee0000 gui=NONE cterm=NONE
 hi LineNr guifg=#a52a2a guibg=NONE gui=NONE cterm=NONE
 hi FoldColumn guifg=#00008b guibg=NONE gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=NONE
+hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=bold
 hi QuickFixLine guifg=#ffffff guibg=#008b8b gui=NONE cterm=NONE
 hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Underlined guifg=#6a5acd guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi! link ErrorMsg Error
 hi WarningMsg guifg=#cd00cd guibg=#ffffff gui=NONE cterm=NONE
-hi MoreMsg guifg=#000000 guibg=#ffffff gui=bold cterm=NONE
-hi ModeMsg guifg=#000000 guibg=#ffffff gui=bold cterm=NONE
-hi Question guifg=#00cd00 guibg=NONE gui=bold cterm=NONE
+hi MoreMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
+hi ModeMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
+hi Question guifg=#00cd00 guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#ffffff guibg=#ff1493 gui=NONE cterm=NONE
 hi Search guifg=#ffffff guibg=#cd00cd gui=NONE cterm=NONE
 hi IncSearch guifg=#00cd00 guibg=NONE gui=reverse cterm=reverse
-hi WildMenu guifg=#00008b guibg=#ffd700 gui=bold cterm=NONE
+hi WildMenu guifg=#00008b guibg=#ffd700 gui=bold cterm=bold
 hi ColorColumn guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
 hi Cursor guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
 hi lCursor guifg=#000000 guibg=#00cd00 gui=NONE cterm=NONE
@@ -69,20 +75,14 @@ hi debugPC guifg=#ff1493 guibg=#0000ff gui=NONE cterm=NONE
 hi Comment guifg=#ee0000 guibg=NONE gui=NONE cterm=NONE
 hi Constant guifg=#00cd00 guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#0000ff guibg=NONE gui=bold cterm=NONE
+hi Statement guifg=#0000ff guibg=NONE gui=bold cterm=bold
 hi PreProc guifg=#cd00cd guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#0000ff guibg=NONE gui=bold cterm=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=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=NONE
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
+hi Title guifg=#cd00cd guibg=NONE gui=bold cterm=bold
 hi CursorLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
@@ -90,11 +90,18 @@ hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
+  hi! link Terminal Normal
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link CurSearch Search
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineSign CursorLine
+  hi! link ErrorMsg Error
   hi Normal ctermfg=16 ctermbg=231 cterm=NONE
   hi EndOfBuffer ctermfg=250 ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=226 ctermbg=18 cterm=NONE
+  hi StatusLine ctermfg=226 ctermbg=18 cterm=bold
   hi StatusLineNC ctermfg=220 ctermbg=18 cterm=NONE
-  hi StatusLineTerm ctermfg=226 ctermbg=21 cterm=NONE
+  hi StatusLineTerm ctermfg=226 ctermbg=21 cterm=bold
   hi StatusLineTermNC ctermfg=254 ctermbg=21 cterm=NONE
   hi VertSplit ctermfg=254 ctermbg=18 cterm=NONE
   hi Pmenu ctermfg=16 ctermbg=152 cterm=NONE
@@ -103,9 +110,9 @@ if s:t_Co >= 256
   hi PmenuThumb ctermfg=NONE ctermbg=30 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=NONE
+  hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=254 cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=250 cterm=NONE
+  hi ToolbarButton ctermfg=231 ctermbg=250 cterm=bold
   hi NonText ctermfg=250 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=250 ctermbg=NONE cterm=NONE
   hi Folded ctermfg=18 ctermbg=254 cterm=NONE
@@ -114,21 +121,20 @@ if s:t_Co >= 256
   hi LineNr ctermfg=124 ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=18 ctermbg=NONE cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
-  hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=bold
   hi QuickFixLine ctermfg=231 ctermbg=30 cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=62 ctermbg=NONE cterm=underline
   hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi! link ErrorMsg Error
   hi WarningMsg ctermfg=164 ctermbg=231 cterm=NONE
-  hi MoreMsg ctermfg=16 ctermbg=231 cterm=NONE
-  hi ModeMsg ctermfg=16 ctermbg=231 cterm=NONE
-  hi Question ctermfg=40 ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=16 ctermbg=231 cterm=bold
+  hi ModeMsg ctermfg=16 ctermbg=231 cterm=bold
+  hi Question ctermfg=40 ctermbg=NONE cterm=bold
   hi Todo ctermfg=16 ctermbg=226 cterm=NONE
   hi MatchParen ctermfg=231 ctermbg=198 cterm=NONE
   hi Search ctermfg=231 ctermbg=164 cterm=NONE
   hi IncSearch ctermfg=40 ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=18 ctermbg=220 cterm=NONE
+  hi WildMenu ctermfg=18 ctermbg=220 cterm=bold
   hi ColorColumn ctermfg=16 ctermbg=254 cterm=NONE
   hi Cursor ctermfg=231 ctermbg=16 cterm=NONE
   hi lCursor ctermfg=16 ctermbg=40 cterm=NONE
@@ -141,20 +147,14 @@ if s:t_Co >= 256
   hi Comment ctermfg=196 ctermbg=NONE cterm=NONE
   hi Constant ctermfg=40 ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=21 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=21 ctermbg=NONE cterm=bold
   hi PreProc ctermfg=164 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=21 ctermbg=NONE cterm=NONE
+  hi Type ctermfg=21 ctermbg=NONE cterm=bold
   hi Special ctermfg=198 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=30 ctermbg=NONE cterm=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=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=164 ctermbg=NONE cterm=bold
   hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
@@ -167,9 +167,9 @@ endif
 if s:t_Co >= 16
   hi Normal ctermfg=black ctermbg=white cterm=NONE
   hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=yellow ctermbg=darkblue cterm=NONE
+  hi StatusLine ctermfg=yellow ctermbg=darkblue cterm=bold
   hi StatusLineNC ctermfg=darkyellow ctermbg=darkblue cterm=NONE
-  hi StatusLineTerm ctermfg=yellow ctermbg=blue cterm=NONE
+  hi StatusLineTerm ctermfg=yellow ctermbg=blue cterm=bold
   hi StatusLineTermNC ctermfg=grey ctermbg=blue cterm=NONE
   hi VertSplit ctermfg=grey ctermbg=darkblue cterm=NONE
   hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
@@ -178,9 +178,9 @@ if s:t_Co >= 16
   hi PmenuThumb ctermfg=NONE ctermbg=darkcyan 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=NONE
+  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=grey cterm=NONE
-  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
   hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=grey cterm=NONE
@@ -189,21 +189,20 @@ if s:t_Co >= 16
   hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=grey cterm=NONE
-  hi CursorLineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=darkgrey ctermbg=NONE cterm=bold
   hi QuickFixLine ctermfg=white ctermbg=darkcyan cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   hi Error ctermfg=red ctermbg=white cterm=reverse
-  hi! link ErrorMsg Error
   hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
-  hi MoreMsg ctermfg=black ctermbg=white cterm=NONE
-  hi ModeMsg ctermfg=black ctermbg=white cterm=NONE
-  hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=black ctermbg=white cterm=bold
+  hi ModeMsg ctermfg=black ctermbg=white cterm=bold
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi Todo ctermfg=black ctermbg=yellow cterm=NONE
   hi MatchParen ctermfg=white ctermbg=magenta cterm=NONE
   hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE
   hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi WildMenu ctermfg=darkblue ctermbg=darkyellow cterm=bold
   hi ColorColumn ctermfg=black ctermbg=grey cterm=NONE
   hi Cursor ctermfg=white ctermbg=black cterm=NONE
   hi lCursor ctermfg=black ctermbg=darkgreen cterm=NONE
@@ -216,20 +215,14 @@ if s:t_Co >= 16
   hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
   hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Type ctermfg=blue ctermbg=NONE cterm=bold
   hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=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=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi Visual ctermfg=white ctermbg=darkgrey cterm=NONE
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
@@ -240,6 +233,71 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=black ctermbg=gray cterm=NONE
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=darkblue ctermbg=darkyellow cterm=bold,reverse
+  hi StatusLineNC ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi StatusLineTerm ctermfg=darkblue ctermbg=darkyellow cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi VertSplit ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+  hi TabLine ctermfg=gray ctermbg=black cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=black cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=gray cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi Error ctermfg=red ctermbg=gray cterm=reverse
+  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkmagenta cterm=bold
+  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
+  hi SpellCap ctermfg=darkcyan ctermbg=black cterm=reverse
+  hi SpellLocal ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi debugBreakpoint ctermfg=darkyellow ctermbg=darkblue cterm=NONE
+  hi debugPC ctermfg=darkmagenta ctermbg=darkblue cterm=NONE
+  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -328,6 +386,14 @@ endif
 " Color: linenr      #a52a2a        124            darkgrey
 " Color: Yellow      #ffff00        226            yellow
 " Color: SlateBlue   #6a5acd        62             blue
+" Color: black       #000000        16             black
+" Color: darkred     #870000        88             darkred
+" Color: darkgreen   #008700        28             darkgreen
+" Color: darkyellow  #878700        100            darkyellow
+" Color: darkblue    #000087        18             darkblue
+" Color: darkmagenta #870087        18             darkmagenta
+" Color: darkcyan    #008787        30             darkcyan
+" Color: gray        #878787        102            gray
 " 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
@@ -336,4 +402,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/desert.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Hans Fugal <hans@fugal.net>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:35 2022
+" Last Updated: Sun Jun 12 10:51:36 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -18,8 +18,14 @@ let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#7f7f8c', '#cd5c5c', '#9acd32', '#bdb76b', '#75a0ff', '#eeee00', '#cd853f', '#666666', '#8a7f7f', '#ff0000', '#89fb98', '#f0e68c', '#6dceeb', '#ffde9b', '#ffa0a0', '#c2bfa5']
 endif
-hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
+hi! link Terminal Normal
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
 hi! link EndOfBuffer NonText
+hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
 hi StatusLine guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
 hi StatusLineNC guifg=#7f7f8c guibg=#c2bfa5 gui=NONE cterm=NONE
 hi StatusLineTerm guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
@@ -33,7 +39,7 @@ hi TabLine guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
 hi TabLineFill guifg=NONE guibg=#c2bfa5 gui=NONE cterm=NONE
 hi TabLineSel guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
 hi ToolbarLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#333333 guibg=#ffde9b gui=bold cterm=NONE
+hi ToolbarButton guifg=#333333 guibg=#ffde9b gui=bold cterm=bold
 hi NonText guifg=#6dceeb guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#9acd32 guibg=NONE gui=NONE cterm=NONE
 hi Folded guifg=#eeee00 guibg=#4d4d4d gui=NONE cterm=NONE
@@ -43,16 +49,16 @@ hi LineNr guifg=#eeee00 guibg=NONE gui=NONE cterm=NONE
 hi FoldColumn guifg=#eeee00 guibg=#4d4d4d gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#eeee00 guibg=NONE gui=bold cterm=NONE
+hi CursorLineNr guifg=#eeee00 guibg=NONE gui=bold cterm=bold
 hi QuickFixLine guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
 hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Underlined guifg=#75a0ff guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
 hi ErrorMsg guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi ModeMsg guifg=#ffde9b guibg=NONE gui=bold cterm=NONE
-hi WarningMsg guifg=#cd5c5c guibg=NONE gui=bold cterm=NONE
-hi MoreMsg guifg=#9acd32 guibg=NONE gui=bold cterm=NONE
-hi Question guifg=#89fb98 guibg=NONE gui=bold cterm=NONE
+hi ModeMsg guifg=#ffde9b guibg=NONE gui=bold cterm=bold
+hi WarningMsg guifg=#cd5c5c guibg=NONE gui=bold cterm=bold
+hi MoreMsg guifg=#9acd32 guibg=NONE gui=bold cterm=bold
+hi Question guifg=#89fb98 guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#ff0000 guibg=#eeee00 gui=NONE cterm=NONE
 hi MatchParen guifg=#7f7f8c guibg=#bdb76b gui=NONE cterm=NONE
 hi Search guifg=#f0e68c guibg=#7f7f8c gui=NONE cterm=NONE
@@ -69,29 +75,29 @@ hi SpellLocal guifg=#ffde9b guibg=NONE guisp=#ffde9b gui=undercurl cterm=underli
 hi SpellRare guifg=#9acd32 guibg=NONE guisp=#9acd32 gui=undercurl cterm=underline
 hi Comment guifg=#6dceeb guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#89fb98 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#f0e68c guibg=NONE gui=bold cterm=NONE
+hi Statement guifg=#f0e68c guibg=NONE gui=bold cterm=bold
 hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
 hi PreProc guifg=#cd5c5c guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#bdb76b guibg=NONE gui=bold cterm=NONE
+hi Type guifg=#bdb76b guibg=NONE gui=bold cterm=bold
 hi Special guifg=#ffde9b guibg=NONE gui=NONE cterm=NONE
 hi Directory guifg=#6dceeb guibg=NONE gui=NONE cterm=NONE
 hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#cd5c5c guibg=NONE gui=NONE cterm=NONE
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
+hi Title guifg=#cd5c5c guibg=NONE gui=bold cterm=bold
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
-  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
+  hi! link Terminal Normal
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link CurSearch Search
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineSign CursorLine
   hi! link EndOfBuffer NonText
+  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
   hi StatusLine ctermfg=236 ctermbg=144 cterm=NONE
   hi StatusLineNC ctermfg=242 ctermbg=144 cterm=NONE
   hi StatusLineTerm ctermfg=236 ctermbg=144 cterm=NONE
@@ -105,7 +111,7 @@ if s:t_Co >= 256
   hi TabLineFill ctermfg=NONE ctermbg=144 cterm=NONE
   hi TabLineSel ctermfg=236 ctermbg=186 cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=241 cterm=NONE
-  hi ToolbarButton ctermfg=236 ctermbg=222 cterm=NONE
+  hi ToolbarButton ctermfg=236 ctermbg=222 cterm=bold
   hi NonText ctermfg=81 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=112 ctermbg=NONE cterm=NONE
   hi Folded ctermfg=226 ctermbg=239 cterm=NONE
@@ -115,16 +121,16 @@ if s:t_Co >= 256
   hi FoldColumn ctermfg=226 ctermbg=239 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=241 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=241 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
   hi QuickFixLine ctermfg=236 ctermbg=186 cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
   hi Error ctermfg=196 ctermbg=231 cterm=reverse
   hi ErrorMsg ctermfg=196 ctermbg=231 cterm=reverse
-  hi ModeMsg ctermfg=222 ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=167 ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=112 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=120 ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=222 ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=167 ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=112 ctermbg=NONE cterm=bold
+  hi Question ctermfg=120 ctermbg=NONE cterm=bold
   hi Todo ctermfg=196 ctermbg=226 cterm=NONE
   hi MatchParen ctermfg=242 ctermbg=143 cterm=NONE
   hi Search ctermfg=186 ctermbg=242 cterm=NONE
@@ -139,21 +145,15 @@ if s:t_Co >= 256
   hi SpellRare ctermfg=112 ctermbg=NONE cterm=underline
   hi Comment ctermfg=81 ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=120 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=186 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=186 ctermbg=NONE cterm=bold
   hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
   hi PreProc ctermfg=167 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=143 ctermbg=NONE cterm=NONE
+  hi Type ctermfg=143 ctermbg=NONE cterm=bold
   hi Special ctermfg=222 ctermbg=NONE cterm=NONE
   hi Directory ctermfg=81 ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=167 ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=167 ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -164,7 +164,6 @@ endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi! link EndOfBuffer NonText
   hi StatusLine ctermfg=black ctermbg=grey cterm=NONE
   hi StatusLineNC ctermfg=darkgrey ctermbg=grey cterm=NONE
   hi StatusLineTerm ctermfg=black ctermbg=grey cterm=NONE
@@ -183,50 +182,44 @@ if s:t_Co >= 16
   hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Visual ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
   hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=darkyellow ctermbg=darkgrey cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=darkblue cterm=NONE
-  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
   hi Error ctermfg=red ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse
-  hi ModeMsg ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=magenta ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Question ctermfg=green ctermbg=NONE cterm=bold
   hi Todo ctermfg=red ctermbg=darkmagenta cterm=NONE
   hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
   hi IncSearch ctermfg=black ctermbg=yellow cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkmagenta cterm=NONE
   hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
   hi debugPC ctermfg=grey ctermbg=NONE cterm=reverse
   hi debugBreakpoint ctermfg=cyan ctermbg=NONE cterm=reverse
-  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=underline
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkblue ctermbg=grey cterm=reverse
+  hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
   hi Comment ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=green ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=yellow ctermbg=NONE cterm=bold
   hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Directory ctermfg=blue ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=darkred ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -235,6 +228,72 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=grey ctermbg=black cterm=NONE
+  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi StatusLineTerm ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Error ctermfg=darkred ctermbg=grey cterm=reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=grey cterm=reverse
+  hi ModeMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Todo ctermfg=darkred ctermbg=darkmagenta cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
+  hi debugPC ctermfg=grey ctermbg=NONE cterm=reverse
+  hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkblue ctermbg=grey cterm=reverse
+  hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkred ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -332,4 +391,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/elflord.vim

@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:36 2022
+" Last Updated: Sun Jun 12 10:48:00 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -52,7 +52,7 @@ hi QuickFixLine guifg=#ffffff guibg=#2e8b57 gui=NONE cterm=NONE
 hi ColorColumn guifg=NONE guibg=#cd0000 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=underline
+hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold
 hi Folded guifg=#00ffff guibg=#666666 gui=NONE cterm=NONE
 hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
 hi Cursor guifg=#000000 guibg=#00ffff gui=NONE cterm=NONE
@@ -63,14 +63,14 @@ hi FoldColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi IncSearch guifg=NONE guibg=#000000 gui=reverse cterm=reverse
 hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
 hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=NONE
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=NONE
-hi NonText guifg=#0000ff guibg=NONE gui=bold cterm=NONE
+hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
+hi NonText guifg=#0000ff guibg=NONE gui=bold cterm=bold
 hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=#bebebe gui=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=NONE
+hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
 hi Search guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
@@ -78,13 +78,13 @@ hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
 hi SpellCap guifg=#0000ff guibg=NONE guisp=#0000ff gui=undercurl cterm=underline
 hi SpellLocal guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl cterm=underline
 hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi StatusLine guifg=#000000 guibg=#00ffff gui=bold cterm=NONE
+hi StatusLine guifg=#000000 guibg=#00ffff gui=bold cterm=bold
 hi StatusLineNC guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
 hi TabLine guifg=#000000 guibg=#008b8b gui=NONE cterm=NONE
 hi TabLineFill guifg=NONE guibg=#000000 gui=reverse cterm=reverse
-hi TabLineSel guifg=#00ffff guibg=#000000 gui=bold cterm=NONE
+hi TabLineSel guifg=#00ffff guibg=#000000 gui=bold cterm=bold
 hi Terminal guifg=#00ffff guibg=#000000 gui=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=NONE
+hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
 hi VertSplit guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
 hi Visual guifg=#000000 guibg=#a9a9a9 gui=NONE cterm=NONE
 hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline
@@ -100,13 +100,13 @@ hi Operator guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
 hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
 hi Repeat guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
 hi Special guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#aa4444 guibg=NONE gui=bold cterm=NONE
+hi Statement guifg=#aa4444 guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#0000ff guibg=#ffff00 gui=NONE cterm=NONE
-hi Type guifg=#60ff60 guibg=NONE gui=bold cterm=NONE
+hi Type guifg=#60ff60 guibg=NONE gui=bold cterm=bold
 hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
 hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
 hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=NONE
+hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold
 hi! link LineNrAbove LineNr
 hi! link LineNrBelow LineNr
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
@@ -120,7 +120,7 @@ if s:t_Co >= 256
   hi ColorColumn ctermfg=NONE ctermbg=160 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
   hi Folded ctermfg=51 ctermbg=59 cterm=NONE
   hi Conceal ctermfg=59 ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=16 ctermbg=51 cterm=NONE
@@ -131,14 +131,14 @@ if s:t_Co >= 256
   hi IncSearch ctermfg=NONE ctermbg=16 cterm=reverse
   hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=30 cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=21 ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold
+  hi NonText ctermfg=21 ctermbg=NONE cterm=bold
   hi Pmenu ctermfg=231 ctermbg=238 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=250 cterm=NONE
   hi PmenuSel ctermfg=16 ctermbg=44 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi Question ctermfg=46 ctermbg=NONE cterm=NONE
+  hi Question ctermfg=46 ctermbg=NONE cterm=bold
   hi Search ctermfg=16 ctermbg=226 cterm=NONE
   hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE
@@ -146,13 +146,13 @@ if s:t_Co >= 256
   hi SpellCap ctermfg=21 ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=226 ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=16 ctermbg=51 cterm=NONE
+  hi StatusLine ctermfg=16 ctermbg=51 cterm=bold
   hi StatusLineNC ctermfg=16 ctermbg=44 cterm=NONE
   hi TabLine ctermfg=16 ctermbg=30 cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=16 cterm=reverse
-  hi TabLineSel ctermfg=51 ctermbg=16 cterm=NONE
+  hi TabLineSel ctermfg=51 ctermbg=16 cterm=bold
   hi Terminal ctermfg=51 ctermbg=16 cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=NONE
+  hi Title ctermfg=201 ctermbg=NONE cterm=bold
   hi VertSplit ctermfg=16 ctermbg=44 cterm=NONE
   hi Visual ctermfg=16 ctermbg=145 cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline
@@ -168,13 +168,13 @@ if s:t_Co >= 256
   hi PreProc ctermfg=213 ctermbg=NONE cterm=NONE
   hi Repeat ctermfg=231 ctermbg=NONE cterm=NONE
   hi Special ctermfg=196 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=131 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=131 ctermbg=NONE cterm=bold
   hi Todo ctermfg=21 ctermbg=226 cterm=NONE
-  hi Type ctermfg=83 ctermbg=NONE cterm=NONE
+  hi Type ctermfg=83 ctermbg=NONE cterm=bold
   hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=NONE
+  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold
   hi! link LineNrAbove LineNr
   hi! link LineNrBelow LineNr
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
@@ -202,14 +202,14 @@ if s:t_Co >= 16
   hi IncSearch ctermfg=NONE ctermbg=black cterm=reverse
   hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
   hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
   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 Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi Question ctermfg=green ctermbg=NONE cterm=bold
   hi Search ctermfg=black ctermbg=yellow cterm=NONE
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
@@ -217,13 +217,13 @@ if s:t_Co >= 16
   hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=yellow ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=black ctermbg=cyan cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=cyan cterm=bold
   hi StatusLineNC ctermfg=black ctermbg=darkcyan cterm=NONE
   hi TabLine ctermfg=black ctermbg=darkcyan cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=black cterm=reverse
-  hi TabLineSel ctermfg=cyan ctermbg=black cterm=NONE
+  hi TabLineSel ctermfg=cyan ctermbg=black cterm=bold
   hi Terminal ctermfg=cyan ctermbg=black cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=bold
   hi VertSplit ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Visual ctermfg=black ctermbg=darkgrey cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
@@ -239,13 +239,13 @@ if s:t_Co >= 16
   hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Repeat ctermfg=white ctermbg=NONE cterm=NONE
   hi Special ctermfg=red ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
   hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
-  hi Type ctermfg=green ctermbg=NONE cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=bold
   hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
   hi! link LineNrAbove LineNr
   hi! link LineNrBelow LineNr
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
@@ -256,6 +256,76 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=darkcyan ctermbg=black cterm=NONE
+  hi QuickFixLine ctermfg=grey ctermbg=darkgreen cterm=NONE
+  hi ColorColumn ctermfg=darkcyan ctermbg=darkred cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=underline
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=grey ctermbg=NONE cterm=NONE
+  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 Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi StatusLine ctermfg=darkcyan ctermbg=NONE cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi TabLine ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Terminal ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi VertSplit ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi Visual ctermfg=black ctermbg=grey cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Function ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=NONE cterm=NONE
+  hi Operator ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Repeat ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -372,4 +442,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/evening.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:37 2022
+" Last Updated: Sun Jun 12 10:52:56 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -18,52 +18,10 @@ let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#000000', '#ffa500', '#2e8b57', '#ffff00', '#006faf', '#8b008b', '#008b8b', '#bebebe', '#4d4d4d', '#ff5f5f', '#00ff00', '#ffff60', '#0087ff', '#ff80ff', '#00ffff', '#ffffff']
 endif
-hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#8b0000 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=#666666 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#add8e6 guibg=#4d4d4d gui=NONE cterm=NONE
-hi StatusLine guifg=#333333 guibg=#ffffff gui=bold cterm=NONE
-hi StatusLineNC guifg=#333333 guibg=#d3d3d3 gui=NONE cterm=NONE
-hi TabLineSel guifg=#333333 guibg=#ffffff gui=bold cterm=NONE
-hi TabLine guifg=#333333 guibg=#d3d3d3 gui=NONE cterm=NONE
-hi QuickFixLine guifg=#ffffff guibg=#8b008b gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#4d4d4d gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#bebebe gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
-hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi FoldColumn guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#00008b guibg=#d3d3d3 gui=bold cterm=NONE
-hi IncSearch guifg=#00ff00 guibg=NONE gui=reverse cterm=reverse
-hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=NONE
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#add8e6 guibg=#4d4d4d gui=NONE cterm=NONE
-hi Question guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Search guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi SignColumn guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl cterm=underline
-hi SpellLocal guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline
-hi SpellRare guifg=#ff80ff guibg=NONE guisp=#ff80ff gui=undercurl cterm=underline
+hi! link VertSplit StatusLineNC
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
 hi! link TabLineFill TabLine
-hi ToolbarButton guifg=NONE guibg=#999999 gui=bold cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi VertSplit guifg=#ffffff guibg=#ffffff gui=NONE cterm=NONE
-hi Visual guifg=#ffffff guibg=#999999 gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=NONE
-hi debugBreakpoint guifg=#00008b guibg=#ff0000 gui=NONE cterm=NONE
-hi debugPC guifg=#00008b guibg=#0000ff gui=NONE cterm=NONE
 hi! link Terminal Normal
 hi! link CursorColumn CursorLine
 hi! link CursorIM Cursor
@@ -83,18 +41,6 @@ hi! link lCursor Cursor
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
-hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#333333 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffff60 guibg=NONE gui=bold cterm=NONE
-hi Todo guifg=#ffff00 guibg=#0000ff gui=reverse cterm=reverse
-hi Type guifg=#00ff00 guibg=NONE gui=bold cterm=NONE
-hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
@@ -118,58 +64,70 @@ hi! link String Constant
 hi! link Structure Type
 hi! link Tag Special
 hi! link Typedef Type
+hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
+hi ColorColumn guifg=NONE guibg=#8b0000 gui=NONE cterm=NONE
+hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
+hi CursorLineNr guifg=#ffff00 guibg=#666666 gui=NONE cterm=NONE
+hi EndOfBuffer guifg=#add8e6 guibg=#4d4d4d gui=NONE cterm=NONE
+hi StatusLine guifg=#333333 guibg=#ffffff gui=bold cterm=bold
+hi StatusLineNC guifg=#333333 guibg=#d3d3d3 gui=NONE cterm=NONE
+hi TabLineSel guifg=#333333 guibg=#ffffff gui=bold cterm=bold
+hi TabLine guifg=#333333 guibg=#d3d3d3 gui=NONE cterm=NONE
+hi Pmenu guifg=#ffffff guibg=#4d4d4d gui=NONE cterm=NONE
+hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi PmenuSel guifg=#000000 guibg=#bebebe gui=NONE cterm=NONE
+hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
+hi QuickFixLine guifg=#ffffff guibg=#8b008b gui=NONE cterm=NONE
+hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
+hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
+hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
+hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
+hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi FoldColumn guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE
+hi Folded guifg=#00008b guibg=#d3d3d3 gui=bold cterm=bold
+hi IncSearch guifg=#00ff00 guibg=NONE gui=reverse cterm=reverse
+hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
+hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE gui=NONE cterm=NONE
+hi NonText guifg=#add8e6 guibg=#4d4d4d gui=NONE cterm=NONE
+hi Question guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
+hi Search guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
+hi SignColumn guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
+hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
+hi ToolbarButton guifg=NONE guibg=#999999 gui=bold cterm=bold
+hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Visual guifg=#ffffff guibg=#999999 gui=NONE cterm=NONE
+hi VisualNOS guifg=NONE guibg=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=bold,underline
+hi WarningMsg guifg=#8b0000 guibg=NONE gui=NONE cterm=NONE
+hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold
+hi debugBreakpoint guifg=#00008b guibg=#ff0000 gui=NONE cterm=NONE
+hi debugPC guifg=#00008b guibg=#0000ff gui=NONE cterm=NONE
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
+hi SpellCap guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl cterm=underline
+hi SpellLocal guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline
+hi SpellRare guifg=#ff80ff guibg=NONE guisp=#ff80ff gui=undercurl cterm=underline
+hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
+hi Title guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
+hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
+hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
+hi Identifier guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
+hi Ignore guifg=#333333 guibg=NONE gui=NONE cterm=NONE
+hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
+hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
+hi Statement guifg=#ffff60 guibg=NONE gui=bold cterm=bold
+hi Todo guifg=#ffff00 guibg=#0000ff gui=reverse cterm=reverse
+hi Type guifg=#00ff00 guibg=NONE gui=bold cterm=bold
+hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
-  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=88 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=241 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=241 cterm=NONE
-  hi EndOfBuffer ctermfg=153 ctermbg=239 cterm=NONE
-  hi StatusLine ctermfg=236 ctermbg=231 cterm=NONE
-  hi StatusLineNC ctermfg=236 ctermbg=252 cterm=NONE
-  hi TabLineSel ctermfg=236 ctermbg=231 cterm=NONE
-  hi TabLine ctermfg=236 ctermbg=252 cterm=NONE
-  hi QuickFixLine ctermfg=231 ctermbg=90 cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=239 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=250 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
-  hi FoldColumn ctermfg=153 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=18 ctermbg=252 cterm=NONE
-  hi IncSearch ctermfg=46 ctermbg=NONE cterm=reverse
-  hi MatchParen ctermfg=NONE ctermbg=30 cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=153 ctermbg=239 cterm=NONE
-  hi Question ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Search ctermfg=16 ctermbg=226 cterm=NONE
-  hi SignColumn ctermfg=30 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=46 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=51 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
+  hi! link VertSplit StatusLineNC
   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
   hi! link TabLineFill TabLine
-  hi ToolbarButton ctermfg=NONE ctermbg=246 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=231 ctermbg=231 cterm=NONE
-  hi Visual ctermfg=231 ctermbg=246 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
-  hi debugBreakpoint ctermfg=18 ctermbg=196 cterm=NONE
-  hi debugPC ctermfg=18 ctermbg=21 cterm=NONE
   hi! link Terminal Normal
   hi! link CursorColumn CursorLine
   hi! link CursorIM Cursor
@@ -189,18 +147,6 @@ if s:t_Co >= 256
   hi! link CurSearch Search
   hi! link CursorLineFold CursorLine
   hi! link CursorLineSign CursorLine
-  hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=236 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=227 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=226 ctermbg=21 cterm=reverse
-  hi Type ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
   hi! link Boolean Constant
   hi! link Character Constant
   hi! link Conditional Statement
@@ -224,6 +170,60 @@ if s:t_Co >= 256
   hi! link Structure Type
   hi! link Tag Special
   hi! link Typedef Type
+  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=88 cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=241 cterm=NONE
+  hi CursorLineNr ctermfg=226 ctermbg=241 cterm=NONE
+  hi EndOfBuffer ctermfg=153 ctermbg=239 cterm=NONE
+  hi StatusLine ctermfg=236 ctermbg=231 cterm=bold
+  hi StatusLineNC ctermfg=236 ctermbg=252 cterm=NONE
+  hi TabLineSel ctermfg=236 ctermbg=231 cterm=bold
+  hi TabLine ctermfg=236 ctermbg=252 cterm=NONE
+  hi Pmenu ctermfg=231 ctermbg=239 cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=16 ctermbg=250 cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
+  hi QuickFixLine ctermfg=231 ctermbg=90 cterm=NONE
+  hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
+  hi Error ctermfg=196 ctermbg=231 cterm=reverse
+  hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
+  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=153 ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=18 ctermbg=252 cterm=bold
+  hi IncSearch ctermfg=46 ctermbg=NONE cterm=reverse
+  hi MatchParen ctermfg=NONE ctermbg=30 cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=153 ctermbg=239 cterm=NONE
+  hi Question ctermfg=46 ctermbg=NONE cterm=NONE
+  hi Search ctermfg=16 ctermbg=226 cterm=NONE
+  hi SignColumn ctermfg=30 ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=NONE ctermbg=246 cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=231 ctermbg=246 cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi WarningMsg ctermfg=88 ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=16 ctermbg=226 cterm=bold
+  hi debugBreakpoint ctermfg=18 ctermbg=196 cterm=NONE
+  hi debugPC ctermfg=18 ctermbg=21 cterm=NONE
+  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=46 ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=51 ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
+  hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
+  hi Title ctermfg=201 ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=51 ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=236 ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=201 ctermbg=NONE cterm=NONE
+  hi Special ctermfg=214 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=227 ctermbg=NONE cterm=bold
+  hi Todo ctermfg=226 ctermbg=21 cterm=reverse
+  hi Type ctermfg=46 ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -233,52 +233,10 @@ if s:t_Co >= 256
 endif
 
 if s:t_Co >= 16
-  hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=underline
-  hi EndOfBuffer ctermfg=lightblue ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=white cterm=NONE
-  hi StatusLineNC ctermfg=black ctermbg=gray cterm=NONE
-  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
-  hi TabLine ctermfg=black ctermbg=gray cterm=NONE
-  hi QuickFixLine ctermfg=white ctermbg=darkmagenta cterm=NONE
-  hi Pmenu ctermfg=white ctermbg=darkgray cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=black ctermbg=green cterm=NONE
-  hi Error ctermfg=red ctermbg=white cterm=reverse
-  hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
-  hi FoldColumn ctermfg=lightblue ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=gray cterm=NONE
-  hi IncSearch ctermfg=green ctermbg=NONE cterm=reverse
-  hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=lightblue ctermbg=darkgray cterm=NONE
-  hi Question ctermfg=green ctermbg=NONE cterm=NONE
-  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=cyan ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi! link VertSplit StatusLineNC
   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
   hi! link TabLineFill TabLine
-  hi ToolbarButton ctermfg=NONE ctermbg=darkgray cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=white ctermbg=white cterm=NONE
-  hi Visual ctermfg=white ctermbg=darkgray cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi debugBreakpoint ctermfg=darkblue ctermbg=red cterm=NONE
-  hi debugPC ctermfg=darkblue ctermbg=blue cterm=NONE
   hi! link Terminal Normal
   hi! link CursorColumn CursorLine
   hi! link CursorIM Cursor
@@ -298,18 +256,6 @@ if s:t_Co >= 16
   hi! link CurSearch Search
   hi! link CursorLineFold CursorLine
   hi! link CursorLineSign CursorLine
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=lightblue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkyellow ctermbg=blue cterm=reverse
-  hi Type ctermfg=green ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=lightblue ctermbg=NONE cterm=underline
   hi! link Boolean Constant
   hi! link Character Constant
   hi! link Conditional Statement
@@ -333,6 +279,60 @@ if s:t_Co >= 16
   hi! link Structure Type
   hi! link Tag Special
   hi! link Typedef Type
+  hi Normal ctermfg=white ctermbg=black cterm=NONE
+  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=underline
+  hi EndOfBuffer ctermfg=lightblue ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=white cterm=NONE
+  hi StatusLineNC ctermfg=black ctermbg=gray cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
+  hi TabLine ctermfg=black ctermbg=gray cterm=NONE
+  hi Pmenu ctermfg=white ctermbg=darkgray cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi QuickFixLine ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi Cursor ctermfg=black ctermbg=green cterm=NONE
+  hi Error ctermfg=red ctermbg=white cterm=reverse
+  hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=NONE 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
+  hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=lightblue ctermbg=darkgray cterm=NONE
+  hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=NONE ctermbg=darkgray cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=white ctermbg=darkgray cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
+  hi debugBreakpoint ctermfg=darkblue ctermbg=red cterm=NONE
+  hi debugPC ctermfg=darkblue ctermbg=blue cterm=NONE
+  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=cyan ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=lightblue ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=yellow ctermbg=NONE cterm=bold
+  hi Todo ctermfg=darkyellow ctermbg=blue cterm=reverse
+  hi Type ctermfg=green ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=lightblue ctermbg=NONE cterm=underline
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -341,6 +341,68 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=gray ctermbg=black cterm=NONE
+  hi ColorColumn ctermfg=gray ctermbg=darkred cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=gray ctermbg=black cterm=reverse
+  hi TabLineSel ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi TabLine ctermfg=gray ctermbg=black cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE
+  hi QuickFixLine ctermfg=gray ctermbg=darkmagenta cterm=NONE
+  hi Error ctermfg=red ctermbg=gray cterm=reverse
+  hi ErrorMsg ctermfg=gray ctermbg=red cterm=NONE
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=gray cterm=NONE
+  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=blue ctermbg=NONE cterm=bold
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi debugBreakpoint ctermfg=darkblue ctermbg=darkred cterm=NONE
+  hi debugPC ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Todo ctermfg=darkyellow ctermbg=blue cterm=reverse
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -445,4 +507,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

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: Wed May 11 22:56:38 2022
+" Last Updated: Sun Jun 12 10:53:58 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -20,9 +20,9 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
 endif
 hi Normal guifg=#dadada guibg=#000000 gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#444444 guibg=#000000 gui=NONE cterm=NONE
-hi StatusLine guifg=#000000 guibg=#dadada gui=bold cterm=NONE
+hi StatusLine guifg=#000000 guibg=#dadada gui=bold cterm=bold
 hi StatusLineNC guifg=#000000 guibg=#6c6c6c gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#000000 guibg=#00ff00 gui=bold cterm=NONE
+hi StatusLineTerm guifg=#000000 guibg=#00ff00 gui=bold cterm=bold
 hi StatusLineTermNC guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE
 hi VertSplit guifg=#000000 guibg=#6c6c6c gui=NONE cterm=NONE
 hi Pmenu guifg=#dadada guibg=#444444 gui=NONE cterm=NONE
@@ -31,8 +31,8 @@ hi PmenuSbar guifg=NONE guibg=#000000 gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#6c6c6c 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=NONE
-hi ToolbarButton guifg=#dadada guibg=#6c6c6c gui=bold cterm=NONE
+hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold
+hi ToolbarButton guifg=#dadada guibg=#6c6c6c gui=bold cterm=bold
 hi ToolbarLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
 hi NonText guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
@@ -40,7 +40,7 @@ hi Folded guifg=#00afaf guibg=#303030 gui=NONE cterm=NONE
 hi Visual guifg=#dadada guibg=#6c6c6c gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=NONE
+hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold
 hi ColorColumn guifg=NONE guibg=#444444 gui=NONE cterm=NONE
 hi QuickFixLine guifg=#000000 guibg=#ff00ff gui=NONE cterm=NONE
 hi VisualNOS guifg=#dadada guibg=#6c6c6c gui=NONE cterm=NONE
@@ -50,10 +50,10 @@ hi SignColumn guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
 hi Underlined guifg=#87afff guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
 hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi ModeMsg guifg=#ffffff guibg=NONE gui=bold cterm=NONE
-hi WarningMsg guifg=#870000 guibg=NONE gui=bold cterm=NONE
-hi MoreMsg guifg=#5fd75f guibg=NONE gui=bold cterm=NONE
-hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=NONE
+hi ModeMsg guifg=#ffffff guibg=NONE gui=bold cterm=bold
+hi WarningMsg guifg=#870000 guibg=NONE gui=bold cterm=bold
+hi MoreMsg guifg=#5fd75f guibg=NONE gui=bold cterm=bold
+hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#005fff guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#303030 guibg=#afaf00 gui=NONE cterm=NONE
 hi Search guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
@@ -68,16 +68,16 @@ hi SpellRare guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl cterm=underlin
 hi Comment guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
 hi Function guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffffff guibg=NONE gui=bold cterm=NONE
+hi Statement guifg=#ffffff guibg=NONE gui=bold cterm=bold
 hi Constant guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi PreProc guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#00ff00 guibg=NONE gui=bold cterm=NONE
+hi Type guifg=#00ff00 guibg=NONE gui=bold cterm=bold
 hi Special guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
 hi Delimiter guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
 hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi Conceal guifg=#6c6c6c guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=NONE
+hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
 hi! link Terminal Normal
 hi! link LineNrAbove LineNr
 hi! link LineNrBelow LineNr
@@ -92,9 +92,9 @@ hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 if s:t_Co >= 256
   hi Normal ctermfg=253 ctermbg=16 cterm=NONE
   hi EndOfBuffer ctermfg=238 ctermbg=16 cterm=NONE
-  hi StatusLine ctermfg=16 ctermbg=253 cterm=NONE
+  hi StatusLine ctermfg=16 ctermbg=253 cterm=bold
   hi StatusLineNC ctermfg=16 ctermbg=242 cterm=NONE
-  hi StatusLineTerm ctermfg=16 ctermbg=46 cterm=NONE
+  hi StatusLineTerm ctermfg=16 ctermbg=46 cterm=bold
   hi StatusLineTermNC ctermfg=16 ctermbg=77 cterm=NONE
   hi VertSplit ctermfg=16 ctermbg=242 cterm=NONE
   hi Pmenu ctermfg=253 ctermbg=238 cterm=NONE
@@ -103,8 +103,8 @@ if s:t_Co >= 256
   hi PmenuThumb ctermfg=NONE ctermbg=242 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=NONE
-  hi ToolbarButton ctermfg=253 ctermbg=242 cterm=NONE
+  hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold
+  hi ToolbarButton ctermfg=253 ctermbg=242 cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=236 cterm=NONE
   hi NonText ctermfg=37 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=37 ctermbg=NONE cterm=NONE
@@ -112,7 +112,7 @@ if s:t_Co >= 256
   hi Visual ctermfg=253 ctermbg=242 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=242 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=242 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
   hi ColorColumn ctermfg=NONE ctermbg=238 cterm=NONE
   hi QuickFixLine ctermfg=16 ctermbg=201 cterm=NONE
   hi VisualNOS ctermfg=253 ctermbg=242 cterm=NONE
@@ -122,10 +122,10 @@ if s:t_Co >= 256
   hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
   hi Error ctermfg=231 ctermbg=196 cterm=NONE
   hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
-  hi ModeMsg ctermfg=231 ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=88 ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=77 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=46 ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=231 ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=88 ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=77 ctermbg=NONE cterm=bold
+  hi Question ctermfg=46 ctermbg=NONE cterm=bold
   hi Todo ctermfg=27 ctermbg=226 cterm=NONE
   hi MatchParen ctermfg=236 ctermbg=142 cterm=NONE
   hi Search ctermfg=16 ctermbg=226 cterm=NONE
@@ -140,16 +140,16 @@ if s:t_Co >= 256
   hi Comment ctermfg=37 ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=201 ctermbg=NONE cterm=NONE
   hi Function ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=231 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=231 ctermbg=NONE cterm=bold
   hi Constant ctermfg=51 ctermbg=NONE cterm=NONE
   hi PreProc ctermfg=226 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=46 ctermbg=NONE cterm=NONE
+  hi Type ctermfg=46 ctermbg=NONE cterm=bold
   hi Special ctermfg=196 ctermbg=NONE cterm=NONE
   hi Delimiter ctermfg=226 ctermbg=NONE cterm=NONE
   hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=242 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=NONE
+  hi Title ctermfg=201 ctermbg=NONE cterm=bold
   hi! link Terminal Normal
   hi! link LineNrAbove LineNr
   hi! link LineNrBelow LineNr
@@ -167,9 +167,9 @@ endif
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
   hi EndOfBuffer ctermfg=darkgrey ctermbg=black cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=white cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=white cterm=bold
   hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineTerm ctermfg=black ctermbg=green cterm=NONE
+  hi StatusLineTerm ctermfg=black ctermbg=green cterm=bold
   hi StatusLineTermNC ctermfg=black ctermbg=darkgreen cterm=NONE
   hi VertSplit ctermfg=black ctermbg=grey cterm=NONE
   hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
@@ -178,7 +178,7 @@ if s:t_Co >= 16
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
   hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
-  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
+  hi TabLineSel ctermfg=white ctermbg=black cterm=bold
   hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
   hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
@@ -197,10 +197,10 @@ if s:t_Co >= 16
   hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
   hi Error ctermfg=white ctermbg=red cterm=NONE
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
-  hi ModeMsg ctermfg=white ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=white ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Question ctermfg=green ctermbg=NONE cterm=bold
   hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
   hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Search ctermfg=black ctermbg=yellow cterm=NONE
@@ -215,16 +215,16 @@ if s:t_Co >= 16
   hi Comment ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Function ctermfg=green ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=white ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=white ctermbg=NONE cterm=bold
   hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
   hi PreProc ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=green ctermbg=NONE cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=bold
   hi Special ctermfg=red ctermbg=NONE cterm=NONE
   hi Delimiter ctermfg=yellow ctermbg=NONE cterm=NONE
   hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=bold
   hi! link Terminal Normal
   hi! link LineNrAbove LineNr
   hi! link LineNrBelow LineNr
@@ -239,6 +239,73 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=grey ctermbg=black cterm=NONE
+  hi EndOfBuffer ctermfg=grey ctermbg=black cterm=bold
+  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi StatusLineTerm ctermfg=darkgreen ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuThumb ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi VisualNOS ctermfg=black ctermbg=grey cterm=NONE
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+  hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
+  hi ModeMsg ctermfg=grey ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Function ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=grey ctermbg=NONE cterm=bold
+  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Delimiter ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -334,4 +401,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/koehler.vim

@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Thu May 12 18:53:29 2022
+" Last Updated: Sat 11 Jun 2022 11:24:58 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -57,25 +57,25 @@ hi Normal guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
 hi ColorColumn guifg=NONE guibg=#8b0000 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#555555 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#555555 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=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 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=NONE
+hi EndOfBuffer guifg=#cd0000 guibg=NONE gui=bold cterm=bold
 hi ErrorMsg guifg=#cd0000 guibg=#ffffff gui=reverse cterm=reverse
 hi FoldColumn guifg=#00cdcd guibg=NONE gui=NONE cterm=NONE
 hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
 hi MatchParen guifg=NONE guibg=#0000ff gui=NONE cterm=NONE
-hi ModeMsg guifg=#ffffff guibg=#0000ff gui=bold cterm=NONE
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=NONE
-hi NonText guifg=#cd0000 guibg=NONE gui=bold cterm=NONE
+hi ModeMsg guifg=#ffffff guibg=#0000ff gui=bold cterm=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
+hi NonText guifg=#cd0000 guibg=NONE gui=bold cterm=bold
 hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi Question guifg=#5c5cff guibg=NONE gui=bold cterm=NONE
+hi Question guifg=#5c5cff guibg=NONE gui=bold cterm=bold
 hi Search guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
 hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#cd0000 guibg=NONE gui=NONE cterm=NONE
@@ -83,12 +83,12 @@ hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
 hi SpellCap guifg=#60ff60 guibg=NONE guisp=#60ff60 gui=undercurl cterm=underline
 hi SpellLocal guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline
 hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi StatusLine guifg=#0000ff guibg=#ffffff gui=bold cterm=NONE
+hi StatusLine guifg=#0000ff guibg=#ffffff gui=bold cterm=bold
 hi StatusLineNC guifg=#0000ff guibg=#e5e5e5 gui=NONE cterm=NONE
-hi TabLine guifg=#0000ff guibg=#ffffff gui=bold cterm=NONE
-hi TabLineFill guifg=#0000ff guibg=#ffffff gui=bold cterm=NONE
-hi TabLineSel guifg=#ffffff guibg=#0000ff gui=bold cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=NONE
+hi TabLine guifg=#0000ff guibg=#ffffff gui=bold cterm=bold
+hi TabLineFill guifg=#0000ff guibg=#ffffff gui=bold cterm=bold
+hi TabLineSel guifg=#ffffff guibg=#0000ff gui=bold cterm=bold
+hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
 hi VertSplit guifg=#0000ff guibg=#e5e5e5 gui=NONE cterm=NONE
 hi Visual guifg=NONE guibg=#666666 gui=reverse cterm=reverse
 hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline
@@ -101,13 +101,13 @@ hi Identifier guifg=#40ffff guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
 hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
 hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffff60 guibg=NONE gui=bold cterm=NONE
+hi Statement guifg=#ffff60 guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#0000ff guibg=#ffff00 gui=NONE cterm=NONE
-hi Type guifg=#60ff60 guibg=NONE gui=bold cterm=NONE
+hi Type guifg=#60ff60 guibg=NONE gui=bold cterm=bold
 hi Underlined guifg=#add8e6 guibg=NONE gui=bold,underline cterm=underline
 hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
 hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=NONE
+hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
@@ -118,25 +118,25 @@ if s:t_Co >= 256
   hi ColorColumn ctermfg=NONE ctermbg=88 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=240 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=240 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
   hi Folded ctermfg=44 ctermbg=59 cterm=NONE
   hi QuickFixLine ctermfg=16 ctermbg=226 cterm=NONE
   hi Conceal ctermfg=254 ctermbg=145 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=NONE
+  hi EndOfBuffer ctermfg=160 ctermbg=NONE cterm=bold
   hi ErrorMsg ctermfg=160 ctermbg=231 cterm=reverse
   hi FoldColumn ctermfg=44 ctermbg=NONE cterm=NONE
   hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=21 cterm=NONE
-  hi ModeMsg ctermfg=231 ctermbg=21 cterm=NONE
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=160 ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=231 ctermbg=21 cterm=bold
+  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold
+  hi NonText ctermfg=160 ctermbg=NONE cterm=bold
   hi Pmenu ctermfg=231 ctermbg=238 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=16 ctermbg=44 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi Question ctermfg=63 ctermbg=NONE cterm=NONE
+  hi Question ctermfg=63 ctermbg=NONE cterm=bold
   hi Search ctermfg=231 ctermbg=196 cterm=NONE
   hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=160 ctermbg=NONE cterm=NONE
@@ -144,12 +144,12 @@ if s:t_Co >= 256
   hi SpellCap ctermfg=83 ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=51 ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=21 ctermbg=231 cterm=NONE
+  hi StatusLine ctermfg=21 ctermbg=231 cterm=bold
   hi StatusLineNC ctermfg=21 ctermbg=254 cterm=NONE
-  hi TabLine ctermfg=21 ctermbg=231 cterm=NONE
-  hi TabLineFill ctermfg=21 ctermbg=231 cterm=NONE
-  hi TabLineSel ctermfg=231 ctermbg=21 cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=NONE
+  hi TabLine ctermfg=21 ctermbg=231 cterm=bold
+  hi TabLineFill ctermfg=21 ctermbg=231 cterm=bold
+  hi TabLineSel ctermfg=231 ctermbg=21 cterm=bold
+  hi Title ctermfg=201 ctermbg=NONE cterm=bold
   hi VertSplit ctermfg=21 ctermbg=254 cterm=NONE
   hi Visual ctermfg=NONE ctermbg=59 cterm=reverse
   hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline
@@ -162,13 +162,13 @@ if s:t_Co >= 256
   hi Ignore ctermfg=16 ctermbg=16 cterm=NONE
   hi PreProc ctermfg=213 ctermbg=NONE cterm=NONE
   hi Special ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=227 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=227 ctermbg=NONE cterm=bold
   hi Todo ctermfg=21 ctermbg=226 cterm=NONE
-  hi Type ctermfg=83 ctermbg=NONE cterm=NONE
+  hi Type ctermfg=83 ctermbg=NONE cterm=bold
   hi Underlined ctermfg=153 ctermbg=NONE cterm=underline
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=NONE
+  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -180,27 +180,27 @@ endif
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
+  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=yellow 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 Cursor ctermfg=black ctermbg=green cterm=NONE
   hi Directory ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=darkred ctermbg=NONE cterm=bold
   hi ErrorMsg ctermfg=darkred ctermbg=white cterm=reverse
   hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkblue cterm=NONE
-  hi ModeMsg ctermfg=white ctermbg=darkblue cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=white ctermbg=darkblue cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkred ctermbg=NONE cterm=bold
   hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
-  hi Question ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Question ctermfg=blue ctermbg=NONE cterm=bold
   hi Search ctermfg=white ctermbg=red cterm=NONE
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkred ctermbg=NONE cterm=NONE
@@ -208,12 +208,12 @@ if s:t_Co >= 16
   hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=cyan ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=darkblue ctermbg=white cterm=NONE
+  hi StatusLine ctermfg=darkblue ctermbg=white cterm=bold
   hi StatusLineNC ctermfg=darkblue ctermbg=grey cterm=NONE
-  hi TabLine ctermfg=darkblue ctermbg=white cterm=NONE
-  hi TabLineFill ctermfg=darkblue ctermbg=white cterm=NONE
-  hi TabLineSel ctermfg=white ctermbg=darkblue cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi TabLine ctermfg=darkblue ctermbg=white cterm=bold
+  hi TabLineFill ctermfg=darkblue ctermbg=white cterm=bold
+  hi TabLineSel ctermfg=white ctermbg=darkblue cterm=bold
+  hi Title ctermfg=magenta ctermbg=NONE cterm=bold
   hi VertSplit ctermfg=darkblue ctermbg=grey cterm=NONE
   hi Visual ctermfg=NONE ctermbg=darkgrey cterm=reverse
   hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
@@ -226,13 +226,13 @@ if s:t_Co >= 16
   hi Ignore ctermfg=black ctermbg=black cterm=NONE
   hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=yellow ctermbg=NONE cterm=bold
   hi Todo ctermfg=darkblue ctermbg=yellow cterm=NONE
-  hi Type ctermfg=green ctermbg=NONE cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=bold
   hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -241,6 +241,68 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=grey ctermbg=black cterm=NONE
+  hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=darkred ctermbg=NONE cterm=bold
+  hi ErrorMsg ctermfg=darkred ctermbg=grey cterm=bold,reverse
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=darkblue cterm=NONE
+  hi ModeMsg ctermfg=white ctermbg=darkblue cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=grey ctermbg=darkgrey cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkcyan cterm=NONE
+  hi Question ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Search ctermfg=grey ctermbg=darkred cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi StatusLine ctermfg=grey ctermbg=darkblue cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=darkblue cterm=reverse
+  hi TabLine ctermfg=grey ctermbg=darkblue cterm=bold,reverse
+  hi TabLineFill ctermfg=darkblue ctermbg=grey cterm=bold
+  hi TabLineSel ctermfg=grey ctermbg=darkblue cterm=bold
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi VertSplit ctermfg=darkblue ctermbg=grey cterm=NONE
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=grey cterm=reverse
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -357,4 +419,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/morning.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Bram Moolenaar <Bram@vim.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sat May 14 11:15:43 2022
+" Last Updated: Sun Jun 12 10:55:30 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -18,16 +18,22 @@ let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#e4e4e4', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#bcbcbc', '#0000ff', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#000000']
 endif
+hi! link Terminal Normal
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
 hi! link StatuslineTerm Statusline
 hi! link StatuslineTermNC StatuslineNC
 hi Normal guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#0000ff guibg=#cccccc gui=bold cterm=NONE
+hi EndOfBuffer guifg=#0000ff guibg=#cccccc gui=bold cterm=bold
 hi Folded guifg=#00008b guibg=#d3d3d3 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#d3d3d3 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#d3d3d3 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=NONE
+hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=bold
 hi QuickFixLine guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi StatusLine guifg=#eeeeee guibg=#000000 gui=bold cterm=NONE
+hi StatusLine guifg=#eeeeee guibg=#000000 gui=bold cterm=bold
 hi StatusLineNC guifg=#bcbcbc guibg=#000000 gui=NONE cterm=NONE
 hi VertSplit guifg=#bcbcbc guibg=#000000 gui=NONE cterm=NONE
 hi Pmenu guifg=#000000 guibg=#b2b2b2 gui=NONE cterm=NONE
@@ -36,10 +42,10 @@ hi PmenuSbar guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#000000 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=NONE
+hi TabLineSel guifg=#000000 guibg=#e4e4e4 gui=bold cterm=bold
 hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=NONE guibg=#bcbcbc gui=bold cterm=NONE
-hi NonText guifg=#0000ff guibg=#bcbcbc gui=bold cterm=NONE
+hi ToolbarButton guifg=NONE guibg=#bcbcbc gui=bold cterm=bold
+hi NonText guifg=#0000ff guibg=#bcbcbc gui=bold cterm=bold
 hi SpecialKey guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
 hi Visual guifg=NONE guibg=#d0d0d0 gui=NONE cterm=NONE
 hi VisualNOS guifg=NONE guibg=#0000ff gui=NONE cterm=NONE
@@ -49,15 +55,15 @@ hi SignColumn guifg=#00008b guibg=NONE gui=NONE cterm=NONE
 hi Underlined guifg=#6a5acd guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ff0000 guibg=#e4e4e4 gui=reverse cterm=reverse
 hi ErrorMsg guifg=#ff0000 guibg=#e4e4e4 gui=reverse cterm=reverse
-hi WarningMsg guifg=#6a0dad guibg=NONE gui=bold cterm=NONE
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=NONE
-hi ModeMsg guifg=#000000 guibg=NONE gui=bold cterm=NONE
-hi Question guifg=#008787 guibg=NONE gui=bold cterm=NONE
+hi WarningMsg guifg=#6a0dad guibg=NONE gui=bold cterm=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
+hi ModeMsg guifg=#000000 guibg=NONE gui=bold cterm=bold
+hi Question guifg=#008787 guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#e4e4e4 guibg=#6a5acd gui=NONE cterm=NONE
 hi Search guifg=#e4e4e4 guibg=#6a0dad gui=NONE cterm=NONE
 hi IncSearch guifg=#2e8b57 guibg=NONE gui=reverse cterm=reverse
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=NONE
+hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold
 hi ColorColumn guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi Cursor guifg=#e4e4e4 guibg=#2e8b57 gui=NONE cterm=NONE
 hi lCursor guifg=#e4e4e4 guibg=#a52a2a gui=NONE cterm=NONE
@@ -68,36 +74,36 @@ hi SpellRare guifg=#2e8b57 guibg=NONE guisp=#2e8b57 gui=undercurl cterm=underlin
 hi Comment guifg=#0000ff guibg=NONE gui=NONE cterm=NONE
 hi Constant guifg=#ff00ff guibg=#eeeeee gui=NONE cterm=NONE
 hi Identifier guifg=#008787 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#a52a2a guibg=NONE gui=bold cterm=NONE
+hi Statement guifg=#a52a2a guibg=NONE gui=bold cterm=bold
 hi PreProc guifg=#6a0dad guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=NONE
+hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
 hi Special guifg=#6a5acd guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Directory guifg=#008787 guibg=NONE gui=bold cterm=NONE
+hi Directory guifg=#008787 guibg=NONE gui=bold cterm=bold
 hi Conceal guifg=#0000ff guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=#a52a2a guibg=NONE gui=bold cterm=NONE
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
+hi Title guifg=#a52a2a guibg=NONE gui=bold cterm=bold
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
+  hi! link Terminal Normal
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link CurSearch Search
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineSign CursorLine
   hi! link StatuslineTerm Statusline
   hi! link StatuslineTermNC StatuslineNC
   hi Normal ctermfg=16 ctermbg=254 cterm=NONE
-  hi EndOfBuffer ctermfg=21 ctermbg=252 cterm=NONE
+  hi EndOfBuffer ctermfg=21 ctermbg=252 cterm=bold
   hi Folded ctermfg=18 ctermbg=252 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=252 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=252 cterm=NONE
-  hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=bold
   hi QuickFixLine ctermfg=16 ctermbg=226 cterm=NONE
-  hi StatusLine ctermfg=255 ctermbg=16 cterm=NONE
+  hi StatusLine ctermfg=255 ctermbg=16 cterm=bold
   hi StatusLineNC ctermfg=250 ctermbg=16 cterm=NONE
   hi VertSplit ctermfg=250 ctermbg=16 cterm=NONE
   hi Pmenu ctermfg=16 ctermbg=249 cterm=NONE
@@ -106,10 +112,10 @@ if s:t_Co >= 256
   hi PmenuThumb ctermfg=NONE ctermbg=16 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=NONE
+  hi TabLineSel ctermfg=16 ctermbg=254 cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=250 cterm=NONE
-  hi NonText ctermfg=21 ctermbg=250 cterm=NONE
+  hi ToolbarButton ctermfg=NONE ctermbg=250 cterm=bold
+  hi NonText ctermfg=21 ctermbg=250 cterm=bold
   hi SpecialKey ctermfg=250 ctermbg=NONE cterm=NONE
   hi Visual ctermfg=NONE ctermbg=252 cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=21 cterm=NONE
@@ -119,15 +125,15 @@ if s:t_Co >= 256
   hi Underlined ctermfg=62 ctermbg=NONE cterm=underline
   hi Error ctermfg=196 ctermbg=254 cterm=reverse
   hi ErrorMsg ctermfg=196 ctermbg=254 cterm=reverse
-  hi WarningMsg ctermfg=55 ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
-  hi ModeMsg ctermfg=16 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=30 ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=55 ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold
+  hi ModeMsg ctermfg=16 ctermbg=NONE cterm=bold
+  hi Question ctermfg=30 ctermbg=NONE cterm=bold
   hi Todo ctermfg=16 ctermbg=226 cterm=NONE
   hi MatchParen ctermfg=254 ctermbg=62 cterm=NONE
   hi Search ctermfg=254 ctermbg=55 cterm=NONE
   hi IncSearch ctermfg=29 ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
+  hi WildMenu ctermfg=16 ctermbg=226 cterm=bold
   hi ColorColumn ctermfg=16 ctermbg=231 cterm=NONE
   hi Cursor ctermfg=254 ctermbg=29 cterm=NONE
   hi lCursor ctermfg=254 ctermbg=124 cterm=NONE
@@ -138,20 +144,14 @@ if s:t_Co >= 256
   hi Comment ctermfg=21 ctermbg=NONE cterm=NONE
   hi Constant ctermfg=201 ctermbg=255 cterm=NONE
   hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=124 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=124 ctermbg=NONE cterm=bold
   hi PreProc ctermfg=55 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=29 ctermbg=NONE cterm=NONE
+  hi Type ctermfg=29 ctermbg=NONE cterm=bold
   hi Special ctermfg=62 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=30 ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=30 ctermbg=NONE cterm=bold
   hi Conceal ctermfg=21 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=124 ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=124 ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -161,8 +161,6 @@ if s:t_Co >= 256
 endif
 
 if s:t_Co >= 16
-  hi! link StatuslineTerm Statusline
-  hi! link StatuslineTermNC StatuslineNC
   hi Normal ctermfg=black ctermbg=grey cterm=NONE
   hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
@@ -170,7 +168,7 @@ if s:t_Co >= 16
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkred ctermbg=NONE cterm=underline
   hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE
-  hi StatusLine ctermfg=white ctermbg=black cterm=NONE
+  hi StatusLine ctermfg=white ctermbg=black cterm=bold
   hi StatusLineNC ctermfg=darkgrey ctermbg=black cterm=NONE
   hi VertSplit ctermfg=darkgrey ctermbg=black cterm=NONE
   hi Pmenu ctermfg=black ctermbg=white cterm=NONE
@@ -179,10 +177,10 @@ if s:t_Co >= 16
   hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE
   hi TabLine ctermfg=black ctermbg=white cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=grey cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=white cterm=NONE
-  hi NonText ctermfg=blue ctermbg=white cterm=NONE
+  hi ToolbarButton ctermfg=NONE ctermbg=white cterm=bold
+  hi NonText ctermfg=blue ctermbg=white cterm=bold
   hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Visual ctermfg=NONE ctermbg=white cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=blue cterm=NONE
@@ -192,15 +190,15 @@ if s:t_Co >= 16
   hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
   hi Error ctermfg=red ctermbg=grey cterm=reverse
   hi ErrorMsg ctermfg=red ctermbg=grey cterm=reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi ModeMsg ctermfg=black ctermbg=NONE cterm=NONE
-  hi Question ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi ModeMsg ctermfg=black ctermbg=NONE cterm=bold
+  hi Question ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi Todo ctermfg=black ctermbg=yellow cterm=NONE
   hi MatchParen ctermfg=grey ctermbg=darkblue cterm=NONE
   hi Search ctermfg=grey ctermbg=darkmagenta cterm=NONE
   hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
   hi ColorColumn ctermfg=black ctermbg=white cterm=NONE
   hi Cursor ctermfg=grey ctermbg=darkgreen cterm=NONE
   hi lCursor ctermfg=grey ctermbg=darkred cterm=NONE
@@ -211,20 +209,14 @@ if s:t_Co >= 16
   hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
   hi Constant ctermfg=magenta ctermbg=white cterm=NONE
   hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
   hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi Conceal ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=darkred ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -233,6 +225,69 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=black ctermbg=gray cterm=NONE
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse
+  hi VertSplit ctermfg=black ctermbg=gray cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+  hi TabLine ctermfg=gray ctermbg=black cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=black ctermbg=gray cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Error ctermfg=darkred ctermbg=gray cterm=reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=reverse
+  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi MatchParen ctermfg=gray ctermbg=darkblue cterm=NONE
+  hi Search ctermfg=gray ctermbg=darkmagenta cterm=NONE
+  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
+  hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkred ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -323,6 +378,14 @@ endif
 " Color: error       #ff0000        196            red
 " Color: colorcolumn #ffffff        231            white
 " Color: spellcap    #00d700        40             green
+" Color: black       #000000        16             black
+" Color: darkred     #870000        88             darkred
+" Color: darkgreen   #008700        28             darkgreen
+" Color: darkyellow  #878700        100            darkyellow
+" Color: darkblue    #000087        18             darkblue
+" Color: darkmagenta #870087        18             darkmagenta
+" Color: darkcyan    #008787        30             darkcyan
+" Color: gray        #878787        102            gray
 " Term colors: bg0     statement constant preproc identifier type special bg1
 " Term colors: comment statement constant preproc identifier type special fg0
 " Color: bgDiffA     #5F875F        65             darkgreen
@@ -331,4 +394,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/murphy.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ron Aaron <ron@ronware.org>.
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:41 2022
+" Last Updated: Sun Jun 12 10:56:21 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -18,6 +18,12 @@ let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#303030', '#ffa700', '#005f00', '#ffd7af', '#87afff', '#ffafaf', '#00afaf', '#bcbcbc', '#444444', '#ff0000', '#00875f', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']
 endif
+hi! link Terminal Normal
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
 hi Normal guifg=#87ff87 guibg=#000000 gui=NONE cterm=NONE
@@ -33,14 +39,14 @@ hi TabLineFill guifg=NONE guibg=#303030 gui=NONE cterm=NONE
 hi TabLine guifg=#87ff87 guibg=#444444 gui=NONE cterm=NONE
 hi TabLineSel guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
 hi ToolbarLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#444444 gui=bold cterm=NONE
+hi ToolbarButton guifg=#ffffff guibg=#444444 gui=bold cterm=bold
 hi NonText guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
 hi QuickFixLine guifg=#303030 guibg=#00afaf gui=NONE cterm=NONE
 hi Folded guifg=#00afaf guibg=#303030 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#444444 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#444444 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=NONE
+hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold
 hi ColorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
 hi Visual guifg=#ffffff guibg=#005f00 gui=NONE cterm=NONE
 hi VisualNOS guifg=#ffffff guibg=#005f00 gui=NONE cterm=NONE
@@ -50,10 +56,10 @@ hi SignColumn guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
 hi Underlined guifg=#00afaf guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
 hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi ModeMsg guifg=#87ff87 guibg=NONE gui=bold cterm=NONE
-hi WarningMsg guifg=#ffa700 guibg=NONE gui=bold cterm=NONE
-hi MoreMsg guifg=#005f00 guibg=NONE gui=bold cterm=NONE
-hi Question guifg=#00ffff guibg=NONE gui=bold cterm=NONE
+hi ModeMsg guifg=#87ff87 guibg=NONE gui=bold cterm=bold
+hi WarningMsg guifg=#ffa700 guibg=NONE gui=bold cterm=bold
+hi MoreMsg guifg=#005f00 guibg=NONE gui=bold cterm=bold
+hi Question guifg=#00ffff guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#0000ff guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#303030 guibg=#ffd7af gui=NONE cterm=NONE
 hi Search guifg=#ffffff guibg=#0000ff gui=NONE cterm=NONE
@@ -75,19 +81,19 @@ hi Special guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
 hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi Conceal guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=NONE
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
+hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
+  hi! link Terminal Normal
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link CurSearch Search
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineSign CursorLine
   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
   hi Normal ctermfg=120 ctermbg=16 cterm=NONE
@@ -103,14 +109,14 @@ if s:t_Co >= 256
   hi TabLine ctermfg=120 ctermbg=238 cterm=NONE
   hi TabLineSel ctermfg=231 ctermbg=16 cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=236 cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=238 cterm=NONE
+  hi ToolbarButton ctermfg=231 ctermbg=238 cterm=bold
   hi NonText ctermfg=37 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=37 ctermbg=NONE cterm=NONE
   hi QuickFixLine ctermfg=236 ctermbg=37 cterm=NONE
   hi Folded ctermfg=37 ctermbg=236 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=238 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=238 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
   hi ColorColumn ctermfg=NONE ctermbg=235 cterm=NONE
   hi Visual ctermfg=231 ctermbg=22 cterm=NONE
   hi VisualNOS ctermfg=231 ctermbg=22 cterm=NONE
@@ -120,10 +126,10 @@ if s:t_Co >= 256
   hi Underlined ctermfg=37 ctermbg=NONE cterm=underline
   hi Error ctermfg=231 ctermbg=196 cterm=NONE
   hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
-  hi ModeMsg ctermfg=120 ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=214 ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=22 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=51 ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=120 ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=214 ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=22 ctermbg=NONE cterm=bold
+  hi Question ctermfg=51 ctermbg=NONE cterm=bold
   hi Todo ctermfg=21 ctermbg=226 cterm=NONE
   hi MatchParen ctermfg=236 ctermbg=223 cterm=NONE
   hi Search ctermfg=231 ctermbg=21 cterm=NONE
@@ -145,13 +151,7 @@ if s:t_Co >= 256
   hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=250 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=201 ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -161,8 +161,6 @@ if s:t_Co >= 256
 endif
 
 if s:t_Co >= 16
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
   hi Normal ctermfg=green ctermbg=black cterm=NONE
   hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
   hi StatusLine ctermfg=white ctermbg=darkblue cterm=NONE
@@ -176,7 +174,7 @@ if s:t_Co >= 16
   hi TabLine ctermfg=green ctermbg=darkgrey cterm=NONE
   hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
   hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
@@ -193,10 +191,10 @@ if s:t_Co >= 16
   hi Underlined ctermfg=darkcyan ctermbg=NONE cterm=underline
   hi Error ctermfg=white ctermbg=red cterm=NONE
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
-  hi ModeMsg ctermfg=green ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=green ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Question ctermfg=cyan ctermbg=NONE cterm=bold
   hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
   hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Search ctermfg=white ctermbg=blue cterm=NONE
@@ -218,13 +216,7 @@ if s:t_Co >= 16
   hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=magenta ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -233,6 +225,70 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=darkgreen ctermbg=black cterm=NONE
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=darkblue ctermbg=grey cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLine ctermfg=grey ctermbg=black cterm=reverse
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=reverse,underline
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+  hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
+  hi ModeMsg ctermfg=grey ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Question ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Search ctermfg=grey ctermbg=darkblue cterm=NONE
+  hi IncSearch ctermfg=darkred ctermbg=NONE cterm=reverse
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi Comment ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=grey ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Type ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -332,4 +388,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/pablo.vim

@@ -3,7 +3,7 @@
 " Maintainer:   Original maintainerRon Aaron <ron@ronware.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:41 2022
+" Last Updated: Sun Jun 12 10:57:11 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -27,7 +27,7 @@ hi! link CursorLineSign CursorLine
 hi Comment guifg=#808080 guibg=NONE gui=NONE cterm=NONE
 hi Constant guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#00c0c0 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#c0c000 guibg=NONE gui=bold cterm=NONE
+hi Statement guifg=#c0c000 guibg=NONE gui=bold cterm=bold
 hi PreProc guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
 hi Type guifg=#00c000 guibg=NONE gui=NONE cterm=NONE
 hi Special guifg=#0000ff guibg=NONE gui=NONE cterm=NONE
@@ -39,12 +39,12 @@ hi Conceal guifg=#e5e5e5 guibg=#a9a9a9 gui=NONE cterm=NONE
 hi Cursor guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi lCursor guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=NONE
+hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
 hi Directory guifg=#00c000 guibg=NONE gui=NONE cterm=NONE
 hi Search guifg=#000000 guibg=#c0c000 gui=NONE cterm=NONE
 hi IncSearch guifg=#ffffff guibg=NONE gui=reverse cterm=reverse
-hi NonText guifg=#0000ff guibg=NONE gui=bold cterm=NONE
-hi EndOfBuffer guifg=#0000ff guibg=NONE gui=bold cterm=NONE
+hi NonText guifg=#0000ff guibg=NONE gui=bold cterm=bold
+hi EndOfBuffer guifg=#0000ff guibg=NONE gui=bold cterm=bold
 hi ErrorMsg guifg=#ffffff guibg=#cd0000 gui=NONE cterm=NONE
 hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
 hi SignColumn guifg=#00ffff guibg=#a9a9a9 gui=NONE cterm=NONE
@@ -53,16 +53,16 @@ hi FoldColumn guifg=#7f7f7f guibg=#303030 gui=NONE cterm=NONE
 hi Folded guifg=#7f7f7f guibg=#303030 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=#3a3a3a gui=bold cterm=NONE
+hi CursorLineNr guifg=#ffff00 guibg=#3a3a3a gui=bold cterm=bold
 hi Visual guifg=#00008b guibg=#a9a9a9 gui=NONE cterm=NONE
 hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline
 hi LineNr guifg=#7f7f7f guibg=NONE gui=NONE cterm=NONE
 hi! link LineNrAbove LineNr
 hi! link LineNrBelow LineNr
 hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=NONE
-hi MoreMsg guifg=#5c5cff guibg=NONE gui=bold cterm=NONE
-hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=NONE
+hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+hi MoreMsg guifg=#5c5cff guibg=NONE gui=bold cterm=bold
+hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
 hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi QuickFixLine guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
@@ -75,9 +75,9 @@ hi StatusLineNC guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi VertSplit guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi TabLine guifg=#ffffff guibg=#7f7f7f gui=NONE cterm=NONE
 hi TabLineFill guifg=NONE guibg=#000000 gui=reverse cterm=reverse
-hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=NONE
+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=NONE
+hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold
 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
@@ -98,7 +98,7 @@ if s:t_Co >= 256
   hi Comment ctermfg=244 ctermbg=NONE cterm=NONE
   hi Constant ctermfg=51 ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=37 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=142 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=142 ctermbg=NONE cterm=bold
   hi PreProc ctermfg=46 ctermbg=NONE cterm=NONE
   hi Type ctermfg=34 ctermbg=NONE cterm=NONE
   hi Special ctermfg=21 ctermbg=NONE cterm=NONE
@@ -110,12 +110,12 @@ if s:t_Co >= 256
   hi Cursor ctermfg=16 ctermbg=231 cterm=NONE
   hi lCursor ctermfg=16 ctermbg=231 cterm=NONE
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi Title ctermfg=225 ctermbg=NONE cterm=NONE
+  hi Title ctermfg=225 ctermbg=NONE cterm=bold
   hi Directory ctermfg=34 ctermbg=NONE cterm=NONE
   hi Search ctermfg=16 ctermbg=142 cterm=NONE
   hi IncSearch ctermfg=231 ctermbg=NONE cterm=reverse
-  hi NonText ctermfg=63 ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=63 ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=63 ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=63 ctermbg=NONE cterm=bold
   hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
   hi WarningMsg ctermfg=224 ctermbg=NONE cterm=NONE
   hi SignColumn ctermfg=51 ctermbg=248 cterm=NONE
@@ -124,16 +124,16 @@ if s:t_Co >= 256
   hi Folded ctermfg=102 ctermbg=236 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=237 cterm=NONE
+  hi CursorLineNr ctermfg=226 ctermbg=237 cterm=bold
   hi Visual ctermfg=20 ctermbg=248 cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline
   hi LineNr ctermfg=102 ctermbg=NONE cterm=NONE
   hi! link LineNrAbove LineNr
   hi! link LineNrBelow LineNr
   hi MatchParen ctermfg=NONE ctermbg=44 cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=63 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=121 ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=63 ctermbg=NONE cterm=bold
+  hi Question ctermfg=121 ctermbg=NONE cterm=bold
   hi SpecialKey ctermfg=81 ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
   hi QuickFixLine ctermfg=16 ctermbg=44 cterm=NONE
@@ -146,9 +146,9 @@ if s:t_Co >= 256
   hi VertSplit ctermfg=16 ctermbg=231 cterm=NONE
   hi TabLine ctermfg=231 ctermbg=102 cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=16 cterm=reverse
-  hi TabLineSel ctermfg=231 ctermbg=16 cterm=NONE
+  hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
-  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=NONE
+  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold
   hi Pmenu ctermfg=fg ctermbg=236 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=16 ctermbg=254 cterm=NONE
@@ -172,7 +172,7 @@ if s:t_Co >= 16
   hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
   hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Special ctermfg=blue ctermbg=NONE cterm=NONE
@@ -184,12 +184,12 @@ if s:t_Co >= 16
   hi Cursor ctermfg=black ctermbg=white cterm=NONE
   hi lCursor ctermfg=black ctermbg=white cterm=NONE
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=bold
   hi Directory ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
   hi IncSearch ctermfg=white ctermbg=NONE cterm=reverse
-  hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=blue ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=bold
   hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
   hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
   hi SignColumn ctermfg=cyan ctermbg=black cterm=NONE
@@ -205,9 +205,9 @@ if s:t_Co >= 16
   hi! link LineNrAbove LineNr
   hi! link LineNrBelow LineNr
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=blue ctermbg=NONE cterm=bold
+  hi Question ctermfg=green ctermbg=NONE cterm=bold
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
   hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
@@ -220,9 +220,9 @@ if s:t_Co >= 16
   hi VertSplit ctermfg=black ctermbg=white cterm=NONE
   hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=black cterm=reverse
-  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
+  hi TabLineSel ctermfg=white ctermbg=black cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
+  hi ToolbarButton 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
@@ -235,6 +235,75 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=grey ctermbg=black cterm=NONE
+  hi EndOfBuffer ctermfg=grey ctermbg=black cterm=bold
+  hi StatusLine ctermfg=darkblue ctermbg=grey cterm=reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi StatusLineTerm ctermfg=darkblue ctermbg=grey cterm=reverse
+  hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuThumb ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi VisualNOS ctermfg=black ctermbg=grey cterm=NONE
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+  hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
+  hi ModeMsg ctermfg=grey ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi Comment ctermfg=grey ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -359,4 +428,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/peachpuff.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:43 2022
+" Last Updated: Sun Jun 12 10:58:17 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -18,27 +18,33 @@ let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#ffdab9', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#737373', '#406090', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#000000']
 endif
+hi! link Terminal Normal
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
 hi Normal guifg=#000000 guibg=#ffdab9 gui=NONE cterm=NONE
 hi Folded guifg=#000000 guibg=#e3c1a5 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#f5c195 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#f5c195 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#cd0000 guibg=NONE gui=bold cterm=NONE
+hi CursorLineNr guifg=#cd0000 guibg=NONE gui=bold cterm=bold
 hi QuickFixLine guifg=#000000 guibg=#ffaf87 gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#737373 guibg=NONE gui=NONE cterm=NONE
-hi StatusLine guifg=#ffffff guibg=#000000 gui=bold cterm=NONE
-hi StatusLineNC guifg=#ffdab9 guibg=#737373 gui=bold cterm=NONE
-hi StatusLineTerm guifg=#ffffff guibg=#2e8b57 gui=bold cterm=NONE
-hi StatusLineTermNC guifg=#ffdab9 guibg=#008b8b gui=bold cterm=NONE
+hi StatusLine guifg=#ffffff guibg=#000000 gui=bold cterm=bold
+hi StatusLineNC guifg=#ffdab9 guibg=#737373 gui=bold cterm=bold
+hi StatusLineTerm guifg=#ffffff guibg=#2e8b57 gui=bold cterm=bold
+hi StatusLineTermNC guifg=#ffdab9 guibg=#008b8b gui=bold cterm=bold
 hi VertSplit guifg=#ffdab9 guibg=#737373 gui=NONE cterm=NONE
 hi Pmenu guifg=#000000 guibg=#ffaf87 gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#f5c195 gui=bold 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 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=NONE
+hi TabLineSel guifg=#000000 guibg=#ffdab9 gui=bold cterm=bold
 hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#ffdab9 guibg=#737373 gui=bold cterm=NONE
+hi ToolbarButton guifg=#ffdab9 guibg=#737373 gui=bold cterm=bold
 hi NonText guifg=#737373 guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#737373 guibg=NONE gui=NONE cterm=NONE
 hi Visual guifg=#000000 guibg=#cccccc gui=NONE cterm=NONE
@@ -47,17 +53,17 @@ hi LineNr guifg=#cd0000 guibg=NONE gui=NONE cterm=NONE
 hi FoldColumn guifg=#406090 guibg=NONE gui=NONE cterm=NONE
 hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Underlined guifg=#6a5acd guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ff0000 guibg=#ffffff gui=bold,reverse cterm=reverse
-hi ErrorMsg guifg=#ff0000 guibg=#ffffff gui=bold,reverse cterm=reverse
-hi WarningMsg guifg=#cd00cd guibg=#ffdab9 gui=bold cterm=NONE
-hi MoreMsg guifg=#2e8b57 guibg=#ffdab9 gui=bold cterm=NONE
-hi ModeMsg guifg=#000000 guibg=#ffdab9 gui=bold cterm=NONE
-hi Question guifg=#c00058 guibg=NONE gui=bold cterm=NONE
+hi Error guifg=#ff0000 guibg=#ffffff gui=bold,reverse cterm=bold,reverse
+hi ErrorMsg guifg=#ff0000 guibg=#ffffff gui=bold,reverse cterm=bold,reverse
+hi WarningMsg guifg=#cd00cd guibg=#ffdab9 gui=bold cterm=bold
+hi MoreMsg guifg=#2e8b57 guibg=#ffdab9 gui=bold cterm=bold
+hi ModeMsg guifg=#000000 guibg=#ffdab9 gui=bold cterm=bold
+hi Question guifg=#c00058 guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#6a5acd guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#ffdab9 guibg=#6a5acd gui=NONE cterm=NONE
 hi Search guifg=#ffdab9 guibg=#cd00cd gui=NONE cterm=NONE
 hi IncSearch guifg=#2e8b57 guibg=NONE gui=reverse cterm=reverse
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=NONE
+hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold
 hi ColorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
 hi Cursor guifg=#ffdab9 guibg=#000000 gui=NONE cterm=NONE
 hi lCursor guifg=#000000 guibg=#c00058 gui=NONE cterm=NONE
@@ -68,47 +74,47 @@ hi SpellRare guifg=#6a5acd guibg=NONE guisp=#6a5acd gui=undercurl cterm=underlin
 hi Comment guifg=#406090 guibg=NONE gui=NONE cterm=NONE
 hi Constant guifg=#c00058 guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#a52a2a guibg=NONE gui=bold cterm=NONE
+hi Statement guifg=#a52a2a guibg=NONE gui=bold cterm=bold
 hi PreProc guifg=#cd00cd guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=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=NONE
+hi Directory guifg=#008b8b guibg=NONE gui=bold cterm=bold
 hi Conceal guifg=#406090 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=NONE
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
+hi Title guifg=#cd00cd guibg=NONE gui=bold cterm=bold
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
+  hi! link Terminal Normal
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link CurSearch Search
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineSign CursorLine
   hi Normal ctermfg=16 ctermbg=223 cterm=NONE
   hi Folded ctermfg=16 ctermbg=252 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=180 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=180 cterm=NONE
-  hi CursorLineNr ctermfg=160 ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=160 ctermbg=NONE cterm=bold
   hi QuickFixLine ctermfg=16 ctermbg=216 cterm=NONE
   hi EndOfBuffer ctermfg=243 ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=231 ctermbg=16 cterm=NONE
-  hi StatusLineNC ctermfg=223 ctermbg=243 cterm=NONE
-  hi StatusLineTerm ctermfg=231 ctermbg=29 cterm=NONE
-  hi StatusLineTermNC ctermfg=223 ctermbg=30 cterm=NONE
+  hi StatusLine ctermfg=231 ctermbg=16 cterm=bold
+  hi StatusLineNC ctermfg=223 ctermbg=243 cterm=bold
+  hi StatusLineTerm ctermfg=231 ctermbg=29 cterm=bold
+  hi StatusLineTermNC ctermfg=223 ctermbg=30 cterm=bold
   hi VertSplit ctermfg=223 ctermbg=243 cterm=NONE
   hi Pmenu ctermfg=16 ctermbg=216 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=180 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 TabLine ctermfg=223 ctermbg=243 cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=16 ctermbg=223 cterm=NONE
+  hi TabLineSel ctermfg=16 ctermbg=223 cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=223 ctermbg=243 cterm=NONE
+  hi ToolbarButton ctermfg=223 ctermbg=243 cterm=bold
   hi NonText ctermfg=243 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=243 ctermbg=NONE cterm=NONE
   hi Visual ctermfg=16 ctermbg=252 cterm=NONE
@@ -117,17 +123,17 @@ if s:t_Co >= 256
   hi FoldColumn ctermfg=25 ctermbg=NONE cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=62 ctermbg=NONE cterm=underline
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi ErrorMsg ctermfg=196 ctermbg=231 cterm=reverse
-  hi WarningMsg ctermfg=164 ctermbg=223 cterm=NONE
-  hi MoreMsg ctermfg=29 ctermbg=223 cterm=NONE
-  hi ModeMsg ctermfg=16 ctermbg=223 cterm=NONE
-  hi Question ctermfg=161 ctermbg=NONE cterm=NONE
+  hi Error ctermfg=196 ctermbg=231 cterm=bold,reverse
+  hi ErrorMsg ctermfg=196 ctermbg=231 cterm=bold,reverse
+  hi WarningMsg ctermfg=164 ctermbg=223 cterm=bold
+  hi MoreMsg ctermfg=29 ctermbg=223 cterm=bold
+  hi ModeMsg ctermfg=16 ctermbg=223 cterm=bold
+  hi Question ctermfg=161 ctermbg=NONE cterm=bold
   hi Todo ctermfg=62 ctermbg=226 cterm=NONE
   hi MatchParen ctermfg=223 ctermbg=62 cterm=NONE
   hi Search ctermfg=223 ctermbg=164 cterm=NONE
   hi IncSearch ctermfg=29 ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
+  hi WildMenu ctermfg=16 ctermbg=226 cterm=bold
   hi ColorColumn ctermfg=NONE ctermbg=255 cterm=NONE
   hi Cursor ctermfg=223 ctermbg=16 cterm=NONE
   hi lCursor ctermfg=16 ctermbg=161 cterm=NONE
@@ -138,20 +144,14 @@ if s:t_Co >= 256
   hi Comment ctermfg=25 ctermbg=NONE cterm=NONE
   hi Constant ctermfg=161 ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=124 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=124 ctermbg=NONE cterm=bold
   hi PreProc ctermfg=164 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=29 ctermbg=NONE cterm=NONE
+  hi Type ctermfg=29 ctermbg=NONE cterm=bold
   hi Special ctermfg=62 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=30 ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=30 ctermbg=NONE cterm=bold
   hi Conceal ctermfg=25 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=164 ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=164 ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -168,20 +168,20 @@ if s:t_Co >= 16
   hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=underline
   hi QuickFixLine ctermfg=black ctermbg=grey cterm=NONE
   hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=white ctermbg=black cterm=NONE
-  hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi StatusLineTerm ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi StatusLineTermNC ctermfg=white ctermbg=darkcyan cterm=NONE
+  hi StatusLine ctermfg=white ctermbg=black cterm=bold
+  hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=bold
+  hi StatusLineTerm ctermfg=white ctermbg=darkgreen cterm=bold
+  hi StatusLineTermNC ctermfg=white ctermbg=darkcyan cterm=bold
   hi VertSplit ctermfg=white ctermbg=darkgrey cterm=NONE
   hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow 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 TabLine ctermfg=white ctermbg=darkgrey cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
   hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Visual ctermfg=black ctermbg=grey cterm=NONE
@@ -190,17 +190,17 @@ if s:t_Co >= 16
   hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
-  hi Error ctermfg=darkred ctermbg=white cterm=reverse
-  hi ErrorMsg ctermfg=darkred ctermbg=white cterm=reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=white cterm=NONE
-  hi ModeMsg ctermfg=black ctermbg=white cterm=NONE
-  hi Question ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=white cterm=bold,reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=white cterm=bold,reverse
+  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=white cterm=bold
+  hi ModeMsg ctermfg=black ctermbg=white cterm=bold
+  hi Question ctermfg=darkred ctermbg=NONE cterm=bold
   hi Todo ctermfg=darkblue ctermbg=yellow cterm=NONE
   hi MatchParen ctermfg=white ctermbg=darkblue cterm=NONE
   hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE
   hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
   hi ColorColumn ctermfg=NONE ctermbg=grey cterm=NONE
   hi Cursor ctermfg=white ctermbg=black cterm=NONE
   hi lCursor ctermfg=black ctermbg=darkred cterm=NONE
@@ -211,20 +211,14 @@ if s:t_Co >= 16
   hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
   hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -233,6 +227,71 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=black ctermbg=gray cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=underline
+  hi QuickFixLine ctermfg=gray ctermbg=darkcyan cterm=NONE
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse
+  hi StatusLineTerm ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=black ctermbg=gray cterm=reverse
+  hi VertSplit ctermfg=black ctermbg=gray cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+  hi TabLine ctermfg=gray ctermbg=black cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi LineNr ctermfg=black ctermbg=NONE cterm=bold
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse
+  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi ModeMsg ctermfg=black ctermbg=NONE cterm=bold
+  hi Question ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi MatchParen ctermfg=gray ctermbg=darkblue cterm=NONE
+  hi Search ctermfg=gray ctermbg=darkmagenta cterm=NONE
+  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
+  hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -324,6 +383,14 @@ endif
 " Color: blue        #0000ff        21             darkblue
 " Color: red         #ff0000        196            darkred
 " Color: colorcolumn #eeeeee        255            grey
+" Color: black       #000000        16             black
+" Color: darkred     #870000        88             darkred
+" Color: darkgreen   #008700        28             darkgreen
+" Color: darkyellow  #878700        100            darkyellow
+" Color: darkblue    #000087        18             darkblue
+" Color: darkmagenta #870087        18             darkmagenta
+" Color: darkcyan    #008787        30             darkcyan
+" Color: gray        #878787        102            gray
 " Term colors: bg0     statement constant preproc identifier type special bg1
 " Term colors: comment statement constant preproc identifier type special fg0
 " Color: bgDiffA     #5F875F        65             darkgreen
@@ -332,4 +399,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/ron.vim

@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:43 2022
+" Last Updated: Sat 11 Jun 2022 11:29:07 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -44,6 +44,8 @@ hi! link lCursor Cursor
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
@@ -107,8 +109,6 @@ hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
 hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
 hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=NONE
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
@@ -174,8 +174,6 @@ if s:t_Co >= 256
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
   hi ToolbarButton ctermfg=16 ctermbg=254 cterm=NONE
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -244,8 +242,6 @@ if s:t_Co >= 16
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
   hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -254,6 +250,72 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=darkcyan ctermbg=black cterm=NONE
+  hi ColorColumn ctermfg=darkcyan ctermbg=darkred cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=underline
+  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi ErrorMsg ctermfg=darkred ctermbg=grey cterm=reverse
+  hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=black cterm=reverse
+  hi IncSearch ctermfg=darkyellow ctermbg=darkblue cterm=NONE
+  hi LineNr ctermfg=grey ctermbg=NONE cterm=bold
+  hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=bold
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=grey ctermbg=darkgrey cterm=NONE
+  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 Question ctermfg=darkgreen ctermbg=black cterm=bold
+  hi Search ctermfg=black ctermbg=grey cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=darkblue ctermbg=grey cterm=bold,reverse
+  hi StatusLineNC ctermfg=darkblue ctermbg=grey cterm=reverse
+  hi VertSplit ctermfg=darkblue ctermbg=darkblue cterm=NONE
+  hi TabLine ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi TabLineFill ctermfg=darkblue ctermbg=darkblue cterm=NONE
+  hi TabLineSel ctermfg=darkcyan ctermbg=black cterm=bold
+  hi Terminal ctermfg=darkcyan ctermbg=black cterm=NONE
+  hi Title ctermfg=grey ctermbg=NONE cterm=bold
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
+  hi WarningMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi Comment ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Error ctermfg=darkred ctermbg=grey cterm=bold,reverse
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
+  hi Label ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Operator ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=bold
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -375,4 +437,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/shine.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer is Yasuhiro Matsumoto <mattn@mail.goo.ne.jp>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:44 2022
+" Last Updated: Sun Jun 12 11:02:11 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -18,16 +18,25 @@ let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#000000', '#8b0000', '#006400', '#ffff00', '#00008b', '#6a0dad', '#008b8b', '#dadada', '#767676', '#ffafaf', '#90ee90', '#ffff60', '#add8e6', '#ff00ff', '#00ffff', '#ffffff']
 endif
+hi! link Terminal Normal
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
+hi! link EndOfBuffer NonText
+hi! link ErrorMsg Error
+hi! link Tag Special
+hi! link Operator Statement
 hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi Folded guifg=#00008b guibg=#dadada gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#dadada gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#dadada gui=NONE cterm=NONE
 hi CursorLineNr guifg=NONE guibg=#dadada gui=NONE cterm=NONE
 hi QuickFixLine guifg=#000000 guibg=#ff8c00 gui=NONE cterm=NONE
-hi! link EndOfBuffer NonText
-hi StatusLine guifg=#ffffff guibg=#000000 gui=bold cterm=NONE
+hi StatusLine guifg=#ffffff guibg=#000000 gui=bold cterm=bold
 hi StatusLineNC guifg=#ffffff guibg=#a8a8a8 gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#000000 guibg=#90ee90 gui=bold cterm=NONE
+hi StatusLineTerm guifg=#000000 guibg=#90ee90 gui=bold cterm=bold
 hi StatusLineTermNC guifg=#dadada guibg=#006400 gui=NONE cterm=NONE
 hi VertSplit guifg=#a8a8a8 guibg=#a8a8a8 gui=NONE cterm=NONE
 hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
@@ -36,9 +45,9 @@ hi PmenuSbar guifg=#ffffff guibg=#ffffff gui=NONE cterm=NONE
 hi PmenuThumb guifg=#767676 guibg=#767676 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=NONE
+hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold
 hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=NONE guibg=#a8a8a8 gui=bold cterm=NONE
+hi ToolbarButton guifg=NONE guibg=#a8a8a8 gui=bold cterm=bold
 hi NonText guifg=#add8e6 guibg=#ffffff gui=NONE cterm=NONE
 hi SpecialKey guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE
 hi Visual guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
@@ -48,7 +57,6 @@ hi FoldColumn guifg=#767676 guibg=NONE gui=NONE cterm=NONE
 hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Underlined guifg=#6a0dad guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi! link ErrorMsg Error
 hi WarningMsg guifg=#6a0dad guibg=#ffffff gui=NONE cterm=NONE
 hi MoreMsg guifg=#006400 guibg=#ffffff gui=NONE cterm=NONE
 hi ModeMsg guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
@@ -57,7 +65,7 @@ hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#ffffff guibg=#ffafaf gui=NONE cterm=NONE
 hi Search guifg=#ffffff guibg=#6a0dad gui=NONE cterm=NONE
 hi IncSearch guifg=#008b8b guibg=#ffff00 gui=reverse cterm=reverse
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=NONE
+hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold
 hi ColorColumn guifg=#000000 guibg=#ffafaf gui=NONE cterm=NONE
 hi Cursor guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
 hi lCursor guifg=#000000 guibg=#a07070 gui=NONE cterm=NONE
@@ -65,45 +73,46 @@ hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
 hi SpellCap guifg=#2e8b57 guibg=NONE guisp=#2e8b57 gui=undercurl cterm=underline
 hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
 hi SpellRare guifg=#00008b guibg=NONE guisp=#00008b gui=undercurl cterm=underline
+hi Statement guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
+hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
+hi Comment guifg=#a8a8a8 guibg=NONE gui=bold cterm=NONE
+hi StorageClass guifg=#ff0000 guibg=NONE gui=bold cterm=bold
+hi Conceal guifg=#dadada guibg=#767676 gui=NONE cterm=NONE
 hi Identifier guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#006400 guibg=NONE gui=bold cterm=NONE
 hi Constant guifg=#a07070 guibg=NONE gui=NONE cterm=NONE
-hi Number guifg=#a07070 guibg=NONE gui=bold cterm=NONE
-hi Float guifg=#a07070 guibg=NONE gui=bold cterm=NONE
+hi Number guifg=#a07070 guibg=NONE gui=bold cterm=bold
+hi Float guifg=#a07070 guibg=NONE gui=bold cterm=bold
 hi PreProc guifg=#6a0dad guibg=NONE gui=NONE cterm=NONE
 hi Special guifg=#ff8c00 guibg=NONE gui=NONE cterm=NONE
 hi SpecialChar guifg=#00008b guibg=NONE gui=NONE cterm=NONE
-hi! link Tag Special
-hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=NONE
-hi! link Operator Statement
-hi Directory guifg=#008b8b guibg=NONE gui=bold cterm=NONE
-hi Comment guifg=#a8a8a8 guibg=NONE gui=bold cterm=NONE
-hi StorageClass guifg=#ff0000 guibg=NONE gui=bold cterm=NONE
-hi Conceal guifg=#dadada guibg=#767676 gui=NONE cterm=NONE
+hi Directory guifg=#008b8b guibg=NONE gui=bold cterm=bold
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#006400 guibg=NONE gui=bold cterm=NONE
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
+hi Title guifg=#006400 guibg=NONE gui=bold cterm=bold
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
+  hi! link Terminal Normal
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link CurSearch Search
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineSign CursorLine
+  hi! link EndOfBuffer NonText
+  hi! link ErrorMsg Error
+  hi! link Tag Special
+  hi! link Operator Statement
   hi Normal ctermfg=16 ctermbg=231 cterm=NONE
   hi Folded ctermfg=18 ctermbg=253 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=253 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=253 cterm=NONE
   hi CursorLineNr ctermfg=NONE ctermbg=253 cterm=NONE
   hi QuickFixLine ctermfg=16 ctermbg=208 cterm=NONE
-  hi! link EndOfBuffer NonText
-  hi StatusLine ctermfg=231 ctermbg=16 cterm=NONE
+  hi StatusLine ctermfg=231 ctermbg=16 cterm=bold
   hi StatusLineNC ctermfg=231 ctermbg=248 cterm=NONE
-  hi StatusLineTerm ctermfg=16 ctermbg=120 cterm=NONE
+  hi StatusLineTerm ctermfg=16 ctermbg=120 cterm=bold
   hi StatusLineTermNC ctermfg=253 ctermbg=22 cterm=NONE
   hi VertSplit ctermfg=248 ctermbg=248 cterm=NONE
   hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
@@ -112,9 +121,9 @@ if s:t_Co >= 256
   hi PmenuThumb ctermfg=243 ctermbg=243 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=NONE
+  hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=248 cterm=NONE
+  hi ToolbarButton ctermfg=NONE ctermbg=248 cterm=bold
   hi NonText ctermfg=153 ctermbg=231 cterm=NONE
   hi SpecialKey ctermfg=153 ctermbg=NONE cterm=NONE
   hi Visual ctermfg=16 ctermbg=248 cterm=NONE
@@ -124,7 +133,6 @@ if s:t_Co >= 256
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=55 ctermbg=NONE cterm=underline
   hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi! link ErrorMsg Error
   hi WarningMsg ctermfg=55 ctermbg=231 cterm=NONE
   hi MoreMsg ctermfg=22 ctermbg=231 cterm=NONE
   hi ModeMsg ctermfg=16 ctermbg=231 cterm=NONE
@@ -133,7 +141,7 @@ if s:t_Co >= 256
   hi MatchParen ctermfg=231 ctermbg=217 cterm=NONE
   hi Search ctermfg=231 ctermbg=55 cterm=NONE
   hi IncSearch ctermfg=30 ctermbg=226 cterm=reverse
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
+  hi WildMenu ctermfg=16 ctermbg=226 cterm=bold
   hi ColorColumn ctermfg=16 ctermbg=217 cterm=NONE
   hi Cursor ctermfg=231 ctermbg=16 cterm=NONE
   hi lCursor ctermfg=16 ctermbg=95 cterm=NONE
@@ -141,29 +149,21 @@ if s:t_Co >= 256
   hi SpellCap ctermfg=29 ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=201 ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=18 ctermbg=NONE cterm=underline
+  hi Statement ctermfg=29 ctermbg=NONE cterm=bold
+  hi Type ctermfg=29 ctermbg=NONE cterm=bold
+  hi Comment ctermfg=248 ctermbg=NONE cterm=NONE
+  hi StorageClass ctermfg=196 ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=253 ctermbg=243 cterm=NONE
   hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=22 ctermbg=NONE cterm=NONE
   hi Constant ctermfg=95 ctermbg=NONE cterm=NONE
-  hi Number ctermfg=95 ctermbg=NONE cterm=NONE
-  hi Float ctermfg=95 ctermbg=NONE cterm=NONE
+  hi Number ctermfg=95 ctermbg=NONE cterm=bold
+  hi Float ctermfg=95 ctermbg=NONE cterm=bold
   hi PreProc ctermfg=55 ctermbg=NONE cterm=NONE
   hi Special ctermfg=208 ctermbg=NONE cterm=NONE
   hi SpecialChar ctermfg=18 ctermbg=NONE cterm=NONE
-  hi! link Tag Special
-  hi Type ctermfg=29 ctermbg=NONE cterm=NONE
-  hi! link Operator Statement
-  hi Directory ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=248 ctermbg=NONE cterm=NONE
-  hi StorageClass ctermfg=196 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=253 ctermbg=243 cterm=NONE
+  hi Directory ctermfg=30 ctermbg=NONE cterm=bold
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=22 ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=22 ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -176,13 +176,12 @@ if s:t_Co >= 16
   hi Normal ctermfg=black ctermbg=white cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
   hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi! link EndOfBuffer NonText
-  hi StatusLine ctermfg=white ctermbg=black cterm=NONE
+  hi StatusLine ctermfg=white ctermbg=black cterm=bold
   hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi StatusLineTerm ctermfg=black ctermbg=green cterm=NONE
+  hi StatusLineTerm ctermfg=black ctermbg=green cterm=bold
   hi StatusLineTermNC ctermfg=grey ctermbg=darkgreen cterm=NONE
   hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
   hi Pmenu ctermfg=black ctermbg=darkgrey cterm=NONE
@@ -191,9 +190,9 @@ if s:t_Co >= 16
   hi PmenuThumb ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
   hi TabLine ctermfg=black ctermbg=grey cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi ToolbarButton ctermfg=NONE ctermbg=darkgrey cterm=bold
   hi NonText ctermfg=blue ctermbg=white cterm=NONE
   hi SpecialKey ctermfg=blue ctermbg=NONE cterm=NONE
   hi Visual ctermfg=black ctermbg=darkgrey cterm=NONE
@@ -203,7 +202,6 @@ if s:t_Co >= 16
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=darkmagenta ctermbg=NONE cterm=underline
   hi Error ctermfg=red ctermbg=white cterm=reverse
-  hi! link ErrorMsg Error
   hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
   hi MoreMsg ctermfg=darkgreen ctermbg=white cterm=NONE
   hi ModeMsg ctermfg=black ctermbg=white cterm=NONE
@@ -212,7 +210,7 @@ if s:t_Co >= 16
   hi MatchParen ctermfg=white ctermbg=red cterm=NONE
   hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE
   hi IncSearch ctermfg=darkcyan ctermbg=yellow cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
   hi ColorColumn ctermfg=black ctermbg=red cterm=NONE
   hi Cursor ctermfg=white ctermbg=black cterm=NONE
   hi lCursor ctermfg=black ctermbg=darkred cterm=NONE
@@ -220,29 +218,21 @@ if s:t_Co >= 16
   hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=magenta ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi Statement ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi StorageClass ctermfg=red ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=grey ctermbg=darkgrey cterm=NONE
   hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Number ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Float ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Number ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Float ctermfg=darkred ctermbg=NONE cterm=bold
   hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi SpecialChar ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi! link Tag Special
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi! link Operator Statement
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi StorageClass ctermfg=red ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=darkgrey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -251,6 +241,73 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=black ctermbg=grey cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=grey cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=grey cterm=reverse
+  hi StatusLineTerm ctermfg=black ctermbg=darkgreen cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=grey ctermbg=darkgreen cterm=reverse
+  hi VertSplit ctermfg=black ctermbg=grey cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuSbar ctermfg=grey ctermbg=grey cterm=NONE
+  hi PmenuThumb ctermfg=black ctermbg=black cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=reverse
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold,reverse
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi FoldColumn ctermfg=grey ctermbg=NONE cterm=bold
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Error ctermfg=darkred ctermbg=NONE cterm=bold,reverse
+  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=black ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi MatchParen ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Search ctermfg=grey ctermbg=darkmagenta cterm=NONE
+  hi IncSearch ctermfg=darkcyan ctermbg=darkyellow cterm=reverse
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
+  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
+  hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi Statement ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=black ctermbg=NONE cterm=bold
+  hi StorageClass ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Number ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Float ctermfg=darkred ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi SpecialChar ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -350,4 +407,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/slate.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ralph Amissah <ralph@amissah.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:45 2022
+" Last Updated: Sun Jun 12 11:03:10 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -18,6 +18,12 @@ let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#000000', '#ff0000', '#5f8700', '#ffff00', '#87d7ff', '#d7d787', '#ffd7af', '#666666', '#333333', '#ffafaf', '#00875f', '#ffd700', '#5f87d7', '#afaf87', '#ff8787', '#ffffff']
 endif
+hi! link Terminal Normal
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
 hi Normal guifg=#ffffff guibg=#262626 gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#5f87d7 guibg=NONE gui=NONE cterm=NONE
 hi StatusLine guifg=#000000 guibg=#afaf87 gui=NONE cterm=NONE
@@ -41,6 +47,7 @@ hi Folded guifg=#666666 guibg=#000000 gui=NONE cterm=NONE
 hi FoldColumn guifg=#5f87d7 guibg=#000000 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#333333 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#333333 gui=NONE cterm=NONE
+hi ColorColumn guifg=NONE guibg=#000000 gui=NONE cterm=NONE
 hi CursorLineNr guifg=NONE guibg=#333333 gui=NONE cterm=NONE
 hi Visual guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE
 hi SignColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
@@ -58,7 +65,6 @@ hi MatchParen guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE
 hi Search guifg=#000000 guibg=#d7875f gui=NONE cterm=NONE
 hi IncSearch guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
 hi WildMenu guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#000000 gui=NONE cterm=NONE
 hi Cursor guifg=#333333 guibg=#d7d787 gui=NONE cterm=NONE
 hi lCursor guifg=#262626 guibg=#ffafaf gui=NONE cterm=NONE
 hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
@@ -70,29 +76,29 @@ hi String guifg=#87d7ff guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#ff8787 guibg=NONE gui=NONE cterm=NONE
 hi Function guifg=#ffd7af guibg=NONE gui=NONE cterm=NONE
 hi Special guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#5f87d7 guibg=NONE gui=bold cterm=NONE
+hi Statement guifg=#5f87d7 guibg=NONE gui=bold cterm=bold
 hi Constant guifg=#ffafaf guibg=NONE gui=NONE cterm=NONE
 hi PreProc guifg=#d7875f guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#5f87d7 guibg=NONE gui=bold cterm=NONE
+hi Type guifg=#5f87d7 guibg=NONE gui=bold cterm=bold
 hi Operator guifg=#d7875f guibg=NONE gui=NONE cterm=NONE
-hi Define guifg=#ffd700 guibg=NONE gui=bold cterm=NONE
+hi Define guifg=#ffd700 guibg=NONE gui=bold cterm=bold
 hi Structure guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#00875f guibg=NONE gui=bold cterm=NONE
+hi Directory guifg=#00875f guibg=NONE gui=bold cterm=bold
 hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#ffd700 guibg=NONE gui=bold cterm=NONE
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
+hi Title guifg=#ffd700 guibg=NONE gui=bold cterm=bold
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
+  hi! link Terminal Normal
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link CurSearch Search
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineSign CursorLine
   hi Normal ctermfg=231 ctermbg=235 cterm=NONE
   hi EndOfBuffer ctermfg=68 ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=16 ctermbg=144 cterm=NONE
@@ -116,6 +122,7 @@ if s:t_Co >= 256
   hi FoldColumn ctermfg=68 ctermbg=16 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=16 cterm=NONE
   hi CursorLineNr ctermfg=NONE ctermbg=236 cterm=NONE
   hi Visual ctermfg=186 ctermbg=64 cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=235 cterm=NONE
@@ -133,9 +140,6 @@ if s:t_Co >= 256
   hi Search ctermfg=16 ctermbg=173 cterm=NONE
   hi IncSearch ctermfg=16 ctermbg=46 cterm=NONE
   hi WildMenu ctermfg=235 ctermbg=186 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=16 cterm=NONE
-  hi Cursor ctermfg=236 ctermbg=186 cterm=NONE
-  hi lCursor ctermfg=235 ctermbg=217 cterm=NONE
   hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=226 ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=217 ctermbg=NONE cterm=underline
@@ -145,23 +149,17 @@ if s:t_Co >= 256
   hi Identifier ctermfg=210 ctermbg=NONE cterm=NONE
   hi Function ctermfg=223 ctermbg=NONE cterm=NONE
   hi Special ctermfg=186 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=68 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=68 ctermbg=NONE cterm=bold
   hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
   hi PreProc ctermfg=173 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=68 ctermbg=NONE cterm=NONE
+  hi Type ctermfg=68 ctermbg=NONE cterm=bold
   hi Operator ctermfg=173 ctermbg=NONE cterm=NONE
-  hi Define ctermfg=220 ctermbg=NONE cterm=NONE
+  hi Define ctermfg=220 ctermbg=NONE cterm=bold
   hi Structure ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=29 ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=29 ctermbg=NONE cterm=bold
   hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=220 ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=220 ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -194,7 +192,7 @@ if s:t_Co >= 16
   hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=bold
   hi ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE
   hi Visual ctermfg=yellow ctermbg=darkgreen cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=black cterm=NONE
@@ -212,9 +210,6 @@ if s:t_Co >= 16
   hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi Cursor ctermfg=darkgrey ctermbg=darkmagenta cterm=NONE
-  hi lCursor ctermfg=black ctermbg=red cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=red ctermbg=NONE cterm=underline
@@ -224,23 +219,17 @@ if s:t_Co >= 16
   hi Identifier ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Function ctermfg=yellow ctermbg=NONE cterm=NONE
   hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=blue ctermbg=NONE cterm=bold
   hi Constant ctermfg=red ctermbg=NONE cterm=NONE
   hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Type ctermfg=blue ctermbg=NONE cterm=bold
   hi Operator ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Define ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi Define ctermfg=yellow ctermbg=NONE cterm=bold
   hi Structure ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=green ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=green ctermbg=NONE cterm=bold
   hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=yellow ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -249,6 +238,75 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=grey ctermbg=black cterm=NONE
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi StatusLineTerm ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkyellow cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi TabLine ctermfg=grey ctermbg=black cterm=reverse
+  hi TabLineFill ctermfg=grey ctermbg=black cterm=reverse
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=underline
+  hi LineNr ctermfg=grey ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Error ctermfg=darkred ctermbg=grey cterm=reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
+  hi ModeMsg ctermfg=NONE ctermbg=darkyellow cterm=NONE
+  hi WarningMsg ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkred ctermbg=darkyellow cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi Comment ctermfg=grey ctermbg=NONE cterm=bold
+  hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Function ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Operator ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Define ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Structure ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -347,4 +405,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/torte.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Thorsten Maerz <info@netztorte.de>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:46 2022
+" Last Updated: Sun Jun 12 11:04:48 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -18,9 +18,15 @@ let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 endif
-hi Normal guifg=#cccccc guibg=#000000 gui=NONE cterm=NONE
+hi! link Terminal Normal
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
+hi Normal guifg=#cccccc guibg=#000000 gui=NONE cterm=NONE
 hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
 hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#40ffff guibg=NONE gui=NONE cterm=NONE
@@ -44,7 +50,7 @@ hi Conceal guifg=#e5e5e5 guibg=#a9a9a9 gui=NONE cterm=NONE
 hi Cursor guifg=#000000 guibg=#00ff00 gui=bold cterm=NONE
 hi lCursor guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE
 hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=NONE
+hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
 hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi Search guifg=#ff0000 guibg=#000000 gui=reverse cterm=reverse
 hi IncSearch guifg=#00cd00 guibg=#000000 gui=reverse cterm=reverse
@@ -54,9 +60,9 @@ hi ErrorMsg guifg=#ffffff guibg=#cd0000 gui=NONE cterm=NONE
 hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
 hi LineNr guifg=#7f7f7f guibg=NONE gui=NONE cterm=NONE
 hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=NONE
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=NONE
-hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=NONE
+hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
+hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
 hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline
 hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
@@ -65,33 +71,33 @@ hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
 hi SpellCap guifg=#5c5cff guibg=NONE guisp=#5c5cff gui=undercurl cterm=underline
 hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
 hi SpellRare guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline
-hi StatusLine guifg=#ffffff guibg=#0000ee gui=bold cterm=NONE
+hi StatusLine guifg=#ffffff guibg=#0000ee gui=bold cterm=bold
 hi StatusLineNC guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE
 hi VertSplit guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE
 hi TabLine guifg=#ffffff guibg=#7f7f7f gui=NONE cterm=NONE
 hi TabLineFill guifg=NONE guibg=#000000 gui=reverse cterm=reverse
-hi TabLineSel guifg=#cccccc guibg=#000000 gui=bold cterm=NONE
+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=NONE
+hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold
 hi Pmenu guifg=fg guibg=#303030 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#bebebe gui=NONE cterm=NONE
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
-  hi Normal ctermfg=251 ctermbg=16 cterm=NONE
+  hi! link Terminal Normal
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link CurSearch Search
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineSign CursorLine
   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
+  hi Normal ctermfg=251 ctermbg=16 cterm=NONE
   hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
   hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=87 ctermbg=NONE cterm=NONE
@@ -115,7 +121,7 @@ if s:t_Co >= 256
   hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
   hi lCursor ctermfg=16 ctermbg=254 cterm=NONE
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=NONE
+  hi Title ctermfg=201 ctermbg=NONE cterm=bold
   hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
   hi Search ctermfg=196 ctermbg=16 cterm=reverse
   hi IncSearch ctermfg=40 ctermbg=16 cterm=reverse
@@ -125,9 +131,9 @@ if s:t_Co >= 256
   hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
   hi LineNr ctermfg=102 ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=30 cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=46 ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold
+  hi Question ctermfg=46 ctermbg=NONE cterm=bold
   hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline
   hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
@@ -136,24 +142,18 @@ if s:t_Co >= 256
   hi SpellCap ctermfg=63 ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=201 ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=51 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=231 ctermbg=20 cterm=NONE
+  hi StatusLine ctermfg=231 ctermbg=20 cterm=bold
   hi StatusLineNC ctermfg=16 ctermbg=254 cterm=NONE
   hi VertSplit ctermfg=16 ctermbg=254 cterm=NONE
   hi TabLine ctermfg=231 ctermbg=102 cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=16 cterm=reverse
-  hi TabLineSel ctermfg=251 ctermbg=16 cterm=NONE
+  hi TabLineSel ctermfg=251 ctermbg=16 cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
-  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=NONE
+  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold
   hi Pmenu ctermfg=fg ctermbg=236 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=250 cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -164,8 +164,6 @@ endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
   hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
   hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
@@ -181,7 +179,7 @@ if s:t_Co >= 16
   hi Visual ctermfg=black ctermbg=grey cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=bold
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=cyan ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
@@ -189,7 +187,7 @@ if s:t_Co >= 16
   hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi lCursor ctermfg=black ctermbg=grey cterm=NONE
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=bold
   hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Search ctermfg=red ctermbg=black cterm=reverse
   hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse
@@ -199,9 +197,9 @@ if s:t_Co >= 16
   hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
   hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Question ctermfg=green ctermbg=NONE cterm=bold
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
   hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
@@ -210,24 +208,18 @@ if s:t_Co >= 16
   hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=magenta ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=cyan ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=white ctermbg=darkblue cterm=NONE
+  hi StatusLine ctermfg=white ctermbg=darkblue cterm=bold
   hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
   hi VertSplit ctermfg=black ctermbg=grey cterm=NONE
   hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=black cterm=reverse
-  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
+  hi TabLineSel ctermfg=white ctermbg=black cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
+  hi ToolbarButton 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=yellow cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -236,6 +228,69 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=grey ctermbg=black cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
+  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold,underline
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Search ctermfg=darkred ctermbg=black cterm=bold,reverse
+  hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi LineNr ctermfg=grey ctermbg=NONE cterm=bold
+  hi MatchParen ctermfg=grey ctermbg=darkcyan cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi StatusLine ctermfg=grey ctermbg=darkblue cterm=bold
+  hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
+  hi VertSplit ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=black cterm=reverse
+  hi TabLineSel ctermfg=white ctermbg=black cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkmagenta cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -359,4 +414,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/colors/zellner.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Wed May 11 22:56:47 2022
+" Last Updated: Sun Jun 12 11:05:43 2022
 
 " Generated by Colortemplate v2.2.0
 
@@ -18,11 +18,17 @@ let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#ffffff', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#a9a9a9', '#ff0000', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#000000']
 endif
+hi! link Terminal Normal
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
 hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi Folded guifg=#00008b guibg=#d3d3d3 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#e5e5e5 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#e5e5e5 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=NONE
+hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=bold
 hi QuickFixLine guifg=#ffffff guibg=#6a5acd gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE
 hi StatusLine guifg=#ffff00 guibg=#a9a9a9 gui=NONE cterm=NONE
@@ -36,9 +42,9 @@ hi PmenuSbar guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#a9a9a9 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=NONE
+hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold
 hi ToolbarLine guifg=NONE guibg=#d3d3d3 gui=NONE cterm=NONE
-hi ToolbarButton guifg=NONE guibg=#a9a9a9 gui=bold cterm=NONE
+hi ToolbarButton guifg=NONE guibg=#a9a9a9 gui=bold cterm=bold
 hi NonText guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE
 hi Visual guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
@@ -50,9 +56,9 @@ hi Underlined guifg=#6a5acd guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
 hi ErrorMsg guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
 hi WarningMsg guifg=#a020f0 guibg=#ffffff gui=NONE cterm=NONE
-hi MoreMsg guifg=#000000 guibg=#ffffff gui=bold cterm=NONE
-hi ModeMsg guifg=#000000 guibg=#ffffff gui=bold cterm=NONE
-hi Question guifg=#ff00ff guibg=NONE gui=bold cterm=NONE
+hi MoreMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
+hi ModeMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
+hi Question guifg=#ff00ff guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#ffffff guibg=#ff00ff gui=NONE cterm=NONE
 hi Search guifg=#ffffff guibg=#a020f0 gui=NONE cterm=NONE
@@ -73,27 +79,27 @@ hi PreProc guifg=#a020f0 guibg=NONE gui=NONE cterm=NONE
 hi Type guifg=#0000ff guibg=NONE gui=NONE cterm=NONE
 hi Special guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
 hi Tag guifg=#006400 guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#0000ff guibg=NONE gui=bold cterm=NONE
+hi Directory guifg=#0000ff guibg=NONE gui=bold cterm=bold
 hi Conceal guifg=#ff0000 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=NONE
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
+hi Title guifg=#a020f0 guibg=NONE gui=bold cterm=bold
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
+  hi! link Terminal Normal
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link CurSearch Search
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineSign CursorLine
   hi Normal ctermfg=16 ctermbg=231 cterm=NONE
   hi Folded ctermfg=18 ctermbg=252 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
-  hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=bold
   hi QuickFixLine ctermfg=231 ctermbg=62 cterm=NONE
   hi EndOfBuffer ctermfg=248 ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=226 ctermbg=248 cterm=NONE
@@ -107,9 +113,9 @@ if s:t_Co >= 256
   hi PmenuThumb ctermfg=NONE ctermbg=248 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=NONE
+  hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=252 cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=248 cterm=NONE
+  hi ToolbarButton ctermfg=NONE ctermbg=248 cterm=bold
   hi NonText ctermfg=248 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=248 ctermbg=NONE cterm=NONE
   hi Visual ctermfg=16 ctermbg=226 cterm=NONE
@@ -121,9 +127,9 @@ if s:t_Co >= 256
   hi Error ctermfg=196 ctermbg=231 cterm=reverse
   hi ErrorMsg ctermfg=196 ctermbg=231 cterm=reverse
   hi WarningMsg ctermfg=129 ctermbg=231 cterm=NONE
-  hi MoreMsg ctermfg=16 ctermbg=231 cterm=NONE
-  hi ModeMsg ctermfg=16 ctermbg=231 cterm=NONE
-  hi Question ctermfg=201 ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=16 ctermbg=231 cterm=bold
+  hi ModeMsg ctermfg=16 ctermbg=231 cterm=bold
+  hi Question ctermfg=201 ctermbg=NONE cterm=bold
   hi Todo ctermfg=16 ctermbg=226 cterm=NONE
   hi MatchParen ctermfg=231 ctermbg=201 cterm=NONE
   hi Search ctermfg=231 ctermbg=129 cterm=NONE
@@ -144,16 +150,10 @@ if s:t_Co >= 256
   hi Type ctermfg=21 ctermbg=NONE cterm=NONE
   hi Special ctermfg=201 ctermbg=NONE cterm=NONE
   hi Tag ctermfg=22 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=21 ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=21 ctermbg=NONE cterm=bold
   hi Conceal ctermfg=196 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=129 ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=129 ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
   hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -164,10 +164,10 @@ endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=black ctermbg=white cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=darkred ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkred ctermbg=NONE cterm=bold
   hi QuickFixLine ctermfg=white ctermbg=blue cterm=NONE
   hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=yellow ctermbg=darkgrey cterm=NONE
@@ -181,9 +181,9 @@ if s:t_Co >= 16
   hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE
   hi TabLine ctermfg=black ctermbg=grey cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=grey cterm=NONE
+  hi ToolbarButton ctermfg=NONE ctermbg=grey cterm=bold
   hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
   hi Visual ctermfg=black ctermbg=yellow cterm=NONE
@@ -195,9 +195,9 @@ if s:t_Co >= 16
   hi Error ctermfg=red ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse
   hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
-  hi MoreMsg ctermfg=black ctermbg=white cterm=NONE
-  hi ModeMsg ctermfg=black ctermbg=white cterm=NONE
-  hi Question ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=black ctermbg=white cterm=bold
+  hi ModeMsg ctermfg=black ctermbg=white cterm=bold
+  hi Question ctermfg=magenta ctermbg=NONE cterm=bold
   hi Todo ctermfg=black ctermbg=yellow cterm=NONE
   hi MatchParen ctermfg=white ctermbg=magenta cterm=NONE
   hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE
@@ -218,16 +218,10 @@ if s:t_Co >= 16
   hi Type ctermfg=blue ctermbg=NONE cterm=NONE
   hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Tag ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=blue ctermbg=NONE cterm=bold
   hi Conceal ctermfg=red ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -236,6 +230,71 @@ if s:t_Co >= 16
   finish
 endif
 
+if s:t_Co >= 8
+  hi Normal ctermfg=black ctermbg=gray cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=darkred ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=gray ctermbg=darkblue cterm=NONE
+  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse
+  hi StatusLineTerm ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=black ctermbg=gray cterm=reverse
+  hi VertSplit ctermfg=black ctermbg=gray cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkmagenta cterm=NONE
+  hi TabLine ctermfg=black ctermbg=gray cterm=reverse
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi NonText ctermfg=gray ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi SignColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Error ctermfg=darkred ctermbg=black cterm=reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
+  hi WarningMsg ctermfg=darkmagenta ctermbg=black cterm=NONE
+  hi MoreMsg ctermfg=gray ctermbg=black cterm=bold
+  hi ModeMsg ctermfg=gray ctermbg=black cterm=bold
+  hi Question ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi IncSearch ctermfg=gray ctermbg=NONE cterm=reverse
+  hi WildMenu ctermfg=gray ctermbg=darkyellow cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
+  hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkyellow ctermbg=darkblue cterm=reverse
+  hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Special ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
 if s:t_Co >= 0
   hi Normal term=NONE
   hi ColorColumn term=reverse
@@ -327,9 +386,14 @@ endif
 " Color: linenr      #a52a2a        124            darkred
 " Color: colorcolumn #eeeeee        255            grey
 " Color: slateblue   #6a5acd        62             blue
-" Color: darkcyan    #008787        30             darkcyan
+" Color: black       #000000        16             black
+" Color: darkred     #870000        88             darkred
 " Color: darkgreen   #008700        28             darkgreen
 " Color: darkyellow  #878700        100            darkyellow
+" Color: darkblue    #000087        18             darkblue
+" Color: darkmagenta #870087        18             darkmagenta
+" Color: darkcyan    #008787        30             darkcyan
+" Color: gray        #878787        102            gray
 " Term colors: bg0     statement constant preproc identifier type special bg1
 " Term colors: comment statement constant preproc identifier type special fg0
 " Color: bgDiffA     #5F875F        65             darkgreen
@@ -338,4 +402,6 @@ endif
 " Color: bgDiffT     #C6C6C6        251            grey
 " Color: fgDiffW     #FFFFFF        231            white
 " Color: fgDiffB     #000000        16             black
+" Color: bgDiffC8    #5F87AF        67             darkblue
+" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=2 sw=2

runtime/compiler/icon.vim

@@ -0,0 +1,33 @@
+" Vim compiler file
+" Compiler:	Icon Compiler
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2022 Jun 16
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "icont"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet makeprg=icont\ -s
+CompilerSet errorformat=%-G%\\d%\\+\ errors%\\=,
+		       \%ERun-time\ error\ %n,
+		       \%ERun-time\ error\ %n\ in\ %m,
+		       \%ZTraceback:,
+                       \%+Coffending\ value:\ %.%#,
+                       \%CFile\ %f;\ Line\ %l,
+                       \%EFile\ %f;\ Line\ %l\ #\ %m,
+		       \%EFile\ %f;\ %m,
+		       \%E%f:%l:\ #\ %m,
+		       \%E%f:\ %m,
+		       \%+C%.%#,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/perl.vim

@@ -1,7 +1,11 @@
-" Vim Compiler File
-" Compiler:     Perl syntax checks (perl -Wc)
-" Maintainer:   Christian J. Robinson <heptite@gmail.com>
-" Last Change:  2019 Jul 22
+" Vim compiler file
+" Compiler:      Perl syntax checks (perl -Wc)
+" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Author:        Christian J. Robinson <heptite@gmail.com>
+" Homepage:      https://github.com/vim-perl/vim-perl
+" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
+" License:       Vim License (see :help license)
+" Last Change:   2021 Nov 2
 
 if exists("current_compiler")
   finish
@@ -15,10 +19,10 @@ endif
 let s:savecpo = &cpo
 set cpo&vim
 
-if exists('g:perl_compiler_force_warnings') && g:perl_compiler_force_warnings == 0
-	let s:warnopt = 'w'
-else
+if get(g:, 'perl_compiler_force_warnings', 1)
 	let s:warnopt = 'W'
+else
+	let s:warnopt = 'w'
 endif
 
 if getline(1) =~# '-[^ ]*T'

runtime/compiler/perlcritic.vim

@@ -0,0 +1,27 @@
+" Vim compiler file
+" Compiler:      perlcritic
+" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Author:        Doug Kearns <dougkearns@gmail.com>
+" Homepage:      https://github.com/vim-perl/vim-perl
+" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
+" License:       Vim License (see :help license)
+" Last Change:   2021 Oct 20
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "perlcritic"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet makeprg=perlcritic\ --nocolor\ --quiet\ --verbose\ \"\\%f:\\%l:\\%c:\\%s:\\%m\\n\"
+CompilerSet errorformat=%f:%l:%c:%n:%m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/podchecker.vim

@@ -0,0 +1,28 @@
+" Vim compiler file
+" Compiler:      podchecker
+" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Author:        Doug Kearns <dougkearns@gmail.com>
+" Homepage:      https://github.com/vim-perl/vim-perl
+" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
+" License:       Vim License (see :help license)
+" Last Change:   2021 Oct 20
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "podchecker"
+
+if exists(":CompilerSet") != 2          " older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet makeprg=podchecker\ -w
+CompilerSet errorformat=\*\*\*\ %tRROR:\ %m\ at\ line\ %l\ in\ file\ %f,
+                       \\*\*\*\ %tARNING:\ %m\ at\ line\ %l\ in\ file\ %f,
+                       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.2.  Last change: 2022 Apr 17
+*autocmd.txt*   For Vim version 8.2.  Last change: 2022 May 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -47,6 +47,28 @@ effects.  Be careful not to destroy your text.
   It's a good idea to use the same autocommands for the File* and Buf* events
   when possible.
 
+Recommended use:
+- Always use a group, so that it's easy to delete the autocommand.
+- Keep the command itself short, call a function to do more work.
+- Make it so that the script it is defined in can be sourced several times
+  without the autocommand being repeated.
+
+Example in Vim9 script: >
+   autocmd_add({replace: true,
+		group:   'DemoGroup',
+		event:   'BufEnter',
+		pattern: '*.txt',
+		cmd:     'call DemoBufEnter()'
+		})
+
+In legacy script: >
+   call autocmd_add(#{replace: v:true,
+		    \ group: 'DemoGroup',
+   		    \ event: 'BufEnter',
+		    \ pattern: '*.txt',
+		    \ cmd: 'call DemoBufEnter()'
+		    \ })
+
 ==============================================================================
 2. Defining autocommands				*autocmd-define*
 
@@ -83,7 +105,8 @@ triggered.
 		}
 
 The |autocmd_add()| function can be used to add a list of autocmds and autocmd
-groups from a Vim script.
+groups from a Vim script.  It is preferred if you have anything that would
+require using `:execute` with `:autocmd`.
 
 Note: The ":autocmd" command can only be followed by another command when the
 '|' appears where the pattern is expected.  This works: >

runtime/doc/builtin.txt

@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 8.2.  Last change: 2022 May 21
+*builtin.txt*	For Vim version 8.2.  Last change: 2022 Jun 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -689,7 +689,10 @@ undotree()			List	undo file tree
 uniq({list} [, {func} [, {dict}]])
 				List	remove adjacent duplicates from a list
 values({dict})			List	values in {dict}
-virtcol({expr})			Number	screen column of cursor or mark
+virtcol({expr} [, {list}])	Number or List
+					screen column of cursor or mark
+virtcol2col({winid}, {lnum}, {col})
+				Number  byte index of a character on screen
 visualmode([expr])		String	last visual mode used
 wildmenumode()			Number	whether 'wildmenu' mode is active
 win_execute({id}, {command} [, {silent}])
@@ -750,7 +753,7 @@ acos({expr})							*acos()*
 		Return the arc cosine of {expr} measured in radians, as a
 		|Float| in the range of [0, pi].
 		{expr} must evaluate to a |Float| or a |Number| in the range
-		[-1, 1].
+		[-1, 1].  Otherwise acos() returns "nan".
 		Examples: >
 			:echo acos(0)
 <			1.570796 >
@@ -772,6 +775,7 @@ add({object}, {expr})					*add()*
 		item.  Use |extend()| to concatenate |Lists|.
 		When {object} is a |Blob| then  {expr} must be a number.
 		Use |insert()| to add an item at another position.
+		Returns 1 if {object} is not a |List| or a |Blob|.
 
 		Can also be used as a |method|: >
 			mylist->add(val1)->add(val2)
@@ -780,6 +784,7 @@ add({object}, {expr})					*add()*
 and({expr}, {expr})					*and()*
 		Bitwise AND on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
+		Also see `or()` and `xor()`.
 		Example: >
 			:let flag = and(bits, 0x80)
 <		Can also be used as a |method|: >
@@ -873,11 +878,17 @@ argv([{nr} [, {winid}]])
 		The {winid} argument specifies the window ID, see |argc()|.
 		For the Vim command line arguments see |v:argv|.
 
+		Returns an empty string if {nr}th argument is not present in
+		the argument list.  Returns an empty List if the {winid}
+		argument is invalid.
+
 asin({expr})						*asin()*
 		Return the arc sine of {expr} measured in radians, as a |Float|
 		in the range of [-pi/2, pi/2].
 		{expr} must evaluate to a |Float| or a |Number| in the range
 		[-1, 1].
+		Returns "nan" if {expr} is outside the range [-1, 1].  Returns
+		0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo asin(0.8)
 <			0.927295 >
@@ -898,6 +909,7 @@ atan({expr})						*atan()*
 		Return the principal value of the arc tangent of {expr}, in
 		the range [-pi/2, +pi/2] radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo atan(100)
 <			1.560797 >
@@ -914,6 +926,8 @@ atan2({expr1}, {expr2})					*atan2()*
 		Return the arc tangent of {expr1} / {expr2}, measured in
 		radians, as a |Float| in the range [-pi, pi].
 		{expr1} and {expr2} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr1} or {expr2} is not a |Float| or a
+		|Number|.
 		Examples: >
 			:echo atan2(-1, 1)
 <			-0.785398 >
@@ -936,17 +950,27 @@ autocmd_add({acmds})					*autocmd_add()*
 				item is ignored.
 		    cmd		Ex command to execute for this autocmd event
 		    event	autocmd event name. Refer to |autocmd-events|.
+				This can be either a String with a single
+				event name or a List of event names.
 		    group	autocmd group name. Refer to |autocmd-groups|.
 				If this group doesn't exist then it is
 				created.  If not specified or empty, then the
 				default group is used.
-		    nested	set to v:true to add a nested autocmd.
-				Refer to |autocmd-nested|.
-		    once	set to v:true to add a autocmd which executes
-				only once. Refer to |autocmd-once|.
+		    nested	boolean flag, set to v:true to add a nested
+				autocmd.  Refer to |autocmd-nested|.
+		    once	boolean flag, set to v:true to add an autocmd
+				which executes only once. Refer to
+				|autocmd-once|.
 		    pattern	autocmd pattern string. Refer to
 				|autocmd-patterns|.  If "bufnr" item is
-				present, then this item is ignored.
+				present, then this item is ignored.  This can
+				be a String with a single pattern or a List of
+				patterns.
+		    replace	boolean flag, set to v:true to remove all the
+				commands associated with the specified autocmd
+				event and group and add the {cmd}.  This is
+				useful to avoid adding the same command
+				multiple times for an autocmd event in a group.
 
 		Returns v:true on success and v:false on failure.
 		Examples: >
@@ -988,7 +1012,7 @@ autocmd_delete({acmds})					*autocmd_delete()*
 		{pattern} and {cmd} are not specified, then that autocmd group
 		is deleted.
 
-		Returns v:true on success and v:false on failure.
+		Returns |v:true| on success and |v:false| on failure.
 		Examples: >
 			" :autocmd! BufLeave *.vim
 			let acmd = #{event: 'BufLeave', pattern: '*.vim'}
@@ -1037,15 +1061,18 @@ autocmd_get([{opts}])					*autocmd_get()*
 		    cmd		Command executed for this autocmd.
 		    event	Autocmd event name.
 		    group	Autocmd group name.
-		    nested	Set to v:true for a nested autocmd. See
-				|autocmd-nested|.
-		    once	Set to v:true, if the autocmd will be executed
-				only once. See |autocmd-once|.
+		    nested	Boolean flag, set to v:true for a nested
+				autocmd. See |autocmd-nested|.
+		    once	Boolean flag, set to v:true, if the autocmd
+				will be executed only once. See |autocmd-once|.
 		    pattern	Autocmd pattern.  For a buffer-local
 				autocmd, this will be of the form "<buffer=n>".
 		If there are multiple commands for an autocmd event in a
 		group, then separate items are returned for each command.
 
+		Returns an empty List if an autocmd with the specified group
+		or event or pattern is not found.
+
 		Examples: >
 			" :autocmd MyGroup
 			echo autocmd_get(#{group: 'Mygroup'})
@@ -1066,7 +1093,8 @@ autocmd_get([{opts}])					*autocmd_get()*
 <
 balloon_gettext()					*balloon_gettext()*
 		Return the current text in the balloon.  Only for the string,
-		not used for the List.
+		not used for the List.  Returns an empty string if balloon
+		is not present.
 
 balloon_show({expr})					*balloon_show()*
 		Show {expr} inside the balloon.  For the GUI {expr} is used as
@@ -1103,7 +1131,8 @@ balloon_split({msg})					*balloon_split()*
 		Split String {msg} into lines to be displayed in a balloon.
 		The splits are made for the current window size and optimize
 		to show debugger output.
-		Returns a |List| with the split lines.
+		Returns a |List| with the split lines.  Returns an empty List
+		on error.
 		Can also be used as a |method|: >
 			GetText()->balloon_split()->balloon_show()
 
@@ -1157,7 +1186,8 @@ bufadd({name})						*bufadd()*
 			let bufnr = bufadd('someName')
 			call bufload(bufnr)
 			call setbufline(bufnr, 1, ['some', 'text'])
-<		Can also be used as a |method|: >
+<		Returns 0 on error.
+		Can also be used as a |method|: >
 			let bufnr = 'somename'->bufadd()
 
 bufexists({buf})					*bufexists()*
@@ -1312,6 +1342,8 @@ byte2line({byte})					*byte2line()*
 		one.
 		Also see |line2byte()|, |go| and |:goto|.
 
+		Returns -1 if the {byte} value is invalid.
+
 		Can also be used as a |method|: >
 			GetOffset()->byte2line()
 
@@ -1383,6 +1415,8 @@ ceil({expr})							*ceil()*
 			echo ceil(4.0)
 <			4.0
 
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
+
 		Can also be used as a |method|: >
 			Compute()->ceil()
 <
@@ -1399,6 +1433,7 @@ changenr()						*changenr()*
 		When a change was made it is the number of that change.  After
 		redo it is the number of the redone change.  After undo it is
 		one less than the number of the undone change.
+		Returns 0 if the undo list is empty.
 
 char2nr({string} [, {utf8}])					*char2nr()*
 		Return Number value of the first char in {string}.
@@ -1417,10 +1452,11 @@ char2nr({string} [, {utf8}])					*char2nr()*
 		    let list = map(split(str, '\zs'), {_, val -> char2nr(val)})
 <		Result: [65, 66, 67]
 
+		Returns 0 if {string} is not a |String|.
+
 		Can also be used as a |method|: >
 			GetChar()->char2nr()
 
-
 charclass({string})					*charclass()*
 		Return the character class of the first character in {string}.
 		The character class is one of:
@@ -1430,6 +1466,7 @@ charclass({string})					*charclass()*
 			3	emoji
 			other	specific Unicode class
 		The class is used in patterns and word motions.
+		Returns 0 if {string} is not a |String|.
 
 
 charcol({expr})						*charcol()*
@@ -1541,7 +1578,7 @@ col({expr})	The result is a Number, which is the byte index of the column
 			col("$")		length of cursor line plus one
 			col("'t")		column of mark t
 			col("'" .. markname)	column of mark markname
-<		The first column is 1.  0 is returned for an error.
+<		The first column is 1.  Returns 0 if {expr} is invalid.
 		For an uppercase mark the column may actually be in another
 		buffer.
 		For the cursor position, when 'virtualedit' is active, the
@@ -1659,6 +1696,8 @@ complete_info([{what}])				*complete_info()*
 		|pum_getpos()|. It's also available in |v:event| during the
 		|CompleteChanged| event.
 
+		Returns an empty |Dictionary| on error.
+
 		Examples: >
 			" Get all items
 			call complete_info()
@@ -1744,6 +1783,7 @@ copy({expr})	Make a copy of {expr}.  For Numbers and Strings this isn't
 cos({expr})						*cos()*
 		Return the cosine of {expr}, measured in radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo cos(100)
 <			0.862319 >
@@ -1760,6 +1800,7 @@ cosh({expr})						*cosh()*
 		Return the hyperbolic cosine of {expr} as a |Float| in the range
 		[1, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo cosh(0.5)
 <			1.127626 >
@@ -1871,6 +1912,9 @@ debugbreak({pid})					*debugbreak()*
 		processes is undefined. See |terminal-debugger|.
 		{only available on MS-Windows}
 
+		Returns |TRUE| if successfully interrupted the program.
+		Otherwise returns |FALSE|.
+
 		Can also be used as a |method|: >
 			GetPid()->debugbreak()
 
@@ -2341,6 +2385,7 @@ exp({expr})							*exp()*
 		Return the exponential of {expr} as a |Float| in the range
 		[0, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo exp(2)
 <			7.389056 >
@@ -2507,7 +2552,7 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 		{expr2} remains unchanged.
 		When {expr1} is locked and {expr2} is not empty the operation
 		fails.
-		Returns {expr1}.
+		Returns {expr1}.  Returns 0 on error.
 
 		Can also be used as a |method|: >
 			mylist->extend(otherlist)
@@ -2681,6 +2726,8 @@ finddir({name} [, {path} [, {count}]])				*finddir()*
 		{name} in {path} instead of the first one.
 		When {count} is negative return all the matches in a |List|.
 
+		Returns an empty string if the directory is not found.
+
 		This is quite similar to the ex-command `:find`.
 		{only available when compiled with the |+file_in_path|
 		feature}
@@ -2731,6 +2778,7 @@ float2nr({expr})					*float2nr()*
 		Convert {expr} to a Number by omitting the part after the
 		decimal point.
 		{expr} must evaluate to a |Float| or a Number.
+		Returns 0 if {expr} is not a |Float| or a |Number|.
 		When the value of {expr} is out of range for a |Number| the
 		result is truncated to 0x7fffffff or -0x7fffffff (or when
 		64-bit Number support is enabled, 0x7fffffffffffffff or
@@ -2758,6 +2806,7 @@ floor({expr})							*floor()*
 		Return the largest integral value less than or equal to
 		{expr} as a |Float| (round down).
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			echo floor(1.856)
 <			1.0  >
@@ -2780,6 +2829,8 @@ fmod({expr1}, {expr2})					*fmod()*
 		the magnitude of {expr2}.  If {expr2} is zero, the value
 		returned is zero.  The value returned is a |Float|.
 		{expr1} and {expr2} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr1} or {expr2} is not a |Float| or a
+		|Number|.
 		Examples: >
 			:echo fmod(12.33, 1.22)
 <			0.13 >
@@ -2801,6 +2852,7 @@ fnameescape({string})					*fnameescape()*
 		appears in a filename, it depends on the value of 'isfname'.
 		A leading '+' and '>' is also escaped (special after |:edit|
 		and |:write|).  And a "-" by itself (special after |:cd|).
+		Returns an empty string on error.
 		Example: >
 			:let fname = '+some str%nge|name'
 			:exe "edit " .. fnameescape(fname)
@@ -2817,8 +2869,9 @@ fnamemodify({fname}, {mods})				*fnamemodify()*
 		Example: >
 			:echo fnamemodify("main.c", ":p:h")
 <		results in: >
-			/home/mool/vim/vim/src
-<		If {mods} is empty then {fname} is returned.
+			/home/user/vim/vim/src
+<		If {mods} is empty or an unsupported modifier is used then
+		{fname} is returned.
 		Note: Environment variables don't work in {fname}, use
 		|expand()| first then.
 
@@ -2875,6 +2928,7 @@ foldtext()	Returns a String, to be displayed for a closed fold.  This is
 		When used to draw the actual foldtext, the rest of the line
 		will be filled with the fold char from the 'fillchars'
 		setting.
+		Returns an empty string when there is no fold.
 		{not available when compiled without the |+folding| feature}
 
 foldtextresult({lnum})					*foldtextresult()*
@@ -2926,6 +2980,7 @@ funcref({name} [, {arglist}] [, {dict}])
 		been loaded (to avoid mistakenly loading the autoload script
 		when only intending to use the function name, use |function()|
 		instead). {name} cannot be a builtin function.
+		Returns 0 on error.
 
 		Can also be used as a |method|: >
 			GetFuncname()->funcref([arg])
@@ -3006,6 +3061,8 @@ function({name} [, {arglist}] [, {dict}])
 <		Invokes the function as with: >
 			call context.Callback('one', 500)
 <
+		Returns 0 on error.
+
 		Can also be used as a |method|: >
 			GetFuncname()->function([arg])
 
@@ -3059,6 +3116,7 @@ get({func}, {what})
 			"func"	The function
 			"dict"	The dictionary
 			"args"	The list with arguments
+		Returns zero on error.
 		Preferably used as a |method|: >
 			myfunc->get(what)
 <
@@ -3301,7 +3359,7 @@ getcharmod()						*getcharmod()*
 			128	command (Macintosh only)
 		Only the modifiers that have not been included in the
 		character itself are obtained.  Thus Shift-a results in "A"
-		without a modifier.
+		without a modifier.  Returns 0 if no modifiers are used.
 
 							*getcharpos()*
 getcharpos({expr})
@@ -3651,7 +3709,7 @@ getftype({fname})					*getftype()*
 
 getimstatus()						*getimstatus()*
 		The result is a Number, which is |TRUE| when the IME status is
-		active.
+		active and |FALSE| otherwise.
 		See 'imstatusfunc'.
 
 getjumplist([{winnr} [, {tabnr}]])			*getjumplist()*
@@ -3661,7 +3719,8 @@ getjumplist([{winnr} [, {tabnr}]])			*getjumplist()*
 		With {winnr} only use this window in the current tab page.
 		{winnr} can also be a |window-ID|.
 		With {winnr} and {tabnr} use the window in the specified tab
-		page.
+		page.  If {winnr} or {tabnr} is invalid, an empty list is
+		returned.
 
 		The returned list contains two entries: a list with the jump
 		locations and the last used jump position number in the list.
@@ -3742,7 +3801,8 @@ getmarklist([{buf}])					*getmarklist()*
 
 		If the optional {buf} argument is specified, returns the
 		local marks defined in buffer {buf}.  For the use of {buf},
-		see |bufname()|.
+		see |bufname()|.  If {buf} is invalid, an empty list is
+		returned.
 
 		Each item in the returned List is a |Dict| with the following:
 		    mark   name of the mark prefixed by "'"
@@ -3764,7 +3824,8 @@ getmatches([{win}])					*getmatches()*
 		as |setmatches()| can restore a list of matches saved by
 		|getmatches()|.
 		If {win} is specified, use the window with this number or
-		window ID instead of the current window.
+		window ID instead of the current window.  If {win} is invalid,
+		an empty list is returned.
 		Example: >
 			:echo getmatches()
 <			[{'group': 'MyGroup1', 'pattern': 'TODO',
@@ -3836,6 +3897,7 @@ getpos({expr})	Get the position for String {expr}.  For possible values of
 		use |getcharpos()|.
 		A very large column number equal to |v:maxcol| can be returned,
 		in which case it means "after the end of the line".
+		If {expr} is invalid, returns a list with all zeros.
 		This can be used to save and restore the position of a mark: >
 			let save_a_mark = getpos("'a")
 			...
@@ -5045,7 +5107,7 @@ len({expr})	The result is a Number, which is the length of the argument.
 		When {expr} is a |Blob| the number of bytes is returned.
 		When {expr} is a |Dictionary| the number of entries in the
 		|Dictionary| is returned.
-		Otherwise an error is given.
+		Otherwise an error is given and returns zero.
 
 		Can also be used as a |method|: >
 			mylist->len()
@@ -5138,6 +5200,7 @@ line({expr} [, {winid}])				*line()*
 		|getpos()|.
 		With the optional {winid} argument the values are obtained for
 		that window instead of the current window.
+		Returns 0 for invalid values of {expr} and {winid}.
 		Examples: >
 			line(".")		line number of the cursor
 			line(".", winid)	idem, in window "winid"
@@ -5205,6 +5268,8 @@ list2str({list} [, {utf8}])				*list2str()*
 		With UTF-8 composing characters work as expected: >
 			list2str([97, 769])	returns "á"
 <
+		Returns an empty string on error.
+
 		Can also be used as a |method|: >
 			GetList()->list2str()
 
@@ -5277,6 +5342,8 @@ listener_add({callback} [, {buf}])			*listener_add()*
 		The {callback} is also not invoked when the buffer is
 		unloaded, use the |BufUnload| autocmd event for that.
 
+		Returns zero if {callback} or {buf} is invalid.
+
 		Can also be used as a |method|, the base is passed as the
 		second argument: >
 			GetBuffer()->listener_add(callback)
@@ -5309,6 +5376,7 @@ log({expr})						*log()*
 		Return the natural logarithm (base e) of {expr} as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number| in the range
 		(0, inf].
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo log(10)
 <			2.302585 >
@@ -5324,6 +5392,7 @@ log({expr})						*log()*
 log10({expr})						*log10()*
 		Return the logarithm of Float {expr} to base 10 as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo log10(1000)
 <			3.0 >
@@ -5422,8 +5491,9 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 		below. To get a list of all mappings see |maplist()|.
 
 		When there is no mapping for {name}, an empty String is
-		returned.  When the mapping for {name} is empty, then "<Nop>"
-		is returned.
+		returned if {dict} is FALSE, otherwise returns an empty Dict.
+		When the mapping for {name} is empty, then "<Nop>" is
+		returned.
 
 		The {name} can have special key names, like in the ":map"
 		command.
@@ -5716,6 +5786,8 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 		The number of matches is not limited, as it is the case with
 		the |:match| commands.
 
+		Returns -1 on error.
+
 		Example: >
 			:highlight MyGroup ctermbg=green guibg=green
 			:let m = matchadd("MyGroup", "TODO")
@@ -5754,6 +5826,8 @@ matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
 
 		The maximum number of positions in {pos} is 8.
 
+		Returns -1 on error.
+
 		Example: >
 			:highlight MyGroup ctermbg=green guibg=green
 			:let m = matchaddpos("MyGroup", [[23, 24], 34])
@@ -5825,6 +5899,8 @@ matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
 		    matchseq	When this item is present return only matches
 				that contain the characters in {str} in the
 				given sequence.
+		    limit	Maximum number of matches in {list} to be
+				returned.  Zero means no limit.
 
 		If {list} is a list of dictionaries, then the optional {dict}
 		argument supports the following additional items:
@@ -5836,8 +5912,6 @@ matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
 				This should accept a dictionary item as the
 				argument and return the text for that item to
 				use for fuzzy matching.
-		    limit	Maximum number of matches in {list} to be
-				returned.  Zero means no limit.
 
 		{str} is treated as a literal string and regular expression
 		matching is NOT supported.  The maximum supported {str} length
@@ -6199,11 +6273,17 @@ nr2char({expr} [, {utf8}])				*nr2char()*
 or({expr}, {expr})					*or()*
 		Bitwise OR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
+		Also see `and()` and `xor()`.
 		Example: >
 			:let bits = or(bits, 0x80)
 <		Can also be used as a |method|: >
 			:let bits = bits->or(0x80)
 
+<		Rationale: The reason this is a function and not using the "|"
+		character like many languages, is that Vi has always used "|"
+		to separate commands.  In many places it would not be clear if
+		"|" is an operator or a command separator.
+
 
 pathshorten({path} [, {len}])				*pathshorten()*
 		Shorten directory names in the path {path} and return the
@@ -6217,6 +6297,7 @@ pathshorten({path} [, {len}])				*pathshorten()*
 			:echo pathshorten('~/.vim/autoload/myfile.vim', 2)
 <			~/.vi/au/myfile.vim ~
 		It doesn't matter if the path exists or not.
+		Returns an empty string on error.
 
 		Can also be used as a |method|: >
 			GetDirectories()->pathshorten()
@@ -6246,6 +6327,7 @@ popup_ functions are documented here: |popup-functions|
 pow({x}, {y})						*pow()*
 		Return the power of {x} to the exponent {y} as a |Float|.
 		{x} and {y} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {x} or {y} is not a |Float| or a |Number|.
 		Examples: >
 			:echo pow(3, 3)
 <			27.0 >
@@ -6622,6 +6704,7 @@ rand([{expr}])						*rand()* *random*
 		{expr} can be initialized by |srand()| and will be updated by
 		rand().  If {expr} is omitted, an internal seed value is used
 		and updated.
+		Returns -1 if {expr} is invalid.
 
 		Examples: >
 			:echo rand()
@@ -6711,6 +6794,8 @@ readdir({directory} [, {expr} [, {dict}]])			*readdir()*
 		  endfunction
 		  echo s:tree(".")
 <
+		Returns an empty List on error.
+
 		Can also be used as a |method|: >
 			GetDirName()->readdir()
 <
@@ -6769,7 +6854,6 @@ readdirex({directory} [, {expr} [, {dict}]])			*readdirex()*
 		For example, to get a list of all files in the current
 		directory without sorting the individual entries: >
 		  readdirex(dirname, '1', #{sort: 'none'})
-
 <
 		Can also be used as a |method|: >
 			GetDirName()->readdirex()
@@ -6850,15 +6934,17 @@ reltime([{start} [, {end}]])				*reltime()*
 		The item can be passed to |reltimestr()| to convert it to a
 		string or |reltimefloat()| to convert to a Float.
 
-		Without an argument reltime() returns the current time.
+		Without an argument reltime() returns the current time (the
+		representation is system-dependend, it can not be used as the
+		wall-clock time, see |localtime()| for that).
 		With one argument is returns the time passed since the time
 		specified in the argument.
 		With two arguments it returns the time passed between {start}
 		and {end}.
 
 		The {start} and {end} arguments must be values returned by
-		reltime().  If there is an error zero is returned in legacy
-		script, in Vim9 script an error is given.
+		reltime().  If there is an error an empty List is returned in
+		legacy script, in Vim9 script an error is given.
 
 		Can also be used as a |method|: >
 			GetStart()->reltime()
@@ -6977,7 +7063,8 @@ remote_peek({serverid} [, {retvar}])		*remote_peek()*
 remote_read({serverid}, [{timeout}])			*remote_read()*
 		Return the oldest available reply from {serverid} and consume
 		it.  Unless a {timeout} in seconds is given, it blocks until a
-		reply is available.
+		reply is available.  Returns an empty string, if a reply is
+		not available or on error.
 		See also |clientserver|.
 		This function is not available in the |sandbox|.
 		{only available when compiled with the |+clientserver| feature}
@@ -7036,6 +7123,7 @@ remove({list}, {idx} [, {end}])				*remove()*
 		item as {end} a list with one item is returned.  When {end}
 		points to an item before {idx} this is an error.
 		See |list-index| for possible values of {idx} and {end}.
+		Returns zero on error.
 		Example: >
 			:echo "last item: " .. remove(mylist, -1)
 			:call remove(mylist, 0, 9)
@@ -7052,6 +7140,7 @@ remove({blob}, {idx} [, {end}])
 		return a |Blob| with these bytes.  When {idx} points to the same
 		byte as {end} a |Blob| with one byte is returned.  When {end}
 		points to a byte before {idx} this is an error.
+		Returns zero on error.
 		Example: >
 			:echo "last byte: " .. remove(myblob, -1)
 			:call remove(mylist, 0, 9)
@@ -7061,6 +7150,7 @@ remove({dict}, {key})
 		Example: >
 			:echo "removed " .. remove(dict, "one")
 <		If there is no {key} in {dict} this is an error.
+		Returns zero on error.
 
 rename({from}, {to})					*rename()*
 		Rename the file by the name {from} to the name {to}.  This
@@ -7109,6 +7199,7 @@ reverse({object})					*reverse()*
 		Reverse the order of items in {object} in-place.
 		{object} can be a |List| or a |Blob|.
 		Returns {object}.
+		Returns zero if {object} is not a List or a Blob.
 		If you want an object to remain unmodified make a copy first: >
 			:let revlist = reverse(copy(mylist))
 <		Can also be used as a |method|: >
@@ -7119,6 +7210,7 @@ round({expr})							*round()*
 		as a |Float|.  If {expr} lies halfway between two integral
 		values, then use the larger one (away from zero).
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			echo round(0.456)
 <			0.0  >
@@ -7153,6 +7245,7 @@ screenattr({row}, {col})					*screenattr()*
 		Like |screenchar()|, but return the attribute.  This is a rather
 		arbitrary number that can only be used to compare to the
 		attribute at other positions.
+		Returns -1 when row or col is out of range.
 
 		Can also be used as a |method|: >
 			GetRow()->screenattr(col)
@@ -7216,6 +7309,7 @@ screenpos({winid}, {lnum}, {col})				*screenpos()*
 		|conceal| taken into account.
 		If the position is in a closed fold the screen position of the
 		first character is returned, {col} is not used.
+		Returns an empty Dict if {winid} is invalid.
 
 		Can also be used as a |method|: >
 			GetWinid()->screenpos(lnum, col)
@@ -8276,6 +8370,7 @@ simplify({filename})					*simplify()*
 sin({expr})						*sin()*
 		Return the sine of {expr}, measured in radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo sin(100)
 <			-0.506366 >
@@ -8292,6 +8387,7 @@ sinh({expr})						*sinh()*
 		Return the hyperbolic sine of {expr} as a |Float| in the range
 		[-inf, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo sinh(0.5)
 <			0.521095 >
@@ -8311,6 +8407,7 @@ slice({expr}, {start} [, {end}])			*slice()*
 		|vim9script|.  Also, composing characters are not counted.
 		When {end} is omitted the slice continues to the last item.
 		When {end} is -1 the last item is omitted.
+		Returns an empty value if {start} or {end} are invalid.
 
 		Can also be used as a |method|: >
 			GetList()->slice(offset)
@@ -8556,7 +8653,8 @@ sqrt({expr})						*sqrt()*
 		Return the non-negative square root of Float {expr} as a
 		|Float|.
 		{expr} must evaluate to a |Float| or a |Number|.  When {expr}
-		is negative the result is NaN (Not a Number).
+		is negative the result is NaN (Not a Number).  Returns 0.0 if
+		{expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo sqrt(100)
 <			10.0 >
@@ -8637,6 +8735,8 @@ str2float({string} [, {quoted}])				*str2float()*
 		|substitute()|: >
 			let f = str2float(substitute(text, ',', '', 'g'))
 <
+		Returns 0.0 if the conversion fails.
+
 		Can also be used as a |method|: >
 			let f = text->substitute(',', '', 'g')->str2float()
 <
@@ -8676,6 +8776,8 @@ str2nr({string} [, {base} [, {quoted}]])			*str2nr()*
 		{base} is 2 a leading "0b" or "0B" is ignored.
 		Text after the number is silently ignored.
 
+		Returns 0 if {string} is empty or on error.
+
 		Can also be used as a |method|: >
 			GetText()->str2nr()
 
@@ -8686,6 +8788,8 @@ strcharlen({string})					*strcharlen()*
 		|strchars()| can count the number of characters, counting
 		composing characters separately.
 
+		Returns 0 if {string} is empty or on error.
+
 		Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
 
 		Can also be used as a |method|: >
@@ -8705,6 +8809,8 @@ strcharpart({src}, {start} [, {len} [, {skipcc}]])		*strcharpart()*
 			strcharpart('abc', -1, 2)
 <		results in 'a'.
 
+		Returns an empty string on error.
+
 		Can also be used as a |method|: >
 			GetText()->strcharpart(5)
 
@@ -8717,6 +8823,8 @@ strchars({string} [, {skipcc}])					*strchars()*
 		When {skipcc} set to 1, Composing characters are ignored.
 		|strcharlen()| always does this.
 
+		Returns zero on error.
+
 		Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
 
 		{skipcc} is only available after 7.4.755.  For backward
@@ -8749,6 +8857,7 @@ strdisplaywidth({string} [, {col}])			*strdisplaywidth()*
 		'tabstop' and 'display'.
 		When {string} contains characters with East Asian Width Class
 		Ambiguous, this function's return value depends on 'ambiwidth'.
+		Returns zero on error.
 		Also see |strlen()|, |strwidth()| and |strchars()|.
 
 		Can also be used as a |method|: >
@@ -8782,6 +8891,7 @@ strgetchar({str}, {index})				*strgetchar()*
 		index.  Composing characters are considered separate
 		characters here.  Use |nr2char()| to convert the Number to a
 		String.
+		Returns -1 if {index} is invalid.
 		Also see |strcharpart()| and |strchars()|.
 
 		Can also be used as a |method|: >
@@ -8836,7 +8946,7 @@ strlen({string})						*strlen()*
 		The result is a Number, which is the length of the String
 		{string} in bytes.
 		If the argument is a Number it is first converted to a String.
-		For other types an error is given.
+		For other types an error is given and zero is returned.
 		If you want to count the number of multibyte characters use
 		|strchars()|.
 		Also see |len()|, |strdisplaywidth()| and |strwidth()|.
@@ -8867,6 +8977,8 @@ strpart({src}, {start} [, {len} [, {chars}]])			*strpart()*
 		example, to get the character under the cursor: >
 			strpart(getline("."), col(".") - 1, 1, v:true)
 <
+		Returns an empty string on error.
+
 		Can also be used as a |method|: >
 			GetText()->strpart(5)
 
@@ -8929,6 +9041,8 @@ strtrans({string})					*strtrans()*
 <		This displays a newline in register a as "^@" instead of
 		starting a new line.
 
+		Returns an empty string on error.
+
 		Can also be used as a |method|: >
 			GetString()->strtrans()
 
@@ -8938,6 +9052,7 @@ strwidth({string})					*strwidth()*
 		cell, alternatively use |strdisplaywidth()|.
 		When {string} contains characters with East Asian Width Class
 		Ambiguous, this function's return value depends on 'ambiwidth'.
+		Returns zero on error.
 		Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
 
 		Can also be used as a |method|: >
@@ -8963,6 +9078,8 @@ submatch({nr} [, {list}])			*submatch()* *E935*
 		When substitute() is used recursively only the submatches in
 		the current (deepest) call can be obtained.
 
+		Returns an empty string or list on error.
+
 		Examples: >
 			:s/\d\+/\=submatch(0) + 1/
 			:echo substitute(text, '\d\+', '\=submatch(0) + 1', '')
@@ -9013,7 +9130,9 @@ substitute({string}, {pat}, {sub}, {flags})		*substitute()*
 		|submatch()| returns.  Example: >
 		   :echo substitute(s, '%\(\x\x\)', {m -> '0x' .. m[1]}, 'g')
 
-<		Can also be used as a |method|: >
+<		Returns an empty string on error.
+
+		Can also be used as a |method|: >
 			GetString()->substitute(pat, sub, flags)
 
 swapinfo({fname})					*swapinfo()*
@@ -9068,6 +9187,8 @@ synID({lnum}, {col}, {trans})				*synID()*
 		Warning: This function can be very slow.  Best speed is
 		obtained by going through the file in forward direction.
 
+		Returns zero on error.
+
 		Example (echoes the name of the syntax item under the cursor): >
 			:echo synIDattr(synID(line("."), col("."), 1), "name")
 <
@@ -9105,6 +9226,8 @@ synIDattr({synID}, {what} [, {mode}])			*synIDattr()*
 		"undercurl"	"1" if undercurled
 		"strike"	"1" if strikethrough
 
+		Returns an empty string on error.
+
 		Example (echoes the color of the syntax item under the
 		cursor): >
 	:echo synIDattr(synIDtrans(synID(line("."), col("."), 1)), "fg")
@@ -9119,6 +9242,8 @@ synIDtrans({synID})					*synIDtrans()*
 		highlight the character.  Highlight links given with
 		":highlight link" are followed.
 
+		Returns zero on error.
+
 		Can also be used as a |method|: >
 	:echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 
@@ -9163,7 +9288,7 @@ synstack({lnum}, {col})					*synstack()*
 			   echo synIDattr(id, "name")
 			endfor
 <		When the position specified with {lnum} and {col} is invalid
-		nothing is returned.  The position just after the last
+		an empty List is returned.  The position just after the last
 		character in a line and the first column in an empty line are
 		valid positions.
 
@@ -9277,6 +9402,8 @@ tabpagenr([{arg}])					*tabpagenr()*
 				previous tab page 0 is returned.
 		The number can be used with the |:tab| command.
 
+		Returns zero on error.
+
 
 tabpagewinnr({tabarg} [, {arg}])			*tabpagewinnr()*
 		Like |winnr()| but for tab page {tabarg}.
@@ -9349,6 +9476,7 @@ tan({expr})						*tan()*
 		Return the tangent of {expr}, measured in radians, as a |Float|
 		in the range [-inf, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo tan(10)
 <			0.648361 >
@@ -9365,6 +9493,7 @@ tanh({expr})						*tanh()*
 		Return the hyperbolic tangent of {expr} as a |Float| in the
 		range [-1, 1].
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			:echo tanh(0.5)
 <			0.462117 >
@@ -9494,6 +9623,8 @@ timer_start({time}, {callback} [, {options}])
 				Vim becomes unusable because of all the error
 				messages.
 
+		Returns -1 on error.
+
 		Example: >
 			func MyHandler(timer)
 			  echo 'Handler called'
@@ -9529,7 +9660,7 @@ timer_stopall()						*timer_stopall()*
 tolower({expr})						*tolower()*
 		The result is a copy of the String given, with all uppercase
 		characters turned into lowercase (just like applying |gu| to
-		the string).
+		the string).  Returns an empty string on error.
 
 		Can also be used as a |method|: >
 			GetText()->tolower()
@@ -9537,7 +9668,7 @@ tolower({expr})						*tolower()*
 toupper({expr})						*toupper()*
 		The result is a copy of the String given, with all lowercase
 		characters turned into uppercase (just like applying |gU| to
-		the string).
+		the string).  Returns an empty string on error.
 
 		Can also be used as a |method|: >
 			GetText()->toupper()
@@ -9550,6 +9681,8 @@ tr({src}, {fromstr}, {tostr})				*tr()*
 		and so on.  Exactly like the unix "tr" command.
 		This code also deals with multibyte characters properly.
 
+		Returns an empty string on error.
+
 		Examples: >
 			echo tr("hello there", "ht", "HT")
 <		returns "Hello THere" >
@@ -9575,6 +9708,7 @@ trim({text} [, {mask} [, {dir}]])				*trim()*
 		When omitted both ends are trimmed.
 
 		This function deals with multibyte characters properly.
+		Returns an empty string on error.
 
 		Examples: >
 			echo trim("   some text ")
@@ -9593,6 +9727,7 @@ trunc({expr})							*trunc()*
 		Return the largest integral value with magnitude less than or
 		equal to {expr} as a |Float| (truncate towards zero).
 		{expr} must evaluate to a |Float| or a |Number|.
+		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 		Examples: >
 			echo trunc(1.456)
 <			1.0  >
@@ -9711,17 +9846,20 @@ uniq({list} [, {func} [, {dict}]])			*uniq()* *E882*
 <		The default compare function uses the string representation of
 		each item.  For the use of {func} and {dict} see |sort()|.
 
+		Returns zero if {list} is not a |List|.
+
 		Can also be used as a |method|: >
 			mylist->uniq()
 
 values({dict})						*values()*
 		Return a |List| with all the values of {dict}.  The |List| is
 		in arbitrary order.  Also see |items()| and |keys()|.
+		Returns zero if {dict} is not a |Dict|.
 
 		Can also be used as a |method|: >
 			mydict->values()
 
-virtcol({expr})						*virtcol()*
+virtcol({expr} [, {list}])				*virtcol()*
 		The result is a Number, which is the screen column of the file
 		position given with {expr}.  That is, the last screen position
 		occupied by the character at that position, when the screen
@@ -9730,13 +9868,17 @@ virtcol({expr})						*virtcol()*
 		the <Tab>.  For example, for a <Tab> in column 1, with 'ts'
 		set to 8, it returns 8. |conceal| is ignored.
 		For the byte position use |col()|.
+
 		For the use of {expr} see |col()|.
-		When 'virtualedit' is used {expr} can be [lnum, col, off], where
-		"off" is the offset in screen columns from the start of the
-		character.  E.g., a position within a <Tab> or after the last
-		character.  When "off" is omitted zero is used.
-		When Virtual editing is active in the current mode, a position
-		beyond the end of the line can be returned. |'virtualedit'|
+
+		When 'virtualedit' is used {expr} can be [lnum, col, off],
+		where "off" is the offset in screen columns from the start of
+		the character.  E.g., a position within a <Tab> or after the
+		last character.  When "off" is omitted zero is used.  When
+		Virtual editing is active in the current mode, a position
+		beyond the end of the line can be returned.  Also see
+		|'virtualedit'|
+
 		The accepted positions are:
 		    .	    the cursor position
 		    $	    the end of the cursor line (the result is the
@@ -9748,11 +9890,22 @@ virtcol({expr})						*virtcol()*
 			    cursor is the end).  When not in Visual mode
 			    returns the cursor position.  Differs from |'<| in
 			    that it's updated right away.
+
+		If {list} is present and non-zero then virtcol() returns a List
+		with the first and last screen position occupied by the
+		character.
+
 		Note that only marks in the current file can be used.
 		Examples: >
-  virtcol(".")	   with text "foo^Lbar", with cursor on the "^L", returns 5
-  virtcol("$")	   with text "foo^Lbar", returns 9
-  virtcol("'t")    with text "	  there", with 't at 'h', returns 6
+			" With text "foo^Lbar" and cursor on the "^L":
+
+			virtcol(".")	" returns 5
+			virtcol(".", 1)	" returns [4, 5]
+			virtcol("$")	" returns 9
+
+			" With text "	  there", with 't at 'h':
+
+			virtcol("'t")	" returns 6
 <		The first column is 1.  0 is returned for an error.
 		A more advanced example that echoes the maximum length of
 		all lines: >
@@ -9761,6 +9914,25 @@ virtcol({expr})						*virtcol()*
 <		Can also be used as a |method|: >
 			GetPos()->virtcol()
 
+virtcol2col({winid}, {lnum}, {col})			*virtcol2col()*
+		The result is a Number, which is the byte index of the
+		character in window {winid} at buffer line {lnum} and virtual
+		column {col}.
+
+		If {col} is greater than the last virtual column in line
+		{lnum}, then the byte index of the character at the last
+		virtual column is returned.
+
+		The {winid} argument can be the window number or the
+		|window-ID|. If this is zero, then the current window is used.
+
+		Returns -1 if the window {winid} doesn't exist or the buffer
+		line {lnum} or virtual column {col} is invalid.
+
+		See also |screenpos()|, |virtcol()| and |col()|.
+
+		Can also be used as a |method|: >
+			GetWinid()->virtcol2col(lnum, col)
 
 visualmode([{expr}])						*visualmode()*
 		The result is a String, which describes the last Visual mode
@@ -9887,6 +10059,8 @@ win_move_separator({nr}, {offset})			*win_move_separator()*
 		specified (e.g., as a consequence of maintaining
 		'winminwidth'). Returns TRUE if the window can be found and
 		FALSE otherwise.
+		This will fail for the rightmost window and a full-width
+		window, since it has no separator on the right.
 
 		Can also be used as a |method|: >
 			GetWinnr()->win_move_separator(offset)
@@ -10041,6 +10215,7 @@ winnr([{arg}])	The result is a Number, which is the number of the current
 				current window (where |CTRL-W_l| goes to).
 		The number can be used with |CTRL-W_w| and ":wincmd w"
 		|:wincmd|.
+		When {arg} is invalid an error is given and zero is returned.
 		Also see |tabpagewinnr()| and |win_getid()|.
 		Examples: >
 			let window_count = winnr('$')
@@ -10193,6 +10368,7 @@ writefile({object}, {fname} [, {flags}])
 xor({expr}, {expr})					*xor()*
 		Bitwise XOR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
+		Also see `and()` and `or()`.
 		Example: >
 			:let bits = xor(bits, 0x80)
 <

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 8.2.  Last change: 2022 May 07
+*change.txt*    For Vim version 8.2.  Last change: 2022 May 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1272,7 +1272,7 @@ to their previous contents.  When the '>' flag is present in 'cpoptions' then
 a line break is inserted before the appended text.
 
 5. Read-only registers ":, ". and "%
-These are '%', '#', ':' and '.'.  You can use them only with the "p", "P",
+These are '%', ':' and '.'.  You can use them only with the "p", "P",
 and ":put" commands and with CTRL-R.
 						*quote_.* *quote.* *E29*
 	".	Contains the last inserted text (the same as what is inserted

runtime/doc/channel.txt

@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 8.2.  Last change: 2022 Apr 16
+*channel.txt*      For Vim version 8.2.  Last change: 2022 Jun 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -628,15 +628,18 @@ ch_logfile({fname} [, {mode}])					*ch_logfile()*
 		Start logging channel activity to {fname}.
 		When {fname} is an empty string: stop logging.
 
-		When {mode} is omitted or "a" append to the file.
-		When {mode} is "w" start with an empty file.
+		When {mode} is omitted or contains "a" or is "o" then append
+		to the file.
+		When {mode} contains "w" and not "a" start with an empty file.
+		When {mode} contains "o" then log all terminal output.
+		Otherwise only some interesting terminal output is logged.
 
 		Use |ch_log()| to write log messages.  The file is flushed
 		after every message, on Unix you can use "tail -f" to see what
 		is going on in real time.
 
 		To enable the log very early, to see what is received from a
-		terminal during startup, use |--log|: >
+		terminal during startup, use |--log| (this uses mode "ao"): >
 			vim --log logfile
 <
 		This function is not available in the |sandbox|.
@@ -1482,7 +1485,7 @@ request to the LSP server (if needed).  Example: >
     let resp = ch_sendexpr(ch, req, #{callback: 'HoverFunc'})
 
 To cancel an outstanding asynchronous LSP request sent to the server using the
-|ch_sendexpr()| function, send a cancelation message to the server using the
+|ch_sendexpr()| function, send a cancellation message to the server using the
 |ch_sendexpr()| function with the ID returned by the |ch_sendexpr()| function
 for the request.  Example: >
 
@@ -1530,7 +1533,7 @@ A LSP request message has the following format (expressed as a Vim Dict).  The
 	"params": <list|dict>
     }
 
-A LSP reponse message has the following format (expressed as a Vim Dict).  The
+A LSP response message has the following format (expressed as a Vim Dict).  The
 "result" and "error" fields are optional: >
 
     {
@@ -1562,7 +1565,7 @@ A LSP request message has the following format (expressed as a Vim Dict).  The
 	"params": <list|dict>
     }
 
-A LSP reponse message has the following format (expressed as a Vim Dict).  The
+A LSP response message has the following format (expressed as a Vim Dict).  The
 "result" and "error" fields are optional: >
 
     {

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.2.  Last change: 2022 Apr 29
+*cmdline.txt*   For Vim version 8.2.  Last change: 2022 Jun 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1218,8 +1218,8 @@ save the command-line history and read it back later.
 If the 'wildchar' option is set to <Tab>, and the command-line window is used
 for an Ex command, then two mappings will be added to use <Tab> for completion
 in the command-line window, like this: >
-	:imap <buffer> <Tab> <C-X><C-V>
-	:nmap <buffer> <Tab> a<C-X><C-V>
+	:inoremap <buffer> <Tab> <C-X><C-V>
+	:nnoremap <buffer> <Tab> a<C-X><C-V>
 Note that hitting <Tab> in Normal mode will do completion on the next
 character.  That way it works at the end of the line.
 If you don't want these mappings, disable them with: >

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.2.  Last change: 2022 May 13
+*eval.txt*	For Vim version 8.2.  Last change: 2022 Jun 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -183,10 +183,15 @@ You will not get an error if you try to change the type of a variable.
 1.2 Function references ~
 				*Funcref* *E695* *E718* *E1192*
 A Funcref variable is obtained with the |function()| function, the |funcref()|
-function or created with the lambda expression |expr-lambda|.  It can be used
-in an expression in the place of a function name, before the parenthesis
-around the arguments, to invoke the function it refers to.  Example: >
+function, (in |Vim9| script) the name of a function, or created with the
+lambda expression |expr-lambda|.  It can be used in an expression in the place
+of a function name, before the parenthesis around the arguments, to invoke the
+function it refers to.  Example in |Vim9| script: >
 
+	:var Fn = MyFunc
+	:echo Fn()
+
+Legacy script: >
 	:let Fn = function("MyFunc")
 	:echo Fn()
 <							*E704* *E705* *E707*
@@ -526,7 +531,7 @@ entry.  Note that the String '04' and the Number 04 are different, since the
 Number will be converted to the String '4', leading zeros are dropped.  The
 empty string can also be used as a key.
 
-In |Vim9| script literaly keys can be used if the key consists of alphanumeric
+In |Vim9| script a literal key can be used if it consists only of alphanumeric
 characters, underscore and dash, see |vim9-literal-dict|.
 						*literal-Dict* *#{}*
 To avoid having to put quotes around every key the #{} form can be used in
@@ -868,33 +873,36 @@ Expression syntax summary, from least to most significant:
 	expr5 isnot expr5	different |List|, |Dictionary| or |Blob|
 				instance
 
-|expr5|	expr6
-	expr6 +	 expr6 ...	number addition, list or blob concatenation
-	expr6 -	 expr6 ...	number subtraction
-	expr6 .	 expr6 ...	string concatenation
-	expr6 .. expr6 ...	string concatenation
+|expr5|	expr6 << expr6		bitwise left shift
+	expr6 >> expr6		bitwise right shift
 
 |expr6|	expr7
-	expr7 *	 expr7 ...	number multiplication
-	expr7 /	 expr7 ...	number division
-	expr7 %	 expr7 ...	number modulo
+	expr7 +	 expr7 ...	number addition, list or blob concatenation
+	expr7 -	 expr7 ...	number subtraction
+	expr7 .	 expr7 ...	string concatenation
+	expr7 .. expr7 ...	string concatenation
 
 |expr7|	expr8
-	<type>expr8		type check and conversion (|Vim9| only)
+	expr8 *	 expr8 ...	number multiplication
+	expr8 /	 expr8 ...	number division
+	expr8 %	 expr8 ...	number modulo
 
 |expr8|	expr9
-	! expr8			logical NOT
-	- expr8			unary minus
-	+ expr8			unary plus
+	<type>expr9		type check and conversion (|Vim9| only)
 
 |expr9|	expr10
-	expr9[expr1]		byte of a String or item of a |List|
-	expr9[expr1 : expr1]	substring of a String or sublist of a |List|
-	expr9.name		entry in a |Dictionary|
-	expr9(expr1, ...)	function call with |Funcref| variable
-	expr9->name(expr1, ...)	|method| call
+	! expr9			logical NOT
+	- expr9			unary minus
+	+ expr9			unary plus
 
-|expr10|  number		number constant
+|expr10|  expr11
+	expr10[expr1]		byte of a String or item of a |List|
+	expr10[expr1 : expr1]	substring of a String or sublist of a |List|
+	expr10.name		entry in a |Dictionary|
+	expr10(expr1, ...)	function call with |Funcref| variable
+	expr10->name(expr1, ...)	|method| call
+
+|expr11|  number		number constant
 	"string"		string constant, backslash is special
 	'string'		string constant, ' is doubled
 	[expr1, ...]		|List|
@@ -1128,14 +1136,27 @@ can be matched like an ordinary character.  Examples:
 	"foo\nbar" =~ "\\n"	evaluates to 0
 
 
-expr5 and expr6				*expr5* *expr6* *E1036* *E1051*
----------------
-expr6 + expr6   Number addition, |List| or |Blob| concatenation	*expr-+*
-expr6 - expr6   Number subtraction				*expr--*
-expr6 . expr6   String concatenation				*expr-.*
-expr6 .. expr6  String concatenation				*expr-..*
+expr5						*expr5* *bitwise-shift*
+-----
+expr6 << expr6	bitwise left shift				*expr-<<*
+expr6 >> expr6	bitwise right shift				*expr->>*
+							*E1282* *E1283*
+The "<<" and ">>" operators can be used to perform bitwise left or right shift
+of the left operand by the number of bits specified by the right operand.  The
+operands are used as positive numbers.  When shifting right with ">>" the
+topmost bit (sometimes called the sign bit) is cleared.  If the right operand
+(shift amount) is more than the maximum number of bits in a number
+(|v:numbersize|) the result is zero.
 
-For |Lists| only "+" is possible and then both expr6 must be a list.  The
+
+expr6 and expr7				*expr6* *expr7* *E1036* *E1051*
+---------------
+expr7 + expr7   Number addition, |List| or |Blob| concatenation	*expr-+*
+expr7 - expr7   Number subtraction				*expr--*
+expr7 . expr7   String concatenation				*expr-.*
+expr7 .. expr7  String concatenation				*expr-..*
+
+For |Lists| only "+" is possible and then both expr7 must be a list.  The
 result is a new list with the two lists Concatenated.
 
 For String concatenation ".." is preferred, since "." is ambiguous, it is also
@@ -1147,9 +1168,9 @@ In |Vim9| script the arguments of ".." are converted to String for simple
 types: Number, Float, Special and Bool.  For other types |string()| should be
 used.
 
-expr7 * expr7  Number multiplication				*expr-star*
-expr7 / expr7  Number division					*expr-/*
-expr7 % expr7  Number modulo					*expr-%*
+expr8 * expr8  Number multiplication				*expr-star*
+expr8 / expr8  Number division					*expr-/*
+expr8 % expr8  Number modulo					*expr-%*
 
 In legacy script, for all operators except "." and "..", Strings are converted
 to Numbers.
@@ -1191,18 +1212,18 @@ None of these work for |Funcref|s.
 ".", ".." and "%" do not work for Float. *E804* *E1035*
 
 
-expr7							*expr7*
+expr8							*expr8*
 -----
-<type>expr8
+<type>expr9
 
 This is only available in |Vim9| script, see |type-casting|.
 
 
-expr8							*expr8*
+expr9							*expr9*
 -----
-! expr8			logical NOT		*expr-!*
-- expr8			unary minus		*expr-unary--*
-+ expr8			unary plus		*expr-unary-+*
+! expr9			logical NOT		*expr-!*
+- expr9			unary minus		*expr-unary--*
++ expr9			unary plus		*expr-unary-+*
 
 For '!' |TRUE| becomes |FALSE|, |FALSE| becomes |TRUE| (one).
 For '-' the sign of the number is changed.
@@ -1224,21 +1245,21 @@ These three can be repeated and mixed.  Examples:
 	--9	    == 9
 
 
-expr9							*expr9*
------
-This expression is either |expr10| or a sequence of the alternatives below,
+expr10							*expr10*
+------
+This expression is either |expr11| or a sequence of the alternatives below,
 in any order.  E.g., these are all possible:
-	expr9[expr1].name
-	expr9.name[expr1]
-	expr9(expr1, ...)[expr1].name
-	expr9->(expr1, ...)[expr1]
+	expr10[expr1].name
+	expr10.name[expr1]
+	expr10(expr1, ...)[expr1].name
+	expr10->(expr1, ...)[expr1]
 Evaluation is always from left to right.
 
-expr9[expr1]		item of String or |List|	*expr-[]* *E111*
+expr10[expr1]		item of String or |List|	*expr-[]* *E111*
 						*E909* *subscript* *E1062*
 In legacy Vim script:
-If expr9 is a Number or String this results in a String that contains the
-expr1'th single byte from expr9.  expr9 is used as a String (a number is
+If expr10 is a Number or String this results in a String that contains the
+expr1'th single byte from expr10.  expr10 is used as a String (a number is
 automatically converted to a String), expr1 as a Number.  This doesn't
 recognize multibyte encodings, see `byteidx()` for an alternative, or use
 `split()` to turn the string into a list of characters.  Example, to get the
@@ -1246,8 +1267,8 @@ byte under the cursor: >
 	:let c = getline(".")[col(".") - 1]
 
 In |Vim9| script:					*E1147* *E1148*
-If expr9 is a String this results in a String that contains the expr1'th
-single character (including any composing characters) from expr9.  To use byte
+If expr10 is a String this results in a String that contains the expr1'th
+single character (including any composing characters) from expr10.  To use byte
 indexes use |strpart()|.
 
 Index zero gives the first byte or character.  Careful: text column numbers
@@ -1258,7 +1279,7 @@ String.  A negative index always results in an empty string (reason: backward
 compatibility).  Use [-1:] to get the last byte or character.
 In Vim9 script a negative index is used like with a list: count from the end.
 
-If expr9 is a |List| then it results the item at index expr1.  See |list-index|
+If expr10 is a |List| then it results the item at index expr1.  See |list-index|
 for possible index values.  If the index is out of range this results in an
 error.  Example: >
 	:let item = mylist[-1]		" get last item
@@ -1268,14 +1289,14 @@ Generally, if a |List| index is equal to or higher than the length of the
 error.
 
 
-expr9[expr1a : expr1b]	substring or sublist		*expr-[:]*
+expr10[expr1a : expr1b]	substring or sublist		*expr-[:]*
 
-If expr9 is a String this results in the substring with the bytes or
-characters from expr1a to and including expr1b.  expr9 is used as a String,
+If expr10 is a String this results in the substring with the bytes or
+characters from expr1a to and including expr1b.  expr10 is used as a String,
 expr1a and expr1b are used as a Number.
 
 In legacy Vim script the indexes are byte indexes.  This doesn't recognize
-multibyte encodings, see |byteidx()| for computing the indexes.  If expr9 is
+multibyte encodings, see |byteidx()| for computing the indexes.  If expr10 is
 a Number it is first converted to a String.
 
 In Vim9 script the indexes are character indexes and include composing
@@ -1302,20 +1323,20 @@ Examples: >
 	:let s = s[:-3]			" remove last two bytes
 <
 							*slice*
-If expr9 is a |List| this results in a new |List| with the items indicated by
+If expr10 is a |List| this results in a new |List| with the items indicated by
 the indexes expr1a and expr1b.  This works like with a String, as explained
 just above. Also see |sublist| below.  Examples: >
 	:let l = mylist[:3]		" first four items
 	:let l = mylist[4:4]		" List with one item
 	:let l = mylist[:]		" shallow copy of a List
 
-If expr9 is a |Blob| this results in a new |Blob| with the bytes in the
+If expr10 is a |Blob| this results in a new |Blob| with the bytes in the
 indexes expr1a and expr1b, inclusive.  Examples: >
 	:let b = 0zDEADBEEF
 	:let bs = b[1:2]		" 0zADBE
 	:let bs = b[:]			" copy of 0zDEADBEEF
 
-Using expr9[expr1] or expr9[expr1a : expr1b] on a |Funcref| results in an
+Using expr10[expr1] or expr10[expr1a : expr1b] on a |Funcref| results in an
 error.
 
 Watch out for confusion between a namespace and a variable followed by a colon
@@ -1324,11 +1345,11 @@ for a sublist: >
 	mylist[s:]     " uses namespace s:, error!
 
 
-expr9.name		entry in a |Dictionary|		*expr-entry*
+expr10.name		entry in a |Dictionary|		*expr-entry*
 							*E1203* *E1229*
-If expr9 is a |Dictionary| and it is followed by a dot, then the following
+If expr10 is a |Dictionary| and it is followed by a dot, then the following
 name will be used as a key in the |Dictionary|.  This is just like:
-expr9[name].
+expr10[name].
 
 The name must consist of alphanumeric characters, just like a variable name,
 but it may start with a number.  Curly braces cannot be used.
@@ -1345,17 +1366,17 @@ Note that the dot is also used for String concatenation.  To avoid confusion
 always put spaces around the dot for String concatenation.
 
 
-expr9(expr1, ...)	|Funcref| function call  	*E1085*
+expr10(expr1, ...)	|Funcref| function call  	*E1085*
 
-When expr9 is a |Funcref| type variable, invoke the function it refers to.
+When expr10 is a |Funcref| type variable, invoke the function it refers to.
 
 
-expr9->name([args])	method call			*method* *->*
-expr9->{lambda}([args])
+expr10->name([args])	method call			*method* *->*
+expr10->{lambda}([args])
 							*E260* *E276* *E1265*
 For methods that are also available as global functions this is the same as: >
-	name(expr9 [, args])
-There can also be methods specifically for the type of "expr9".
+	name(expr10 [, args])
+There can also be methods specifically for the type of "expr10".
 
 This allows for chaining, passing the value that one method returns to the
 next method: >
@@ -1364,7 +1385,7 @@ next method: >
 Example of using a lambda: >
 	GetPercentage()->{x -> x * 100}()->printf('%d%%')
 <
-When using -> the |expr8| operators will be applied first, thus: >
+When using -> the |expr9| operators will be applied first, thus: >
 	-1.234->string()
 Is equivalent to: >
 	(-1.234)->string()
@@ -1393,7 +1414,7 @@ When using the lambda form there must be no white space between the } and the
 (.
 
 
-							*expr10*
+							*expr11*
 number
 ------
 number			number constant			*expr-number*
@@ -1402,6 +1423,10 @@ number			number constant			*expr-number*
 Decimal, Hexadecimal (starting with 0x or 0X), Binary (starting with 0b or 0B)
 and Octal (starting with 0, 0o or 0O).
 
+Assuming 64 bit numbers are used (see |v:numbersize|) an unsigned number is
+truncated to 0x7fffffffffffffff or 9223372036854775807.  You can use -1 to get
+0xffffffffffffffff.
+
 						*floating-point-format*
 Floating point numbers can be written in two forms:
 
@@ -1524,7 +1549,7 @@ to be doubled.  These two commands are equivalent: >
 	if a =~ '\s*'
 
 
-interpolated-string					*interp-string* *E256*
+interpolated-string				*$quote* *interp-string* *E256*
 --------------------
 $"string"		interpolated string constant		*expr-$quote*
 $'string'		interpolated literal string constant	*expr-$'*
@@ -2978,7 +3003,7 @@ The file "~/vim/bufnetfuncs.vim" should then define functions that start with
 
 Using an autoload script ~
 							*autoload* *E746*
-This is introduced in the user manual, section |51.5|.
+This is introduced in the user manual, section |52.2|.
 
 Using a script in the "autoload" directory is simpler, but requires using
 exactly the right file name.  A function that can be autoloaded has a name

runtime/doc/filetype.txt

@@ -642,15 +642,15 @@ manpages and follows linked manpages on hitting CTRL-]).
 
 For bash,zsh,ksh or dash, add to the config file (.bashrc,.zshrc, ...)
 
-	export MANPAGER="vim -M +MANPAGER -"
+	export MANPAGER="vim +MANPAGER --not-a-term -"
 
 For (t)csh, add to the config file
 
-	setenv MANPAGER "vim -M +MANPAGER -"
+	setenv MANPAGER "vim +MANPAGER --not-a-term -"
 
 For fish, add to the config file
 
-	set -x MANPAGER "vim -M +MANPAGER -"
+	set -x MANPAGER "vim +MANPAGER --not-a-term -"
 
 
 MARKDOWN                                                *ft-markdown-plugin*

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 8.2.  Last change: 2022 Mar 05
+*index.txt*     For Vim version 8.2.  Last change: 2022 Jun 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -295,7 +295,7 @@ tag		char	      note action in Normal mode	~
 |/|		/{pattern}<CR>	1  search forward for the Nth occurrence of
 				   {pattern}
 |/<CR>|		/<CR>		1  search forward for {pattern} of last search
-|count|		0		1  cursor to the first char of the line
+|0|		0		1  cursor to the first char of the line
 |count|		1		   prepend to command to give a count
 |count|		2			"
 |count|		3			"

runtime/doc/insert.txt

@@ -671,7 +671,7 @@ Note: The keys that are valid in CTRL-X mode are not mapped.  This allows for
 ends CTRL-X mode (any key that is not a valid CTRL-X mode command) is mapped.
 Also, when doing completion with 'complete' mappings apply as usual.
 
-							*E578* *E565*
+								*E565*
 Note: While completion is active Insert mode can't be used recursively and
 buffer text cannot be changed.  Mappings that somehow invoke ":normal i.."
 will generate an E565 error.

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 8.2.  Last change: 2022 May 16
+*map.txt*       For Vim version 8.2.  Last change: 2022 Jun 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -63,6 +63,7 @@ modes.
 			allows for nested and recursive use of mappings.
 			Note: Trailing spaces are included in the {rhs},
 			because space is a valid Normal mode command.
+			See |map-trailing-white|.
 
 						*:nore* *:norem*
 :no[remap]  {lhs} {rhs}		|mapmode-nvo|	*:no*  *:noremap* *:nor*
@@ -100,10 +101,8 @@ modes.
 			for other modes where it applies.
 			It also works when {lhs} matches the {rhs} of a
 			mapping. This is for when an abbreviation applied.
-			Note: Trailing spaces are included in the {lhs}.  This
-			unmap does NOT work: >
-				:map @@ foo
-				:unmap @@ | print
+			Note: Trailing spaces are included in the {lhs}.
+			See |map-trailing-white|.
 
 :mapc[lear]			|mapmode-nvo|		*:mapc*   *:mapclear*
 :nmapc[lear]			|mapmode-n|		*:nmapc*  *:nmapclear*
@@ -168,6 +167,27 @@ that mapping won't get expanded yet, Vim is waiting for another character.
 If you type a space, then "foo" will get inserted, plus the space.  If you
 type "a", then "bar" will get inserted.
 
+Trailing white space ~
+							*map-trailing-white*
+This unmap command does NOT work: >
+	:map @@ foo
+	:unmap @@ | print
+
+Because it tries to unmap "@@ ", including the white space before the command
+separator "|".  Other examples with trailing white space: >
+	unmap @@ 
+	unmap @@     # Vim9 script comment
+	unmap @@     " legacy comment
+
+An error will be issued, which is very hard to identify, because the ending
+whitespace character in `unmap @@ ` is not visible.
+
+A generic solution is to put the command separator "|" right after the mapped
+keys.  After that white space and a comment may follow: >
+
+	unmap @@|    # Vim9 scriptcomment
+	unmap @@|    " legacy scriptcomment
+
 
 1.2 SPECIAL ARGUMENTS					*:map-arguments*
 
@@ -374,8 +394,6 @@ Note:
   mapping is recursive.
 - In Visual mode  you can use `line('v')` and `col('v')` to get one end of the
   Visual area, the cursor is at the other end.
-- In Select mode, |:map| and |:vmap| command mappings are executed in
-  Visual mode.  Use |:smap| to handle Select mode differently.
 
 							*E1255* *E1136*
 <Cmd> and <ScriptCmd> commands must terminate, that is, they must be followed

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.2.  Last change: 2022 May 21
+*options.txt*	For Vim version 8.2.  Last change: 2022 Jun 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -3402,8 +3402,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	This is similar to the default, except that these characters will also
 	be used when there is highlighting.
 
-	For "stl" and "stlnc" single-byte and multibyte characters are
-	supported.  But double-width characters are not supported.
+	For the "stl", "stlnc", "foldopen", "foldclose" and "foldsep" items
+	single-byte and multibyte characters are supported.  But double-width
+	characters are not supported.
 
 	The highlighting used for these items:
 	  item		highlight group ~
@@ -4264,7 +4265,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The type of highlighting used can be set with the 'l' occasion in the
 	'highlight' option.  This uses the "Search" highlight group by
 	default.  Note that only the matching text is highlighted, any offsets
-	are not applied.
+	are not applied.  If the "CurSearch" highlight group is set then the
+	current match is highlighted with that.
 	See also: 'incsearch' and |:match|.
 	When you get bored looking at the highlighted matches, you can turn it
 	off with |:nohlsearch|.  This does not change the option value, as
@@ -4953,6 +4955,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	executing macros, registers and other commands that have not been
 	typed.  Also, updating the window title is postponed.  To force an
 	update use |:redraw|.
+	This may ocasionally cause display errors.  It is only meant to be set
+	termporarily when performaing an operation where redrawing may cause
+	flickering or cause a slow down.
 
 			*'linebreak'* *'lbr'* *'nolinebreak'* *'nolbr'*
 'linebreak' 'lbr'	boolean	(default off)
@@ -5075,14 +5080,23 @@ A jump table for the options with a short description can be found at |Q_op|.
 			"space" setting is used.  For example,
 			`:set listchars=multispace:---+` shows ten consecutive
 			spaces as:
-				---+---+--
+				---+---+-- ~
 							*lcs-lead*
 	  lead:c	Character to show for leading spaces.  When omitted,
 			leading spaces are blank.  Overrides the "space" and
 			"multispace" settings for leading spaces.  You can
 			combine it with "tab:", for example: >
 				:set listchars+=tab:>-,lead:.
-<							*lcs-trail*
+<							*lcs-leadmultispace*
+	  leadmultispace:c...
+			Like multispace value, but only for leading whitespace
+			Overrides |lcs-lead| for leading multiple spaces.
+			`:set listchars=leadmultispace:---+` shows ten consecutive
+			leading spaces as:
+				---+---+--XXX ~
+			Where "XXX" denotes the first non-blank characters in
+			the line.
+							*lcs-trail*
 	  trail:c	Character to show for trailing spaces.  When omitted,
 			trailing spaces are blank.  Overrides the "space" and
 			"multispace" settings for trailing spaces.
@@ -7624,10 +7638,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	If the statusline is not updated when you want it (e.g., after setting
 	a variable that's used in an expression), you can force an update by
-	setting an option without changing its value.  Example: >
-		:let &ro = &ro
+	using `:redrawstatus`.
 
-<	A result of all digits is regarded a number for display purposes.
+	A result of all digits is regarded a number for display purposes.
 	Otherwise the result is taken as flag text and applied to the rules
 	described above.
 

runtime/doc/os_win32.txt

@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 8.2.  Last change: 2022 May 22
+*os_win32.txt*  For Vim version 8.2.  Last change: 2022 May 24
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
@@ -7,7 +7,7 @@
 						*win32* *Win32* *MS-Windows*
 This file documents the idiosyncrasies of the Win32 version of Vim.
 
-The Win32 version of Vim works on Windows XP, Vista, 7, 8 and 10.  There are
+The Win32 version of Vim works on Windows XP, Vista, 7, 8, 10 and 11.  There are
 both console and GUI versions.
 
 The 32 bit version also runs on 64 bit MS-Windows systems.

runtime/doc/pi_netrw.txt

@@ -440,11 +440,11 @@ settings are described below, in |netrw-browser-options|, and in
 
  *g:netrw_use_errorwindow* =2: messages from netrw will use a popup window
 			     Move the mouse and pause to remove the popup window.
-			     (default value if popup windows are availble)
+			     (default value if popup windows are available)
 			 =1 : messages from netrw will use a separate one
 			      line window.  This window provides reliable
 			      delivery of messages.
-			     (default value if popup windows are not availble)
+			     (default value if popup windows are not available)
 			 =0 : messages from netrw will use echoerr ;
 			      messages don't always seem to show up this
 			      way, but one doesn't have to quit the window.
@@ -1198,7 +1198,7 @@ If there are marked files and/or directories, mb will add them to the bookmark
 list.
 
 								*netrw-:NetrwMB*
-Addtionally, one may use :NetrwMB to bookmark files or directories. >
+Additionally, one may use :NetrwMB to bookmark files or directories. >
 
 	:NetrwMB[!] [files/directories]
 

runtime/doc/popup.txt

@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 8.2.  Last change: 2022 Apr 04
+*popup.txt*  For Vim version 8.2.  Last change: 2022 Jun 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -147,7 +147,8 @@ A special case is running a terminal in a popup window.  Many rules are then
 different:						*E863*
 - The popup window always has focus, it is not possible to switch to another
   window.
-- When the job ends, the popup window closes.
+- When the job ends, the popup window shows the buffer in Terminal-Normal
+  mode.  Use `:q` to close it or use "term_finish" value "close".
 - The popup window can be closed with `popup_close()`, the terminal buffer
   then becomes hidden.
 - It is not possible to open a second popup window with a terminal. *E861*
@@ -998,98 +999,101 @@ To make the four corners transparent:
 ==============================================================================
 4. Examples						*popup-examples*
 
-TODO: more interesting examples
+These examples use |Vim9| script.
+
 					*popup_dialog-example*
 Prompt the user to press y/Y or n/N: >
 
-	func MyDialogHandler(id, result)
-	   if a:result
-	      " ... 'y' or 'Y' was pressed
-	   endif
-	endfunc
-
-	call popup_dialog('Continue? y/n', #{
-		\ filter: 'popup_filter_yesno',
-		\ callback: 'MyDialogHandler',
-		\ })
+	popup_dialog('Continue? y/n', {
+		 filter: 'popup_filter_yesno',
+		 callback: (id, result) => {
+				if result == 1
+				  echomsg "'y' or 'Y' was pressed"
+				else
+				  echomsg "'y' or 'Y' was NOT pressed"
+				endif
+			     },
+		 padding: [2, 4, 2, 4],
+		 })
 <
 					*popup_menu-shortcut-example*
 Extend popup_filter_menu() with shortcut keys: >
 
-	call popup_menu(['Save', 'Cancel', 'Discard'], #{
-		\ filter: 'MyMenuFilter',
-		\ callback: 'MyMenuHandler',
-		\ })
-
-	func MyMenuFilter(id, key)
-	  " Handle shortcuts
-	  if a:key == 'S'
-	     call popup_close(a:id, 1)
-	     return 1
-	  endif
-	  if a:key == 'C'
-	     call popup_close(a:id, 2)
-	     return 1
-	  endif
-	  if a:key == 'D'
-	     call popup_close(a:id, 3)
-	     return 1
-	  endif
-
-	  " No shortcut, pass to generic filter
-	  return popup_filter_menu(a:id, a:key)
-	endfunc
+	popup_menu(['Save', 'Cancel', 'Discard'], {
+	    callback: (_, result) => {
+		echo 'dialog result is' result
+	    },
+	    filter: (id, key) => {
+		# Handle shortcuts
+		if key == 'S' || key == 's'
+		    popup_close(id, 1)
+		elseif key == 'C' || key == 'c'
+		    popup_close(id, 2)
+		elseif key == 'D' || key == 'd'
+		    popup_close(id, 3)
+		else
+		    # No shortcut, pass to generic filter
+		    return popup_filter_menu(id, key)
+		endif
+		return true
+	    },
+	})
 <
 					*popup_beval_example*
 Example for using a popup window for 'ballooneval': >
 
 	set ballooneval balloonevalterm
 	set balloonexpr=BalloonExpr()
-	let s:winid = 0
-	let s:last_text = ''
+	var winid: number
+	var last_text: string
 
-	func BalloonExpr()
-	  if s:winid && popup_getpos(s:winid) != {}
-	    " previous popup window still shows
-	    if v:beval_text == s:last_text
-	      " Still the same text, keep the existing popup
-	      return ''
+	def BalloonExpr(): string
+	    # here you would use "v:beval_text" to lookup something interesting
+	    var text = v:beval_text
+	    if winid > 0 && popup_getpos(winid) != null_dict
+		# previous popup window still shows
+		if text == last_text
+		    # still the same text, keep the existing popup
+		    return null_string
+		endif
+		popup_close(winid)
 	    endif
-	    call popup_close(s:winid)
-	  endif
-	  let s:winid = popup_beval(v:beval_text, #{mousemoved: 'word'})
-	  let s:last_text = v:beval_text
-	  return ''
-	endfunc
-<
+
+	    winid = popup_beval(text, {})
+	    last_text = text
+	    return null_string
+	enddef
+
 If the text has to be obtained asynchronously return an empty string from the
 expression function and call popup_beval() once the text is available.  In
 this example simulated with a timer callback: >
 
 	set ballooneval balloonevalterm
 	set balloonexpr=BalloonExpr()
-	let s:winid = 0
-	let s:balloonText = ''
+	var winid: number
+	var last_text: string
 
-	func BalloonExpr()
-	  if s:winid && popup_getpos(s:winid) != {}
-	    " previous popup window still shows
-	    if  v:beval_text == s:balloonText
-	      " Still the same text, keep the existing popup
-	      return ''
+	def BalloonExpr(): string
+	    var text = v:beval_text
+	    if winid > 0 && popup_getpos(winid) != null_dict
+		# previous popup window still shows
+		if text == last_text
+		    # still the same text, keep the existing popup
+		    return null_string
+		endif
+		popup_close(winid)
 	    endif
-	    call popup_close(s:winid)
-	    let s:winid = 0
-	  endif
-	  " simulate an asynchronous lookup for the text to display
-	  let s:balloonText = v:beval_text
-	  call timer_start(100, 'ShowPopup')
-	  return ''
-	endfunc
 
-	func ShowPopup(id)
-	  let s:winid = popup_beval(s:balloonText, #{mousemoved: 'word'})
-	endfunc
+	    # Simulate an asynchronous lookup that takes half a second for the
+	    # text to display.
+	    last_text = text
+	    timer_start(500, 'ShowPopup')
+	    return null_string
+	enddef
+
+	def ShowPopup(timerid: number)
+	    winid = popup_beval('Result: ' .. last_text, {})
+	enddef
 <
 
  vim:tw=78:ts=8:noet:ft=help:norl:

runtime/doc/repeat.txt

@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 8.2.  Last change: 2022 Apr 08
+*repeat.txt*    For Vim version 8.2.  Last change: 2022 Jun 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -197,7 +197,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 :so[urce] {file}	Read Ex commands from {file}.  These are commands that
 			start with a ":".
 			Triggers the |SourcePre| autocommand.
-
+							*:source-range*
 :[range]so[urce] [++clear]
 			Read Ex commands from the [range] of lines in the
 			current buffer.

runtime/doc/sponsor.txt

@@ -1,4 +1,4 @@
-*sponsor.txt*   For Vim version 8.2.  Last change: 2021 Jul 07
+*sponsor.txt*   For Vim version 8.2.  Last change: 2022 May 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/starting.txt

@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 8.2.  Last change: 2022 May 10
+*starting.txt*  For Vim version 8.2.  Last change: 2022 Jun 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -346,7 +346,7 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 <
 --log {filename}					*--log*
 		Start logging and write entries to {filename}.
-		This works like calling `ch_logfile({filename}, 'a')` very
+		This works like calling `ch_logfile({filename}, 'ao')` very
 		early during startup.
 		{only available with the +channel feature}
 
@@ -431,6 +431,13 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		Also avoids the "Reading from stdin..." message.
 		Also avoids the "N files to edit" message.
 
+--gui-dialog-file {name}				*--gui-dialog-file*
+		When using the GUI, instead of showing a dialog, write the
+		title and message of the dialog to file {name}.  The file is
+		created or appended to.  Only useful for testing, to avoid
+		that the test gets stuck on a dialog that can't be seen.
+		Without the GUI the argument is ignored.
+
 							*--ttyfail*
 --ttyfail	When the stdin or stdout is not a terminal (tty) then exit
 		right away.

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 8.2.  Last change: 2022 May 20
+*syntax.txt*	For Vim version 8.2.  Last change: 2022 Jun 10
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4898,6 +4898,14 @@ color (can make it transparent in some terminals): >
 	  au Colorscheme pablo hi Normal ctermbg=NONE
 	augroup END
 
+Change a couple more colors: >
+	augroup my_colorschemes
+	  au!
+	  au Colorscheme pablo hi Normal ctermbg=NONE
+		      \ | higlight Special ctermfg=63
+		      \ | highlight Identifier ctermfg=44
+	augroup END
+
 If you make a lot of changes it might be better to copy the distributed
 colorscheme to your home directory and change it: >
 	:!cp $VIMRUNTIME/colors/pablo.vim ~/.vim/colors
@@ -5387,8 +5395,8 @@ StatusLineNC	status lines of not-current windows
 							*hl-StatusLineTerm*
 StatusLineTerm	Status line of current window, if it is a |terminal| window.
 							*hl-StatusLineTermNC*
-StatusLineTermNC   Status lines of not-current windows that is a |terminal|
-		window.
+StatusLineTermNC	Status lines of not-current windows that is a
+			|terminal| window.
 							*hl-TabLine*
 TabLine		Tab pages line, not active tab page label.
 							*hl-TabLineFill*

runtime/doc/tags

@@ -12,6 +12,7 @@ $VIM	starting.txt	/*$VIM*
 $VIM-use	version5.txt	/*$VIM-use*
 $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
+$quote	eval.txt	/*$quote*
 %	motion.txt	/*%*
 %:.	cmdline.txt	/*%:.*
 %:8	cmdline.txt	/*%:8*
@@ -1455,6 +1456,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 --clean	starting.txt	/*--clean*
 --cmd	starting.txt	/*--cmd*
 --echo-wid	starting.txt	/*--echo-wid*
+--gui-dialog-file	starting.txt	/*--gui-dialog-file*
 --help	starting.txt	/*--help*
 --literal	starting.txt	/*--literal*
 --log	starting.txt	/*--log*
@@ -1915,6 +1917,8 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 40.3	usr_40.txt	/*40.3*
 41.1	usr_41.txt	/*41.1*
 41.10	usr_41.txt	/*41.10*
+41.11	usr_41.txt	/*41.11*
+41.12	usr_41.txt	/*41.12*
 41.2	usr_41.txt	/*41.2*
 41.3	usr_41.txt	/*41.3*
 41.4	usr_41.txt	/*41.4*
@@ -1948,16 +1952,17 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 45.4	usr_45.txt	/*45.4*
 45.5	usr_45.txt	/*45.5*
 50.1	usr_50.txt	/*50.1*
+50.2	usr_50.txt	/*50.2*
+50.3	usr_50.txt	/*50.3*
 51.1	usr_51.txt	/*51.1*
 51.2	usr_51.txt	/*51.2*
 51.3	usr_51.txt	/*51.3*
 51.4	usr_51.txt	/*51.4*
-51.5	usr_51.txt	/*51.5*
-51.6	usr_51.txt	/*51.6*
 52.1	usr_52.txt	/*52.1*
 52.2	usr_52.txt	/*52.2*
 52.3	usr_52.txt	/*52.3*
 52.4	usr_52.txt	/*52.4*
+52.5	usr_52.txt	/*52.5*
 8g8	various.txt	/*8g8*
 90.1	usr_90.txt	/*90.1*
 90.2	usr_90.txt	/*90.2*
@@ -3192,6 +3197,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 :sort	change.txt	/*:sort*
 :source	repeat.txt	/*:source*
 :source!	repeat.txt	/*:source!*
+:source-range	repeat.txt	/*:source-range*
 :source_crnl	repeat.txt	/*:source_crnl*
 :sp	windows.txt	/*:sp*
 :spe	spell.txt	/*:spe*
@@ -4268,6 +4274,8 @@ E1276	builtin.txt	/*E1276*
 E1278	eval.txt	/*E1278*
 E128	eval.txt	/*E128*
 E1281	pattern.txt	/*E1281*
+E1282	eval.txt	/*E1282*
+E1283	eval.txt	/*E1283*
 E129	eval.txt	/*E129*
 E13	message.txt	/*E13*
 E131	eval.txt	/*E131*
@@ -4749,7 +4757,6 @@ E574	starting.txt	/*E574*
 E575	starting.txt	/*E575*
 E576	starting.txt	/*E576*
 E577	starting.txt	/*E577*
-E578	insert.txt	/*E578*
 E579	eval.txt	/*E579*
 E580	eval.txt	/*E580*
 E581	eval.txt	/*E581*
@@ -5438,6 +5445,7 @@ SpellFileMissing	autocmd.txt	/*SpellFileMissing*
 StdinReadPost	autocmd.txt	/*StdinReadPost*
 StdinReadPre	autocmd.txt	/*StdinReadPre*
 String	eval.txt	/*String*
+Sven-Guckes	version9.txt	/*Sven-Guckes*
 SwapExists	autocmd.txt	/*SwapExists*
 Syntax	autocmd.txt	/*Syntax*
 T	motion.txt	/*T*
@@ -5517,6 +5525,7 @@ W20	if_pyth.txt	/*W20*
 W21	if_pyth.txt	/*W21*
 W22	eval.txt	/*W22*
 WORD	motion.txt	/*WORD*
+WSL	os_win32.txt	/*WSL*
 WWW	intro.txt	/*WWW*
 Win32	os_win32.txt	/*Win32*
 WinBar	gui.txt	/*WinBar*
@@ -5847,6 +5856,7 @@ beval_winid-variable	eval.txt	/*beval_winid-variable*
 beval_winnr-variable	eval.txt	/*beval_winnr-variable*
 binary-number	eval.txt	/*binary-number*
 bitwise-function	usr_41.txt	/*bitwise-function*
+bitwise-shift	eval.txt	/*bitwise-shift*
 blob	eval.txt	/*blob*
 blob-functions	usr_41.txt	/*blob-functions*
 blob-identity	eval.txt	/*blob-identity*
@@ -6663,6 +6673,7 @@ expr-..	eval.txt	/*expr-..*
 expr-/	eval.txt	/*expr-\/*
 expr-<	eval.txt	/*expr-<*
 expr-<#	eval.txt	/*expr-<#*
+expr-<<	eval.txt	/*expr-<<*
 expr-<=	eval.txt	/*expr-<=*
 expr-<=#	eval.txt	/*expr-<=#*
 expr-<=?	eval.txt	/*expr-<=?*
@@ -6678,6 +6689,7 @@ expr->#	eval.txt	/*expr->#*
 expr->=	eval.txt	/*expr->=*
 expr->=#	eval.txt	/*expr->=#*
 expr->=?	eval.txt	/*expr->=?*
+expr->>	eval.txt	/*expr->>*
 expr->?	eval.txt	/*expr->?*
 expr-[:]	eval.txt	/*expr-[:]*
 expr-[]	eval.txt	/*expr-[]*
@@ -6705,6 +6717,7 @@ expr-unary--	eval.txt	/*expr-unary--*
 expr-variable	eval.txt	/*expr-variable*
 expr1	eval.txt	/*expr1*
 expr10	eval.txt	/*expr10*
+expr11	eval.txt	/*expr11*
 expr2	eval.txt	/*expr2*
 expr3	eval.txt	/*expr3*
 expr4	eval.txt	/*expr4*
@@ -7279,6 +7292,7 @@ g:tar_nomax	pi_tar.txt	/*g:tar_nomax*
 g:tar_readoptions	pi_tar.txt	/*g:tar_readoptions*
 g:tar_secure	pi_tar.txt	/*g:tar_secure*
 g:tar_writeoptions	pi_tar.txt	/*g:tar_writeoptions*
+g:termdebug_config	terminal.txt	/*g:termdebug_config*
 g:termdebugger	terminal.txt	/*g:termdebugger*
 g:terminal_ansi_colors	terminal.txt	/*g:terminal_ansi_colors*
 g:tex_comment_nospell	syntax.txt	/*g:tex_comment_nospell*
@@ -8038,6 +8052,7 @@ lcs-conceal	options.txt	/*lcs-conceal*
 lcs-eol	options.txt	/*lcs-eol*
 lcs-extends	options.txt	/*lcs-extends*
 lcs-lead	options.txt	/*lcs-lead*
+lcs-leadmultispace	options.txt	/*lcs-leadmultispace*
 lcs-multispace	options.txt	/*lcs-multispace*
 lcs-nbsp	options.txt	/*lcs-nbsp*
 lcs-precedes	options.txt	/*lcs-precedes*
@@ -8178,6 +8193,7 @@ map-self-destroy	tips.txt	/*map-self-destroy*
 map-space_in_lhs	map.txt	/*map-space_in_lhs*
 map-space_in_rhs	map.txt	/*map-space_in_rhs*
 map-table	map.txt	/*map-table*
+map-trailing-white	map.txt	/*map-trailing-white*
 map-typing	map.txt	/*map-typing*
 map-which-keys	map.txt	/*map-which-keys*
 map.txt	map.txt	/*map.txt*
@@ -10189,6 +10205,7 @@ underline	syntax.txt	/*underline*
 undo	undo.txt	/*undo*
 undo-blocks	undo.txt	/*undo-blocks*
 undo-branches	undo.txt	/*undo-branches*
+undo-break	undo.txt	/*undo-break*
 undo-commands	undo.txt	/*undo-commands*
 undo-persistence	undo.txt	/*undo-persistence*
 undo-redo	undo.txt	/*undo-redo*
@@ -10207,7 +10224,6 @@ unlisted-buffer	windows.txt	/*unlisted-buffer*
 up-down-motions	motion.txt	/*up-down-motions*
 uppercase	change.txt	/*uppercase*
 urxvt-mouse	options.txt	/*urxvt-mouse*
-use-cpo-save	usr_51.txt	/*use-cpo-save*
 use-visual-cmds	version4.txt	/*use-visual-cmds*
 useful-mappings	tips.txt	/*useful-mappings*
 usenet	intro.txt	/*usenet*
@@ -10579,7 +10595,7 @@ vim9-const	vim9.txt	/*vim9-const*
 vim9-curly	vim9.txt	/*vim9-curly*
 vim9-debug	repeat.txt	/*vim9-debug*
 vim9-declaration	vim9.txt	/*vim9-declaration*
-vim9-declarations	usr_52.txt	/*vim9-declarations*
+vim9-declarations	usr_41.txt	/*vim9-declarations*
 vim9-differences	vim9.txt	/*vim9-differences*
 vim9-export	vim9.txt	/*vim9-export*
 vim9-final	vim9.txt	/*vim9-final*
@@ -10598,7 +10614,6 @@ vim9-rationale	vim9.txt	/*vim9-rationale*
 vim9-reload	vim9.txt	/*vim9-reload*
 vim9-s-namespace	vim9.txt	/*vim9-s-namespace*
 vim9-scopes	vim9.txt	/*vim9-scopes*
-vim9-script-intro	usr_52.txt	/*vim9-script-intro*
 vim9-types	vim9.txt	/*vim9-types*
 vim9-unpack-ignore	vim9.txt	/*vim9-unpack-ignore*
 vim9-user-command	vim9.txt	/*vim9-user-command*
@@ -10655,6 +10670,7 @@ vimscript-version	eval.txt	/*vimscript-version*
 vimscript-versions	eval.txt	/*vimscript-versions*
 vimtutor	usr_01.txt	/*vimtutor*
 virtcol()	builtin.txt	/*virtcol()*
+virtcol2col()	builtin.txt	/*virtcol2col()*
 visual-block	visual.txt	/*visual-block*
 visual-change	visual.txt	/*visual-change*
 visual-examples	visual.txt	/*visual-examples*
@@ -10785,11 +10801,11 @@ write-compiler-plugin	usr_51.txt	/*write-compiler-plugin*
 write-device	editing.txt	/*write-device*
 write-fail	editing.txt	/*write-fail*
 write-filetype-plugin	usr_51.txt	/*write-filetype-plugin*
-write-library-script	usr_51.txt	/*write-library-script*
+write-library-script	usr_52.txt	/*write-library-script*
 write-local-help	usr_51.txt	/*write-local-help*
 write-permissions	editing.txt	/*write-permissions*
 write-plugin	usr_51.txt	/*write-plugin*
-write-plugin-quickload	usr_51.txt	/*write-plugin-quickload*
+write-plugin-quickload	usr_52.txt	/*write-plugin-quickload*
 write-quit	editing.txt	/*write-quit*
 write-readonly	editing.txt	/*write-readonly*
 writefile()	builtin.txt	/*writefile()*

runtime/doc/terminal.txt

@@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 8.2.  Last change: 2022 Apr 06
+*terminal.txt*	For Vim version 8.2.  Last change: 2022 Jun 09
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -101,7 +101,7 @@ The special key combination CTRL-\ CTRL-N can be used to switch to Normal
 mode, just like this works in any other mode.
 							*t_CTRL-W_CTRL-C*
 CTRL-W CTRL-C can be typed to forcefully end the job.  On MS-Windows a
-CTRL-BREAK will also kill the job.
+CTRL-Break will also kill the job.
 
 If you type CTRL-C the effect depends on what the pty has been configured to
 do.  For simple commands this causes a SIGINT to be sent to the job, which
@@ -1367,7 +1367,7 @@ Four autocommands can be used: >
 						*TermdebugStartPre*
 TermdebugStartPre		Before starting debugging.
 				Not triggered if the debugger is already
-				running or |g:termdebugger| cannot be
+				running or the debugger command cannot be
 				executed.
 						*TermdebugStartPost*
 TermdebugStartPost		After debugging has initialized.
@@ -1398,18 +1398,24 @@ in a buffer with 'buftype' set to "prompt".  This works slightly differently:
 
 						*termdebug_use_prompt*
 Prompt mode can be used even when the |+terminal| feature is present with: >
+	let g:termdebug_config['use_prompt'] = 1
+Or if there is no g:termdebug_config: >
 	let g:termdebug_use_prompt = 1
 <
 						*termdebug_map_K*
 The K key is normally mapped to :Evaluate. If you do not want this use: >
+	let g:termdebug_config['map_K'] = 0
+Or if there is no g:termdebug_config: >
 	let g:termdebug_map_K = 0
-
 <
 						*termdebug_disasm_window*
-If you want the Asm window shown by default, set this to 1. Setting to
-any value greater than 1 will set the Asm window height to that value: >
+If you want the Asm window shown by default, set the flag to 1.
+the "disasm_window_height" entry can be used to set the window height: >
+	let g:termdebug_config['disasm_window'] = 1
+	let g:termdebug_config['disasm_window_height'] = 15
+or, if there is no g:termdebug_config: >
 	let g:termdebug_disasm_window = 15
-<
+Any value greater than 1 will set the Asm window height to that value: >
 
 Communication ~
 						*termdebug-communication*
@@ -1426,15 +1432,36 @@ communication channel.
 
 
 Customizing ~
+				*termdebug-customizing* *g:termdebug_config*
+In the past several global variables were used for configuration.  These are
+deprecated, using the g:termdebug_config dictionary is preferred.  When
+g:termdebug_config exists the other global variables will not be used.
 
-GDB command						*termdebug-customizing*
+
+GDB command ~
 							*g:termdebugger*
-To change the name of the gdb command, set the "g:termdebugger" variable before
-invoking `:Termdebug`: >
+To change the name of the gdb command, set "debugger" entry in
+g:termdebug_config or the "g:termdebugger" variable before invoking
+`:Termdebug`: >
+	let g:termdebug_config['command'] = "mygdb"
+Or if there is no g:termdebug_config: >
 	let g:termdebugger = "mygdb"
+
 If the command needs an argument use a List: >
+	let g:termdebug_config['command'] = ['rr', 'replay', '--']
+Or if there is no g:termdebug_config: >
 	let g:termdebugger = ['rr', 'replay', '--']
-<							*gdb-version*
+
+Several arguments will be added to make gdb work well for the debugger.
+If you want to modify them, add a function to filter the argument list: >
+	let g:termdebug_config['command_filter'] = MyDebugFilter
+
+If you do not want the arguments to be added, but you do need to set the
+"pty", use a function to add the necessary arguments: >
+	let g:termdebug_config['command_add_args'] = MyAddArguments
+The function will be called with the list of arguments so far, and a second
+argument that is the name of the pty.
+							*gdb-version*
 Only debuggers fully compatible with gdb will work.  Vim uses the GDB/MI
 interface.  The "new-ui" command  requires gdb version 7.12 or later.  if you
 get this error:
@@ -1442,8 +1469,8 @@ get this error:
 Then your gdb is too old.
 
 
-Colors						*hl-debugPC* *hl-debugBreakpoint*
-
+Colors~
+						*hl-debugPC* *hl-debugBreakpoint*
 The color of the signs can be adjusted with these highlight groups:
 - debugPC		the current position
 - debugBreakpoint	a breakpoint
@@ -1473,6 +1500,8 @@ these entries to the popup menu:
 	Clear breakpoint	`:Clear`
 	Evaluate		`:Evaluate`
 If you don't want this then disable it with: >
+	let g:termdebug_config['popup'] = 0
+or if there is no g:termdebug_config: >
 	let g:termdebug_popup = 0
 
 
@@ -1480,15 +1509,17 @@ Vim window width						*termdebug_wide*
 
 To change the width of the Vim window when debugging starts and use a vertical
 split: >
+	let g:termdebug_config['wide'] = 163
+Or if there is no g:termdebug_config: >
 	let g:termdebug_wide = 163
 
 This will set 'columns' to 163 when `:Termdebug` is used.  The value is
 restored when quitting the debugger.
 
-If g:termdebug_wide is set and 'columns' is already a greater value, then a
+If the wide value is set and 'columns' is already a greater value, then a
 vertical split will be used without modifying 'columns'.
 
-Set g:termdebug_wide to 1 to use a vertical split without ever changing
+Set the wide value to 1 to use a vertical split without ever changing
 'columns'.  This is useful when the terminal can't be resized by Vim.
 
 

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.2.  Last change: 2022 May 22
+*todo.txt*      For Vim version 8.2.  Last change: 2022 Jun 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,22 +38,12 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Prepare for Vim 9.0 release:
-- Use Vim9 for more runtime files.
-- Check Vim9 code coverage, add more tests if needed.
-	vim9instr.c
-	vim9script.c
-	vim9type.c
+Prepare for the Vim 9.0 release:
+- Update version9.txt
 - Adjust intro message to say "help version9".
 
-Update the user manual:
-- Update usr_41.txt for Vim9 script
-- Fill usr_50.txt as an "advanced section" of usr_41.txt
-  Add links from usr_41 to usr_50.
-- Make usr_51.txt use Vim9 script.  Still need usr_52.txt?
-
-
 Further Vim9 improvements, possibly after launch:
+- Use Vim9 for more runtime files.
 - Check performance with callgrind and kcachegrind.
     getline()/substitute()/setline() in #5632
 - Better implementation for partial and tests for that.
@@ -84,14 +74,15 @@ Further Vim9 improvements, possibly after launch:
 Update list of features to vote on:
 - multiple cursors
 - built-in LSP support
-- start first line halfway
+- virtual text, using text properties
+- start first line halfway, scroll per screen line
 
 Popup windows:
 - Preview popup not properly updated when it overlaps with completion menu.
-    (Yegappan Lakshmanan, 2021 May 22
+  (Yegappan Lakshmanan, 2021 May 22)
+- Srollbar thumb sometimes not visible  #10492
 - Add a function to redraw a specific popup window.  Esp. to be used when
   editing the command line, when screen updating doesn't happen. (Shougo)
-- In some cases prop_remove() does not work correctly. (#8261)
 - Add a flag to make a popup window focusable?
     CTRL-W P cycle over any preview window or focusable popup, end up back in
 	     current window.
@@ -152,6 +143,9 @@ Prompt buffer:
 - add prompt_addtext({buf}, {expr})	none	add text to a prompt buffer
 
 Terminal debugger:
+- Add a mechanism for configuration.  Instead of several global variables use
+  a dictionary.  Use callbacks for some things, e.g. opening a debug window in
+  a certain position.
 - Make prompt-buffer variant work better.
 - Add option to not open the program window.  It's not used when attaching to
   an already running program. (M. Kelly)
@@ -207,13 +201,21 @@ Terminal emulator window:
 - When 'encoding' is not utf-8, or the job is using another encoding, setup
   conversions.
 
-Add autocmd functions. PR #10291
-  a couple of outstanding comments, wait for Yegappan to respond
+Patches considered for including:
+- use ngettext() in a few more places #10606
+- Add "-n" option to xxd. #10599
+- Support %e and %k in 'errorformat'. #9624
+- Add support for "underdouble", "underdot" and "underdash". #9553
+- Patch to implement the vimtutor with a plugin: #6414
+  Was originally written by Felipe Morales.
+- Patch to make fillchars global-local. (#5206)
+- Version of getchar() that does not move the cursor - #10603
+
+Autoconf: must use autoconf 2.69, later version generates lots of warnings
+- try using autoconf 2.71 and fix all "obsolete" warnings
 
 Can deref_func_name() and deref_function_name() be merged?
 
-Add mode bits to maparg() dict?  PR #10356
-
 After patch 8.2.4915 w_botline is computed much more often. Can this be
 reduced?
 
@@ -225,41 +227,17 @@ Improvement in terminal configuration mess: Request the terminfo entry from
 the terminal itself.  The $TERM value then is only relevant for whether this
 feature is supported or not.  Replaces the xterm mechanism to request each
 entry separately. #6609
-Multiplexers (screen, tmux) can request it to the underlaying terminal, and
+Multiplexers (screen, tmux) can request it to the underlying terminal, and
 pass it on with modifications.
 
-Test_communicate_ipv6(): is flaky on many systems
-Fails in line 64 of Ch_communicate, no exception is thrown.
-
-Rename getdigraphlist -> digraph_getlist() etc.
-
 Can "CSI nr X" be used instead of outputting spaces?  Is it faster?  #8002
 
-Valgrind reports memory leaks in test_options.
-Valgrind reports overlapping memcpy in
-    test_conceal.3
-    test_edit.1
-    test_functions.4
-    test_ins_complete.3
-    test_method
-    test_normal
-    test_popupwin.35 et al.
-    test_search_stat
-Memory leak in test_debugger
-Memory leak in test_paste, using XtOpenDisplay several times
-OLD:
-TODO: be able to run all parts of test_alot with valgrind separately
-Memory leak in test_alot with pyeval() (allocating partial)
-Memory leak in test_alot with expand()
-Memory leaks in test_channel? (or is it because of fork())
-
-PR to support %e and %k in 'errorformat'. #9624
-
-PR to add left and right bitwise shift. #8457
+With a window height of 6 and 'scrolloff' set to 3, using "j" does not scroll
+evenly. (#10545)  Need to handle this in scroll_cursor_bot().
 
 Idea: when typing ":e /some/dir/" and "dir" does not exist, highlight in red.
 
-":set &shellpipe" and ":set &shellredir" should use the logic from
+":set shellpipe&" and ":set shellredir&" should use the logic from
 initialization to figure out the default value from 'shell'.  Add a test for
 this.
 
@@ -272,12 +250,8 @@ The line number can be obtained from win->w_lines[].
 
 MS-Windows: did path modifier :p:8 stop working?  #8600
 
-Add support for "underdouble", "underdot" and "underdash". #9553
-
 test_arglist func Test_all_not_allowed_from_cmdwin() hangs on MS-Windows.
 
-Mapping with partial match not executed properly in GTK. (Ingo Karkat, #7082)
-
 Information for a specific terminal (e.g. gnome, tmux, konsole, alacritty) is
 spread out.  Make a section with copy/paste examples of script and pointers to
 more information.
@@ -286,14 +260,13 @@ Problem that a previous silent ":throw" causes a following try/catch not to
 work. (ZyX, 2013 Sep 28) With examples: (Malcolm Rowe, 2015 Dec 24)
 Also see #8487 for an example.
 
-Patch to implement the vimtutor with a plugin: #6414
-Was originally written by Felipe Morales.
-
 Request to use "." for the cursor column in search pattern \%<.c and \%<.v.
 (#8179)
 
 ":filter set termcap" only filters terminal codes, not keys. (#9297)
 
+Add an option to restrict 'incsearch' to not scroll the view. (Tavis Ormandy)
+
 Remove SPACE_IN_FILENAME ? It is only used for completion.
 
 When 'term' starts with "foot" then default t_TI and t_TE to the values used
@@ -316,9 +289,6 @@ to tell which value from getvvcol() should be used. (#7964)
 Value returned by virtcol() changes depending on how lines wrap.  This is
 inconsistent with the documentation.
 
-Making breakat support multibyte characters (Yasuhiro Matsumoto, #6598)
-Scroll doesn't work correctly, why?
-
 globpath() does not use 'wildignorecase' at all? (related to #8350)
 
 Add 'termguiattr' option, use "gui=" attributes in the terminal?  Would work
@@ -326,8 +296,6 @@ with 'termguicolors'. #1740
 
 Patch for blockwise paste reporting changes: #6660.  Asked for a PR.
 
-Patch to make fillchars global-local. (#5206)
-
 Missing filetype test for bashrc, PKGBUILD, etc.
 
 Add an option to not fetch terminal codes in xterm, to avoid flicker when t_Co
@@ -348,6 +316,10 @@ Try setting a color then request the current color, like using t_u7.
 Make the jumplist behave like a tag stack. (#7738)  Should there be a more
 time bound navigation, like with undo?
 
+For testing, make a copy of ml_line_ptr instead of pointing it into the data
+block, so that valgrind can do out of bounds check.  Set ML_LINE_DIRTY flag or
+add ML_LINE_ALLOCED.
+
 Changing a capturing group to non-capturing changes the result: #7607
     :echo matchstr('aaa bbb', '\(.\{-1,}\>\)\|.*')
     aaa
@@ -360,9 +332,6 @@ Should also work without any group:
 Should add a match/str/list/pos method that also returns the test and position
 of submatches.  #8355
 
-Syntax highlight for a region does not work with a "nextgroup" if the start
-match is empty. #8449
-
 Check out PR #543 (Roland Puntaier).
 Patch for multibyte characters in langmap and applying a mapping on them.
 (Christian Brabandt, 2015 Jun 12, update July 25)
@@ -409,6 +378,10 @@ Lua: updating wrong buffer when using newly created, unloaded buffer.
 
 File marks merging has duplicates since 7.4.1925. (Ingo Karkat, #5733)
 
+A syntax plugin cannot use autocommands, it could be sourced from setting
+'syntax' in a modeline.  Add a function that indicates whethere "secure"
+and/or "sandbox" are set.
+
 Problem with auto-formatting - inserting space and putting cursor before added
 character. (#6154)
 
@@ -485,9 +458,6 @@ Sound: support on Mac?  Or does libcanberra work there?
 
 Python 3.8 doesn't work. (Antonios Hadjigeorgalis, #5509)
 
-The :syntax cchar value can only be a single character.  It would be useful to
-support combining characters. (Charles Campbell)  Also #4687
-
 "--cleanFOO" does not result in an error. (#5537)
 
 Output from assert_equalfile() doesn't give a hint about what's different.
@@ -803,13 +773,6 @@ Compiler warning (geeknik, 2017 Oct 26):
 Add Native language protocol server (LSP) support. (Yegappan Lakshmanan, 2018
 Oct 28)
 
-Add more testing of the GTK GUI.
-- gtk_test_widget_click() can be used to simulate a click in a widget.
-
-Tests failing for "make testgui" with GTK:
-- Test_setbufvar_options()
-- Test_exit_callback_interval()
-
 Patch to be able to use hex numbers with :digraph. (Lcd, 2015 Sep 6)
 Update Sep 7.  Update by Christian Brabandt, 2015 Sep 8, 2016 Feb 1.
 Patch to be able to disable default digraphs (incomplete) (Eric Pruitt, 2018
@@ -939,9 +902,6 @@ Patch to support hunspell. (Matej Cepl, Jan 2018, #2500) Based on older patch
 in #846)
 Doesn't work on Windows yet.  Not ready to included, hard coded paths.
 
-Win32 GUI: when running a fast timer, the cursor no longer blinks.
-Was reported: cursor blinks in terminal on widows with a timer. (xtal8, #2142)
-
 When a timer is running and typing CTRL-R on the command line, it is not
 redrawn properly. (xtal8, 2017 Oct 23, #2241)
 
@@ -1104,10 +1064,6 @@ Suggestion to improve pt-br spell checking. (Marcelo D Montu, 2016 Dec 15,
 
 Error in test_startup_utf8 on Solaris. (Danek Duvall, 2016 Aug 17)
 
-GTK: When adding a timer from 'balloonexpr' it won't fire, because
-g_main_context_iteration() doesn't return.  Need to trigger an event when the
-timer expires.
-
 Rule to use "^" for statusline does not work if a space is defined with
 highlighting for both stl and stlnc.  Patch by Ken Hamada (itchyny, 2016 Dec 11)
 
@@ -1507,8 +1463,6 @@ Result of systemlist() does not show whether text ended in line break.
 When in 'comments' "n:x" follows after three-part comment directly it repeats
 any one-character from the previous line. (Kartik Agaram, 2014 Sep 19)
 
-Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21)
-
 Adding "~" to 'cdpath' doesn't work for completion?  (Davido, 2013 Aug 19)
 
 Patch: Let rare word highlighting overrule good word highlighting.
@@ -1630,9 +1584,6 @@ Also see #2034.
 
 Patch to define macros for hardcoded values. (Elias Diem, 2013 Dec 14)
 
-Several syntax file match "^\s*" which may get underlined if that's in the
-highlight group.  Add a "\zs" after it?
-
 Updated spec ftplugin. (Matěj Cepl, 2013 Oct 16)
 
 Patch to handle integer overflow. (Aaron Burrow, 2013 Dec 12)
@@ -1654,9 +1605,6 @@ When evaluating expression in backticks, autoload doesn't work.
 Using <nr>ifoobar<esc> can slow down Vim.  Patch by Christian Brabandt, 2013
 Dec 13.  Only helps a bit, 10000ii<Esc> is still too slow.
 
-GTK: problem with 'L' in 'guioptions' changing the window width.
-(Aaron Cornelius, 2012 Feb 6)
-
 Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
 
 The BufUnload event is triggered when re-using the empty buffer.
@@ -1682,9 +1630,6 @@ Patch to fix that 'cedit' is recognized after :normal. (Christian Brabandt,
 
 Patch to view coverage of the tests. (Nazri Ramliy, 2013 Feb 15)
 
-Patch to invert characters differently in GTK. (Yukihiro Nakadaira, 2013 May
-5)
-
 Patch to add "Q" and "A" responses to interactive :substitute. They are
 carried over when using :global. (Christian Brabandt, 2013 Jun 19)
 
@@ -1704,13 +1649,6 @@ Patch by Christian Brabandt, 2013 Apr 20, unfinished.
 
 Bug: findfile("any", "file:///tmp;") does not work.
 
-patch to add "combine" flag to  syntax commands. (so8res, 2012 Dec 6)
-Patch to add "combine" to :syntax, combines highlight attributes. (Nate
-Soares, 2012 Dec 3)
-
-Syntax update problem in one buffer opened in two windows, bottom window is
-not correctly updated. (Paul Harris, 2012 Feb 27)
-
 Patch to add getsid(). (Tyru, 2011 Oct 2)  Do we want this?  Update Oct 4.
 Or use expand('<sid>')?
 
@@ -1814,10 +1752,6 @@ On MS-Windows a temp dir with a & init causes system() to fail. (Ben Fritz,
 Patch 7.3.116 was the wrong solution.
 Christian Brabandt has another incomplete patch. (2011 Jul 13)
 
-Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2,
-only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug
-21, Ben Fritz, 2010 Sep 14)
-
 Win32: Patch to use task dialogs when available. (Sergiu Dotenco, 2011 Sep 17)
 New feature, requires testing.  Made some remarks.
 
@@ -1879,18 +1813,12 @@ the help file.
 After patch 7.3.097 still get E15. (Yukihiro Nakadaira, 2011 Jan 18)
 Also for another example (ZyX, 2011 Jan 24)
 
-Build problem with small features on Mac OS X 10.6. (Rainer, 2011 Jan 24)
-
 "0g@$" puts '] on last byte of multibyte. (ZyX, 2011 Jan 22)
 
 Patch for :tabrecently. (Hirokazu Yoshida, 2012 Jan 30)
 
 Problem with "syn sync grouphere". (Gustavo Niemeyer, 2011 Jan 27)
 
-Using "syn sync breaklines=2" works for when text is changed, but not when
-scrolling or redrawing.  Should start search for syntax patterns above the
-first drawn line. (#8103)
-
 Loading autoload script even when usage is inside "if 0". (Christian Brabandt,
 2010 Dec 18)
 
@@ -1923,19 +1851,12 @@ In the sandbox it's not allowed to do many things, but it's possible to change
 or set variables.  Add a way to prevent variables from being changed in the
 sandbox?  E.g.: ":protect g:restore_settings".
 
-GTK: drawing a double-width combining character over single-width characters
-doesn't look right. (Dominique Pelle, 2010 Aug 8)
-
-GTK: tear-off menu does not work. (Kurt Sonnenmoser, 2010 Oct 25)
-
 Win32: tear-off menu does not work when menu language is German. (Markus
 Bossler, 2011 Mar 2)  Fixed by 7.3.095?
 
 Wish for NetBeans commands:
     - make it possible to have 'defineAnnoType' also handle terminal colors.
 
-Version of netbeans.c for use with MacVim. (Kazuki Sakamoto, 2010 Nov 18)
-
 7.3.014 changed how backslash at end of line works, but still get a NUL when
 there is one backslash. (Ray Frush, 2010 Nov 18)  What does the original ex
 do?
@@ -2009,8 +1930,6 @@ C-indenting: A matching { in a comment is ignored, but intermediate { are not
 checked to be in a comment.  Implement FM_SKIPCOMM flag of findmatchlimit().
 Issue 46.
 
-Mac with X11: clipboard doesn't work properly. (Raf, 2010 Aug 16)
-
 Using CompilerSet doesn't record where an option was set from.  E.g., in the
 gcc compiler plugin. (Gary Johnson, 2010 Dec 13)
 
@@ -2082,8 +2001,6 @@ Problem with stop directory in findfile(). (Adam Simpkins, 2009 Aug 26)
 Using ']' as the end of a range in a pattern requires double escaping:
      /[@-\\]]  (Andy Wokula, 2011 Jun 28)
 
-Syntax priority problem. (Charles Campbell, 2011 Sep 15)
-
 For running gvim on a USB stick: avoid the OLE registration.  Use a command
 line argument -noregister.
 
@@ -2139,8 +2056,6 @@ J.  Wang, 2009 Mar 31)
 When $VIMRUNTIME is set in .vimrc, need to reload lang files.  Already done
 for GTK, how about others? (Ron Aaron, 2010 Apr 10)
 
-Patch for GTK buttons X1Mouse and X2Mouse. (Christian J. Robinson, 2010 Aug 9)
-
 ":tab split fname" doesn't set the alternate file in the original window,
 because win_valid() always returns FALSE.  Below win_new_tabpage() in
 ex_docmd.c.
@@ -2174,9 +2089,6 @@ displayed in a window should return the value that's stored for that buffer.
 
 Diff mode out of sync. (Gary Johnson, 2010 Aug 4)
 
-Win32 GUI: last message from startup doesn't show up when there is an echoerr
-command. (Cyril Slobin, 2009 Mar 13)
-
 Win32: completion of file name ":e c:\!test" results in ":e c:\\!test", which
 does not work. (Nieko Maatjes, 2009 Jan 8, Ingo Karkat, 2009 Jan 22)
 
@@ -2316,10 +2228,6 @@ Win32: Using "gvim --remote-tab-silent elŝuti.txt" doesn't work, the
 multibyte character isn't passed and edits elsuti.txt.
 (Raúl Núñez de Arenas Coronado, 2015 Dec 18)
 
-Problem with 'langmap' being used on the rhs of a mapping. (Nikolai Weibull,
-2008 May 14)
-Possibly related problem: Alexey Muranov, 2015 Apr 2
-
 Problem with CTRL-F. (Charles Campbell, 2008 March 21)
 Only happens with "gvim -geometry "160x26+4+27" -u NONE -U NONE prop.c".
 'lines' is 54. (2008 March 27)
@@ -2346,21 +2254,6 @@ line doesn't fit. (Dasn, 2008 May 1)
 GUI: In Normal mode can't yank the modeless selection.  Make "gy" do this?
 Works like CTRL-Y in Command line mode.
 
-Mac: Move Carbon todo items to os_mac.txt.  Note that this version is frozen,
-try the Cocoa version.
-
-Mac: After a ":vsplit" the left scrollbar doesn't appear until 'columns' is
-changed or the window is resized.
-
-GTK: when setting 'columns' in a startup script and doing ":vertical diffsplit"
-the window isn't redrawn properly, see two vertical bars.
-
-Mac: Patch for configure: remove arch from ruby link args. (Knezevic, 2008
-Mar 5)  Alternative: Kazuki Sakamoto, Mar 7.
-
-Mac: trouble compiling with Motif, requires --disable-darwin. (Raf, 2008 Aug
-1)  Reply by Ben Schmidt.
-
 C't: On utf-8 system, editing file with umlaut through Gnome results in URL
 with %nn%nn, which is taken as two characters instead of one.
 Try to reproduce at work.
@@ -2380,10 +2273,6 @@ Would be more consistent when an existing tab is re-used. (Tony Mechelynck)
 Using Aap to build Vim: add remarks about how to set personal preferences.
 Example on http://www.calmar.ws/tmp/aap.html
 
-Syntax highlighting wrong for transparent region. (Doug Kearns, 2007 Feb 26)
-Bug in using a transparent syntax region. (Hanlen in vim-dev maillist, 2007
-Jul 31)
-
 When 'diffopt' has "context:0" a single deleted line causes two folds to merge
 and mess up syncing. (Austin Jennings, 2008 Jan 31)
 
@@ -2592,8 +2481,6 @@ Jul 22)
 
 There should be something about spell checking in the user manual.
 
-Mac: Using gvim: netrw window disappears. (Nick Lo, 2006 Jun 21)
-
 Add an option to specify the character to use when a double-width character is
 moved to the next line.  Default '>', set to a space to blank it out.  Check
 that char is single width when it's set (compare with 'listchars').
@@ -2644,8 +2531,6 @@ Only skip shortening for ":cc"?
 Problem with ":call" and dictionary function. Hari Krishna Dara, Charles
 Campbell 2006 Jul 06.
 
-Syntax HL error caused by "containedin". (Peter Hodge, 2006 Oct 6)
-
 A custom completion function in a ":command" cannot be a Funcref. (Andy
 Wokula, 2007 Aug 25)
 
@@ -2678,18 +2563,9 @@ and <notisdir> to autocommand patterns?  Also <isfile>?
 Add command modifier that skips wildcard expansion, so that you don't need to
 put backslashes before special chars, only for white space.
 
-Syntax HL: open two windows on the same C code, delete a ")" in one window,
-resulting in highlighted "{" in that window, not in the other.
-
 In mswin.vim: Instead of mapping <C-V> for Insert mode in a complicated way,
 can it be done like ":imap <C-V> <MiddleMouse>" without negative side effects?
 
-GTK: when the Tab pages bar appears or disappears while the window is
-maximized the window is no longer maximized.  Patch that has some idea but
-doesn't work from Geoffrey Antos, 2008 May 5.
-Also: the window may no longer fit on the screen, thus the command line is not
-visible.
-
 When right after "vim file", "M" then CTRL-W v the windows are scrolled
 differently and unexpectedly.  Caused by patch 7.2.398?
 
@@ -2718,9 +2594,6 @@ When completing from another file that uses a different encoding completion
 text has the wrong encoding.  E.g., when 'encoding' is utf-8 and file is
 latin1.  Example from Gombault Damien, 2007 Mar 24.
 
-Syntax HL: When using "nextgroup" and the group has an empty match, there is
-no search at that position for another match. (Lukas Mai, 2008 April 11)
-
 In gvim the backspace key produces a backspace character, but on Linux the
 VERASE key is Delete.  Set VERASE to Backspace? (patch by Stephane Chazelas,
 2007 Oct 16)
@@ -2741,9 +2614,6 @@ When switching between windows the cursor is often put in the middle.
 Remember the relative position and restore that, just like lnum and col are
 restored. (Luc St-Louis)
 
-Patch to support horizontal scroll wheel in GTK. Untested. (Bjorn Winckler,
-2010 Jun 30)
-
 Add an option for a minimal text length before inserting a line break for
 'textwidth'.  Avoids very short lines when a very long word follows.
 (Kartik Agaram)
@@ -2982,7 +2852,7 @@ Vi incompatibility:
     thing.  (only repeat insert for the first line).
 
 
-GTK+ GUI known bugs:
+GTK+ GUI:
 9   Crash with X command server over ssh. (Ciaran McCreesh, 2006 Feb 6)
 8   GTK 2: Combining UTF-8 characters not displayed properly in menus (Mikolaj
     Machowski)  They are displayed as separate characters.  Problem in
@@ -2997,6 +2867,33 @@ GTK+ GUI known bugs:
 -   Gnome2: When moving the toolbar out of the dock, so that it becomes
     floating, it can no longer be moved.  Therefore making it float has been
     blocked for now.
+-   Mapping with partial match not executed properly in GTK. (Ingo Karkat,
+    #7082)
+-   Add more testing of the GTK GUI.
+    - gtk_test_widget_click() can be used to simulate a click in a widget.
+-   Tests failing for "make testgui" with GTK:
+    - Test_setbufvar_options()
+    - Test_exit_callback_interval()
+-   When adding a timer from 'balloonexpr' it won't fire, because
+    g_main_context_iteration() doesn't return.  Need to trigger an event when
+    the timer expires.
+-   problem with 'L' in 'guioptions' changing the window width.  (Aaron
+    Cornelius, 2012 Feb 6)
+-   Patch to invert characters differently in GTK. (Yukihiro Nakadaira, 2013
+    May 5)
+-   drawing a double-width combining character over single-width characters
+    doesn't look right. (Dominique Pelle, 2010 Aug 8)
+-   tear-off menu does not work. (Kurt Sonnenmoser, 2010 Oct 25)
+-   Patch for GTK buttons X1Mouse and X2Mouse. (Christian J. Robinson, 2010
+    Aug 9)
+-   When setting 'columns' in a startup script and doing ":vertical diffsplit"
+    the window isn't redrawn properly, see two vertical bars.
+-   when the Tab pages bar appears or disappears while the window is maximized
+    the window is no longer maximized.  Patch that has some idea but doesn't
+    work from Geoffrey Antos, 2008 May 5.  Also: the window may no longer fit
+    on the screen, thus the command line is not visible.
+-   Patch to support horizontal scroll wheel in GTK. Untested. (Bjorn
+    Winckler, 2010 Jun 30)
 
 
 Win32 GUI known bugs:
@@ -3062,6 +2959,10 @@ Win32 GUI known bugs:
     still be used somewhere.  This is too tricky, do the font selection first,
     then set the new font by name (requires putting all logfont parameters in
     the font name).
+-   When running a fast timer, the cursor no longer blinks.  Was reported:
+    cursor blinks in terminal on widows with a timer. (xtal8, #2142)
+-   Last message from startup doesn't show up when there is an echoerr
+    command. (Cyril Slobin, 2009 Mar 13)
 
 
 Motif:
@@ -3242,6 +3143,18 @@ Macintosh:
 9   When DiskLock is running, using a swap file causes a crash.  Appears to be
     a problem with writing a file that starts with a dot. (Giacalone)
 9   In mac_expandpath() check that handling of backslashes is done properly.
+-   Build problem with small features on Mac OS X 10.6. (Rainer, 2011 Jan 24)
+-   Version of netbeans.c for use with MacVim. (Kazuki Sakamoto, 2010 Nov 18)
+-   Mac with X11: clipboard doesn't work properly. (Raf, 2010 Aug 16)
+-   Move Carbon todo items to os_mac.txt.  Note that this version is frozen,
+    try the Cocoa version.
+-   After a ":vsplit" the left scrollbar doesn't appear until 'columns' is
+    changed or the window is resized.
+-   Patch for configure: remove arch from ruby link args. (Knezevic, 2008 Mar
+    5)  Alternative: Kazuki Sakamoto, Mar 7.
+-   trouble compiling with Motif, requires --disable-darwin. (Raf, 2008 Aug 1)
+    Reply by Ben Schmidt.
+-   Using gvim: netrw window disappears. (Nick Lo, 2006 Jun 21)
 
 
 "Small" problems:
@@ -3899,6 +3812,8 @@ Multi-byte characters:
     table anymore (breakat_flags[]).
     Simplistic solution: when 'formatoptions' contains "m" also break a line
     at a multibyte character >= 0x100.
+    Making breakat support multibyte characters (Yasuhiro Matsumoto, #6598)
+    Scroll doesn't work correctly, why?
 -   Add the possibility to enter mappings which are used whenever normal text
     could be entered.  E.g., for "f" command.  But not in Normal mode.  Sort
     of opposite of 'langmap'.  Use ":amap" command?
@@ -3906,6 +3821,9 @@ Multi-byte characters:
     account.  The "linebreak" program from Bruno Haible can do it:
     ftp://ftp.ilog.fr/pub/Users/haible/gnu/linebreak-0.1.tar.gz
     But it's very complicated...
+-   Problem with 'langmap' being used on the rhs of a mapping. (Nikolai
+    Weibull, 2008 May 14).
+    Possibly related problem: Alexey Muranov, 2015 Apr 2
 
 
 Printing:
@@ -3929,8 +3847,8 @@ Printing:
 
 Syntax highlighting:
     Long term goal: faster, better, etc.  Options:
-    - use treesitter, NeoVim uses it
-    - use TextMate, vscode uses it.  #9087
+    - use treesitter, NeoVim uses it - Many people don't like it.
+    - use TextMate, vscode uses it.  #9087 - possibly a long term solution
 8   Make ":syn off" use 'runtimepath' instead of $VIMRUNTIME. (Gary Johnson)
     Should do the same for ":syn on" and ":syn manual".
 8   Support "containedin" argument for ":syn include", so that the defined
@@ -4079,6 +3997,34 @@ Syntax highlighting:
     text, exit at end of file, don't allow editing, etc.  moreim?  lessim?
 7   SpecialKey highlighting overrules syntax highlighting.  Can't give an
     unprintable char another color.  Would be useful for ^M at end of line.
+-   Syntax highlight for a region does not work with a "nextgroup" if the
+    start match is empty. #8449
+-   The :syntax cchar value can only be a single character.  It would be
+    useful to support combining characters. (Charles Campbell)  Also #4687
+-   Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21)
+-   Several syntax file match "^\s*" which may get underlined if that's in the
+    highlight group.  Add a "\zs" after it?
+-   patch to add "combine" flag to  syntax commands. (so8res, 2012 Dec 6)
+    Patch to add "combine" to :syntax, combines highlight attributes. (Nate
+    Soares, 2012 Dec 3)
+-   Syntax update problem in one buffer opened in two windows, bottom window
+    is not correctly updated. (Paul Harris, 2012 Feb 27)
+-   Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set
+    to 2, only one of the two ends gets the cchar displayed. (Brett Stahlman,
+    2010 Aug 21, Ben Fritz, 2010 Sep 14)
+-   Using "syn sync breaklines=2" works for when text is changed, but not when
+    scrolling or redrawing.  Should start search for syntax patterns above the
+    first drawn line. (#8103)
+-   Syntax priority problem. (Charles Campbell, 2011 Sep 15)
+-   Syntax highlighting wrong for transparent region. (Doug Kearns, 2007 Feb
+    26)
+-   Bug in using a transparent syntax region. (Hanlen in vim-dev maillist,
+    2007 Jul 31)
+-   Syntax HL error caused by "containedin". (Peter Hodge, 2006 Oct 6)
+-   Open two windows on the same C code, delete a ")" in one window, resulting
+    in highlighted "{" in that window, not in the other.
+-   When using "nextgroup" and the group has an empty match, there is no
+    search at that position for another match. (Lukas Mai, 2008 April 11)
 
 
 Vim script language:

runtime/doc/undo.txt

@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 8.2.  Last change: 2020 Nov 30
+*undo.txt*      For Vim version 8.2.  Last change: 2022 Jun 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -105,12 +105,16 @@ change again.  But you can do something like this: >
 
 After this a "u" command will undo the delete command and the previous
 change.
-
+							*undo-break*
 To do the opposite, break a change into two undo blocks, in Insert mode use
 CTRL-G u.  This is useful if you want an insert command to be undoable in
 parts.  E.g., for each sentence.  |i_CTRL-G_u|
+
 Setting the value of 'undolevels' also breaks undo.  Even when the new value
-is equal to the old value.
+is equal to the old value.  In |Vim9| script: >
+	&undolevels = &undolevels
+In legacy script: >
+	let &undolevels = &undolevels
 
 ==============================================================================
 4. Undo branches				*undo-branches* *undo-tree*
@@ -253,7 +257,7 @@ message about that when opening a file.
 Undo files are normally saved in the same directory as the file.  This can be
 changed with the 'undodir' option.
 
-When the file is encrypted, the text in the undo file is also crypted.  The
+When the file is encrypted, the text in the undo file is also encrypted.  The
 same key and method is used. |encryption|
 
 Note that text properties are not stored in the undo file.  You can restore

runtime/doc/usr_40.txt

@@ -1,4 +1,4 @@
-*usr_40.txt*	For Vim version 8.2.  Last change: 2022 Jan 03
+*usr_40.txt*	For Vim version 8.2.  Last change: 2022 Jun 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -463,6 +463,17 @@ separated) that trigger the command.
 The optional [++nested] flag allows for nesting of autocommands (see below),
 and finally, {command} is the command to be executed.
 
+When adding an autocommand the already existing ones remain.  To avoid adding
+the autocommand several time you should use this form: >
+
+	:augroup updateDate
+	:  autocmd!
+	:  autocmd BufWritePre *  call DateInsert()
+	:augroup END
+
+This will delete any previously defined autocommand with `:autocmd!` before
+defining the new one.  Groups are explained later.
+
 
 EVENTS
 

runtime/doc/usr_41.txt

@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 8.2.  Last change: 2022 May 21
+*usr_41.txt*	For Vim version 8.2.  Last change: 2022 Jun 23
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -7,7 +7,7 @@
 
 The Vim script language is used for the startup vimrc file, syntax files, and
 many other things.  This chapter explains the items that can be used in a Vim
-script.  There are a lot of them, thus this is a long chapter.
+script.  There are a lot of them, therefore this is a long chapter.
 
 |41.1|	Introduction
 |41.2|	Variables
@@ -17,8 +17,10 @@ script.  There are a lot of them, thus this is a long chapter.
 |41.6|	Using functions
 |41.7|	Defining a function
 |41.8|	Lists and Dictionaries
-|41.9|	Exceptions
-|41.10|	Various remarks
+|41.9|	White space
+|41.10|	Line continuation
+|41.11|	Comments
+|41.12|	Fileformat
 
      Next chapter: |usr_42.txt|  Add new menus
  Previous chapter: |usr_40.txt|  Make new commands
@@ -28,9 +30,10 @@ Table of contents: |usr_toc.txt|
 *41.1*	Introduction				*vim-script-intro* *script*
 
 Your first experience with Vim scripts is the vimrc file.  Vim reads it when
-it starts up and executes the commands.  You can set options to values you
-prefer.  And you can use any colon command in it (commands that start with a
-":"; these are sometimes referred to as Ex commands or command-line commands).
+it starts up and executes the commands.  You can set options to the values you
+prefer, define mappings, select plugins and much more.   You can use any colon
+command in it (commands that start with a ":"; these are sometimes referred to
+as Ex commands or command-line commands).
 
 Syntax files are also Vim scripts.  As are files that set options for a
 specific file type.  A complicated macro can be defined by a separate Vim
@@ -38,8 +41,8 @@ script file.  You can think of other uses yourself.
 
 Vim script comes in two flavors: legacy and |Vim9|.  Since this help file is
 for new users, we'll teach you the newer and more convenient |Vim9| syntax.
-While legacy script is particular for Vim, |Vim9| script looks more like other
-languages, such as JavaScript and TypeScript.
+While legacy script is particularly for Vim, |Vim9| script looks more like
+other languages, such as JavaScript and TypeScript.
 
 To try out Vim script the best way is to edit a script file and source it.
 Basically: >
@@ -65,8 +68,9 @@ The output of the example code is:
 	count is 4 ~
 
 In the first line the `vim9script` command makes clear this is a new, |Vim9|
-script file.  That matters for how the rest of the file is used.
-
+script file.  That matters for how the rest of the file is used.  It is
+recommended to put it in the very fist line, before any comments.
+							*vim9-declarations*
 The `var i = 1` command declares the "i" variable and initializes it.  The
 generic form is: >
 
@@ -100,29 +104,53 @@ The example was given to explain the commands, but would you really want to
 make such a loop, it can be written much more compact: >
 
 	for i in range(1, 4)
-	  echo "count is" i
+	  echo $"count is {i}"
 	endfor
 
-We won't explain how `for` and `range()` work until later.  Follow the links
-if you are impatient.
+We won't explain how `for`, `range()`and `$"string"` work until later.  Follow
+the links if you are impatient.
+
+
+TRYING OUT EXAMPLES
+
+You can easily try out most examples in these help files without saving the
+commands to a file.  For example, to try out the "for" loop above do this:
+1. position the cursor on the "for"
+2. start Visual mode with "v"
+3. move down to the "endfor"
+4. press colon, then "so" and Enter
+
+After pressing colon you will see ":'<,'>", which is the range of the Visually
+selected text.
+
+For some commands it matters they are executed as in |Vim9| script.  But typed
+commands normally use legacy script syntax, such as the example below that
+causes the E1004 error.  For that use this fourth step:
+4. press colon, then "vim9 so" and Enter
+
+"vim9" is short for `vim9cmd`, which is a command modifier to execute the
+following command in |Vim9| syntax.
+
+Note that this won't work for examples that require a script context.
 
 
 FOUR KINDS OF NUMBERS
 
-Numbers can be decimal, hexadecimal, octal or binary.
+Numbers can be decimal, hexadecimal, octal and binary.
 
 A hexadecimal number starts with "0x" or "0X".  For example "0x1f" is decimal
-31.
+31 and 0x1234 is decimal 4660.
 
 An octal number starts with "0o", "0O".  "0o17" is decimal 15.
 
 A binary number starts with "0b" or "0B".  For example "0b101" is decimal 5.
 
 A decimal number is just digits.  Careful: In legacy script don't put a zero
-before a decimal number, it will be interpreted as an octal number!
+before a decimal number, it will be interpreted as an octal number!  That's
+one reason to use |Vim9| script.
 
-The `echo` command evaluates its argument and always prints decimal numbers.
-Example: >
+The `echo` command evaluates its argument and when it is a number always
+prints the decimal form.  Example: >
 
 	echo 0x7f 0o36
 <	127 30 ~
@@ -155,6 +183,7 @@ To actually have the minus sign be used for negation, you can put the second
 expression in parentheses: >
 
 	echo -0x7f (-0o36)
+<	-127 -30 ~
 
 ==============================================================================
 *41.2*	Variables
@@ -165,19 +194,19 @@ cannot start with a digit.  Valid variable names are:
 	counter
 	_aap3
 	very_long_variable_name_with_underscores
-	FuncLength
+	CamelCaseName
 	LENGTH
 
-Invalid names are "foo+bar" and "6var".
+Invalid names are "foo.bar" and "6var".
 
 Some variables are global.  To see a list of currently defined global
 variables type this command: >
 
 	:let
 
-You can use global variables everywhere.  However, it is easy to use the same
-name in two unrelated scripts.  Therefore variables declared in a script are
-local to that script.  For example, if you have this in "script1.vim": >
+You can use global variables everywhere.  However, it is too easy to use the
+same name in two unrelated scripts.  Therefore variables declared in a script
+are local to that script.  For example, if you have this in "script1.vim": >
 
 	vim9script
 	var counter = 5
@@ -194,19 +223,24 @@ Using a script-local variable means you can be sure that it is only changed in
 that script and not elsewhere.
 
 If you do want to share variables between scripts, use the "g:" prefix and
-assign the value directly, do not use `var`.  Thus in "script1.vim": >
+assign the value directly, do not use `var`.  And use a specific name to avoid
+mistakes.  Thus in "script1.vim": >
 
 	vim9script
-	g:counter = 5
-	echo g:counter
+	g:mash_counter = 5
+	echo g:mash_counter
 <	5 ~
 
 And then in "script2.vim": >
 
 	vim9script
-	echo g:counter
+	echo g:mash_counter
 <	5 ~
 
+Global variables can also be accessed on the command line, E.g. typing this: >
+	echo g:mash_counter
+That will not work for a script-local variable.
+
 More about script-local variables here: |script-variable|.
 
 There are more kinds of variables, see |internal-variables|.  The most often
@@ -231,7 +265,7 @@ when it doesn't, append !: >
 
 	unlet! g:counter
 
-You cannot `unlet` script-local variables in |Vim9| script.  You can in legacy
+You cannot `unlet` script-local variables in |Vim9| script, only in legacy
 script.
 
 When a script finishes, the local variables declared there will not be
@@ -251,12 +285,15 @@ Every time you call the function it will return the next count: >
 	:echo g:GetCount()
 <	2 ~
 
-If you are worried a script-local variable is consuming too much
-memory, set it to an empty value after you no longer need it.
+If you are worried a script-local variable is consuming too much memory, set
+it to an empty or null value after you no longer need it.  Example: >
+	var lines = readfile(...)
+	...
+	lines = []
 
-Note: below we'll leave out the `vim9script` line, so we can concentrate on
-the relevant commands, but you'll still need to put it at the top of your
-script file.
+Note: below we'll leave out the `vim9script` line from examples, so we can
+concentrate on the relevant commands, but you'll still need to put it at the
+top of your script file.
 
 
 STRING VARIABLES AND CONSTANTS
@@ -275,9 +312,13 @@ want to give the variable a value yet, you need to specify the type: >
 
 	var name: string
 	var age: number
-	...
-	name = "Peter"
-	age = 42
+	if male
+	   name = "Peter"
+	   age = 42
+	else
+	   name = "Elisa"
+	   age = 45
+	endif
 
 If you make a mistake and try to assign the wrong type of value you'll get an
 error: >
@@ -287,8 +328,8 @@ error: >
 
 More about types in |41.8|.
 
-To assign a string value to a variable, you need to use a string constant.
-There are two types of these.  First the string in double quotes, as we used
+To assign a string value to a variable, you can use a string constant.  There
+are two types of these.  First the string in double quotes, as we used
 already.  If you want to include a double quote inside the string, put a
 backslash in front of it: >
 
@@ -296,7 +337,7 @@ backslash in front of it: >
 	echo name
 <	he is "Peter" ~
 
-To avoid the need for a backslash, you can use a string in single quotes: >
+To avoid the need for backslashes, you can use a string in single quotes: >
 
 	var name = 'he is "Peter"'
 	echo name
@@ -341,8 +382,8 @@ themselves.  Thus everywhere an expression is expected, you can use a number,
 string or variable.  Other basic items in an expression are:
 
 	$NAME		environment variable
-	&name		option
-	@r		register
+	&name		option value
+	@r		register contents
 
 Examples: >
 
@@ -384,15 +425,24 @@ Grouping is done with parentheses.  No surprises here.  Example: >
 	echo (10 + 5) * 2
 <	30 ~
 
+
+OTHERS
+
 Strings can be concatenated with ".." (see |expr6|).  Example: >
 
-	echo "foo" .. "bar"
-<	foobar ~
+	echo "Name: " .. name
+	Name: Peter
 
 When the "echo" command gets multiple arguments, it separates them with a
 space.  In the example the argument is a single expression, thus no space is
 inserted.
 
+If you don't like the concatenation you can use the $"string" form, which
+accepts an expression in curly braces: >
+	echo $"Name: {name}"
+
+See |interp-string| for more information.
+
 Borrowed from the C language is the conditional expression: >
 
 	a ? b : c
@@ -408,6 +458,10 @@ see it works as: >
 
 	(a) ? (b) : (c)
 
+There is also the falsy operator: >
+	echo name ?? "No name given"
+See |??|.
+
 ==============================================================================
 *41.4*	Conditionals
 
@@ -472,16 +526,17 @@ ones:
 
 The result is true if the condition is met and false otherwise.  An example: >
 
-	if v:version >= 700
+	if v:version >= 800
 	  echo "congratulations"
 	else
 	  echo "you are using an old version, upgrade!"
 	endif
 
 Here "v:version" is a variable defined by Vim, which has the value of the Vim
-version.  600 is for version 6.0, version 6.1 has the value 601.  This is
-very useful to write a script that works with multiple versions of Vim.
-|v:version|
+version.  800 is for version 8.0, version 8.1 has the value 801.  This is
+useful to write a script that works with multiple versions of Vim.
+See |v:version|.  You can also check for a specific feature with `has()` or a
+specific patch, see |has-patch|.
 
 The logic operators work both for numbers and strings.  When comparing two
 strings, the mathematical difference is used.  This compares byte values,
@@ -505,8 +560,8 @@ pattern, like what's used for searching.  Example: >
 	endif
 
 Notice the use of a single-quote string for the pattern.  This is useful,
-because backslashes would need to be doubled in a double-quote string and
-patterns tend to contain many backslashes.
+because patterns tend to contain many backslashes and backslashes need to be
+doubled in a double-quote string.
 
 The match is not anchored, if you want to match the whole string start with
 "^" and end with "$".
@@ -543,6 +598,7 @@ Example: >
 The `sleep` command makes Vim take a nap.  The "50m" specifies fifty
 milliseconds.  Another example is `sleep 4`, which sleeps for four seconds.
 
+`continue` and `break` can also be used in between `for` and `endfor`.
 Even more looping can be done with the `for` command, see below in |41.8|.
 
 ==============================================================================
@@ -579,9 +635,9 @@ Example: >
 This will move the cursor "count" lines down.
 
 Make sure that the argument for `normal` is a complete command.  Otherwise
-Vim will run into the end of the argument and abort the command.  For example,
-if you start the delete operator, you must give the movement command also.
-This works: >
+Vim will run into the end of the argument and silently abort the command.  For
+example, if you start the delete operator, you must give the movement command
+also.  This works: >
 	
 	normal d$
 
@@ -604,8 +660,8 @@ Notice the use of the special key "\<Esc>".  This avoids having to enter a
 real <Esc> character in your script.  That is where `execute` with a
 double-quote string comes in handy.
 
-If you don't want to execute a string but evaluate it to get its expression
-value, you can use the eval() function: >
+If you don't want to execute a string as a command but evaluate it to get the
+result of the expression, you can use the eval() function: >
 
 	var optname = "path"
 	var optvalue = eval('&' .. optname)
@@ -620,19 +676,20 @@ Vim defines many functions and provides a large amount of functionality that
 way.  A few examples will be given in this section.  You can find the whole
 list below: |function-list|.
 
-A function is called with the `call` command.  The parameters are passed in
-between parentheses separated by commas.  Example: >
+A function is called with the parameters in between parentheses, separated by
+commas.  Example: >
 
-	call search("Date: ", "W")
+	search("Date: ", "W")
 
 This calls the search() function, with arguments "Date: " and "W".  The
 search() function uses its first argument as a search pattern and the second
 one as flags.  The "W" flag means the search doesn't wrap around the end of
 the file.
 
-Using `call` is optional in |Vim9| script, this works the same way: >
+Using the  `call` command is optional in |Vim9| script.  It is required in
+legacy script and on the command line: >
 
-	search("Date: ", "W")
+	call search("Date: ", "W")
 
 A function can be called in an expression.  Example: >
 
@@ -644,10 +701,10 @@ The getline() function obtains a line from the current buffer.  Its argument
 is a specification of the line number.  In this case "." is used, which means
 the line where the cursor is.
 
-The substitute() function does something similar to the `substitute` command.
-The first argument is the string on which to perform the substitution.  The
-second argument is the pattern, the third the replacement string.  Finally,
-the last arguments are the flags.
+The substitute() function does something similar to the `:substitute` command.
+The first argument "line" is the string on which to perform the substitution.
+The second argument '\a' is the pattern, the third "*" is the replacement
+string.  Finally, the last argument "g" is the flags.
 
 The setline() function sets the line, specified by the first argument, to a
 new string, the second argument.  In this example the line under the cursor is
@@ -656,7 +713,7 @@ statements is equal to: >
 
 	:substitute/\a/*/g
 
-Using the functions becomes more interesting when you do more work before and
+Using the functions becomes interesting when you do more work before and
 after the substitute() call.
 
 
@@ -835,6 +892,7 @@ Cursor and mark position:		*cursor-functions* *mark-functions*
 	screencol()		get screen column of the cursor
 	screenrow()		get screen row of the cursor
 	screenpos()		screen row and col of a text character
+	virtcol2col()		byte index of a text character on screen
 	getcurpos()		get position of the cursor
 	getpos()		get position of cursor, mark, etc.
 	setpos()		set position of cursor, mark, etc.
@@ -1346,8 +1404,9 @@ Let's assign the variable "smaller" the value of the smallest number: >
 	  smaller = num2
 	endif
 
-The variable "smaller" is a local variable.  Variables used inside a function
-are local unless prefixed by something like "g:", "w:", or "s:".
+The variable "smaller" is a local variable.  It is declared to be a number,
+that way Vim can warn you for any mistakes.  Variables used inside a function
+are local unless prefixed by something like "g:", "w:", or "b:".
 
 	Note:
 	To access a global variable from inside a function you must prepend
@@ -1403,15 +1462,23 @@ functions in the script: >
 
 	defcompile
 
-For a function that does not return anything leave out the return type: >
+Compiling functions takes a little time, but does report errors early.  You
+could use `:defcompile` at the end of your script while working on it, and
+comment it out when everything is fine.
+
+For a function that does not return anything simply leave out the return type: >
 
 	def SayIt(text: string)
 	  echo text
 	enddef
 
+If you want to return any kind of value, you can use the "any" return type: >
+	def GetValue(): any
+This disables type checking for the return value, use only when needed.
+
 It is also possible to define a legacy function with `function` and
-`endfunction`.  These do not have types and are not compiled.  They execute
-much slower.
+`endfunction`.  These do not have types and are not compiled.  Therefore they
+execute much slower.
 
 
 USING A RANGE
@@ -1425,47 +1492,12 @@ once for every line in the range, with the cursor in that line.  Example: >
 
 If you call this function with: >
 
-	:10,15call Number()
+	:10,15Number()
 
 The function will be called six times, starting on line 10 and ending on line
 15.
 
 
-VARIABLE NUMBER OF ARGUMENTS
-
-Vim enables you to define functions that have a variable number of arguments.
-The following command, for instance, defines a function that must have 1
-argument (start) and can have up to 20 additional arguments: >
-
-	def Show(start: string, ...items: list<string>)
-
-The variable "items" will be a list containing the extra arguments.  You can
-use it like any list, for example: >
-
-	def Show(start: string, ...items: list<string>)
-	  echohl Title
-	  echo "start is " .. start
-	  echohl None
-	  for index in range(len(items))
-	    echon "  Arg " .. index .. " is " .. items[index]
-	  endfor
-	  echo
-	enddef
-
-You can call it like this: >
-
-	Show('Title', 'one', 'two', 'three')
-<	start is Title  Arg 0 is one  Arg 1 is two  Arg 2 is three ~
-	
-This uses the `echohl` command to specify the highlighting used for the
-following `echo` command.  `echohl None` stops it again.  The `echon` command
-works like `echo`, but doesn't output a line break.
-
-If you call it with one argument the "items" list will be empty.
-`range(len(items))` returns a list with the indexes, what `for` loops over,
-we'll explain that further down.
-
-
 LISTING FUNCTIONS
 
 The `function` command lists the names and arguments of all user-defined
@@ -1477,7 +1509,7 @@ functions: >
 	function SetSyn(name) ~
 
 The "<SNR>" prefix means that a function is script-local.  |Vim9| functions
-wil start with "def" and include argument and return types.  Legacy functions
+will start with "def" and include argument and return types.  Legacy functions
 are listed with "function".
 
 To see what a function does, use its name as an argument for `function`: >
@@ -1488,12 +1520,11 @@ To see what a function does, use its name as an argument for `function`: >
 	3     endif ~
 	   endfunction ~
 
-To see the "Show" function you need to include the script prefix, since a
-"Show" function can be defined multiple times in different scripts.  To find
+To see the "Show" function you need to include the script prefix, since
+multiple "Show" functions can be defined in different scripts.  To find
 the exact name you can use `function`, but the result may be a very long list.
 To only get the functions matching a pattern you can use the `filter` prefix:
 >
-
 	:filter Show function
 <	def <SNR>86_Show(start: string, ...items: list<string>) ~
 >
@@ -1527,26 +1558,31 @@ You get an error when the function doesn't exist or cannot be deleted.
 FUNCTION REFERENCES
 
 Sometimes it can be useful to have a variable point to one function or
-another.  You can do it with function reference variable.  Often shortened to
-"funcref".  Example: >
+another.  You can do it with a function reference variable.  Often shortened
+to "funcref".  Example: >
 
-	def Right()
+	def Right(): string
 	  return 'Right!'
 	enddef
-	def Wrong()
+	def Wrong(): string
 	  return 'Wrong!'
 	enddef
 	
 	var Afunc = g:result == 1 ? Right : Wrong
-	Afunc()
+	echo Afunc()
 <	Wrong! ~
 
-This assumes "g:result" is not one.
+This assumes "g:result" is not one.  See |Funcref| for details.
 
 Note that the name of a variable that holds a function reference must start
 with a capital.  Otherwise it could be confused with the name of a builtin
 function.
 
+
+FURTHER READING
+
+Using a variable number of arguments is introduced in section |50.2|.
+
 More information about defining your own functions here: |user-functions|.
 
 ==============================================================================
@@ -1559,7 +1595,7 @@ A List is an ordered sequence of items.  The items can be any kind of value,
 thus you can make a List of numbers, a List of Lists and even a List of mixed
 items.  To create a List with three strings: >
 
-	var alist = ['aap', 'mies', 'noot']
+	var alist = ['aap', 'noot', 'mies']
 
 The List items are enclosed in square brackets and separated by commas.  To
 create an empty List: >
@@ -1581,14 +1617,14 @@ List concatenation is done with +: >
 	echo alist
 <	['foo', 'bar', 'and', 'more'] ~
 
-Or, if you want to extend a List with a function: >
+Or, if you want to extend a List with a function, use `extend()`: >
 
 	var alist = ['one']
 	extend(alist, ['two', 'three'])
 	echo alist
 <	['one', 'two', 'three'] ~
 
-Notice that using `add()` will have a different effect: >
+Notice that using `add()` will have a different effect than `extend()`: >
 
 	var alist = ['one']
 	add(alist, ['two', 'three'])
@@ -1613,7 +1649,7 @@ One of the nice things you can do with a List is iterate over it: >
 This will loop over each element in List "alist", assigning each value to
 variable "n".  The generic form of a for loop is: >
 
-	for {varname} in {listexpression}
+	for {varname} in {list-expression}
 	  {commands}
 	endfor
 
@@ -1628,7 +1664,10 @@ range() function creates one for you: >
 	2 ~
 
 Notice that the first item of the List that range() produces is zero, thus the
-last item is one less than the length of the list.
+last item is one less than the length of the list.  Detail: Internally range()
+does not actually create the list, so that a large range used in a for loop
+works efficiently.  When used elsewhere, the range is turned into an actual
+list, which takes more time for a long list.
 
 You can also specify the maximum value, the stride and even go backwards: >
 
@@ -1639,15 +1678,17 @@ You can also specify the maximum value, the stride and even go backwards: >
 	6 ~
 	4 ~
 
-A more useful example, looping over lines in the buffer: >
+A more useful example, looping over all the lines in the buffer: >
 
-	for line in getline(1, 20)
+	for line in getline(1, 50)
 	  if line =~ "Date: "
 	    echo line
 	  endif
 	endfor
 
-This looks into lines 1 to 20 (inclusive) and echoes any date found in there.
+This looks into lines 1 to 50 (inclusive) and echoes any date found in there.
+
+For further reading see |Lists|.
 
 
 DICTIONARIES
@@ -1699,104 +1740,31 @@ specific order: >
 But you can never get back the order in which items are defined.  For that you
 need to use a List, it stores items in an ordered sequence.
 
-
-For further reading see |Lists| and |Dictionaries|.
+For further reading see |Dictionaries|.
 
 ==============================================================================
-*41.9*	Exceptions
+*41.9*	White space
 
-Let's start with an example: >
+Blank lines are allowed in a script and ignored.
 
-	try
-	   read ~/templates/pascal.tmpl
-	catch /E484:/
-	   echo "Sorry, the Pascal template file cannot be found."
-	endtry
-
-The `read` command will fail if the file does not exist.  Instead of
-generating an error message, this code catches the error and gives the user a
-nice message.
-
-For the commands in between `try` and `endtry` errors are turned into
-exceptions.  An exception is a string.  In the case of an error the string
-contains the error message.  And every error message has a number.  In this
-case, the error we catch contains "E484:".  This number is guaranteed to stay
-the same (the text may change, e.g., it may be translated).
-
-Besides being able to give a nice error message, Vim will also continue
-executing commands.  Otherwise, once an uncaught error is encountered,
-execution will be aborted.
-
-When the `read` command causes another error, the pattern "E484:" will not
-match in it.  Thus this exception will not be caught and result in the usual
-error message.
-
-You might be tempted to do this: >
-
-	try
-	   read ~/templates/pascal.tmpl
-	catch
-	   echo "Sorry, the Pascal template file cannot be found."
-	endtry
-
-This means all errors are caught.  But then you will not see an error that
-would indicate a completely different problem, such as "E21: Cannot make
-changes, 'modifiable' is off".
-
-Another useful mechanism is the `finally` command: >
-
-	var tmp = tempname()
-	try
-	   exe ":.,$write " .. tmp
-	   exe "!filter " .. tmp
-	   :.,$delete
-	   exe ":$read " .. tmp
-	finally
-	   call delete(tmp)
-	endtry
-
-This filters the lines from the cursor until the end of the file through the
-"filter" command, which takes a file name argument.  No matter if the
-filtering works, something goes wrong in between `try` and `finally` or the
-user cancels the filtering by pressing CTRL-C, the `call delete(tmp)` is
-always executed.  This makes sure you don't leave the temporary file behind.
-
-More information about exception handling can be found in the reference
-manual: |exception-handling|.
-
-==============================================================================
-*41.10*	Various remarks
-
-Here is a summary of items that are useful to know when writing Vim scripts.
-
-The end-of-line character depends on the system.  For Vim scripts it is
-recommended to always use the Unix fileformat, this also works on any other
-system.  That way you can copy your Vim scripts from MS-Windows to Unix and
-they still work.  See |:source_crnl|.  To be sure it is set right, do this
-before writing the file: >
-
-	:setlocal fileformat=unix
-
-
-WHITE SPACE
-
-Blank lines are allowed and ignored.
-
-Leading whitespace characters (blanks and TABs) are always ignored.
+Leading whitespace characters (blanks and TABs) are ignored, except when using
+|:let-heredoc| without "trim".
 
 Trailing whitespace is often ignored, but not always.  One command that
-includes it is `map`.
+includes it is `map`.  You have to watch out for that, it can cause hard to
+understand mistakes.  A generic solution is to never use trailing white space,
+unless you really need it.
 
 To include a whitespace character in the value of an option, it must be
 escaped by a "\" (backslash)  as in the following example: >
 
 	:set tags=my\ nice\ file
 
-The same example written as: >
+If it would be written as: >
 
 	:set tags=my nice file
 
-will issue an error, because it is interpreted as: >
+This will issue an error, because it is interpreted as: >
 
 	:set tags=my
 	:set nice
@@ -1804,17 +1772,52 @@ will issue an error, because it is interpreted as: >
 
 |Vim9| script is very picky when it comes to white space.  This was done
 intentionally to make sure scripts are easy to read and to avoid mistakes.
+If you use white space sensibly it will just work.  When not you will get an
+error message telling you where white space is missing or should be removed.
 
+==============================================================================
+*41.10*	Line continuation
 
-COMMENTS
+In legacy Vim script line continuation is done by preceding a continuation
+line with a backslash: >
+	let mylist = [
+			\ 'one',
+			\ 'two',
+			\ ]
 
-In |Vim9| script the character # starts a comment.  Everything after
-and including this character until the end-of-line is considered a comment and
+This requires the 'cpo' option to exclude the "C" flag.  Normally this is done
+by putting this at the start of the script: >
+	let s:save_cpo = &cpo
+	set cpo&vim
+
+And restore the option at the end of the script: >
+	let &cpo = s:save_cpo
+	unlet s:save_cpo
+
+A few more details can be found here: |line-continuation|.
+
+In |Vim9| script the backslash can still be used, but in most places it is not
+needed: >
+	var mylist = [
+			'one',
+			'two',
+			]
+
+Also, the 'cpo' option does not need to be changed.  See
+|vim9-line-continuation| for details.
+
+==============================================================================
+*41.11*	Comments
+
+In |Vim9| script the character # starts a comment.  That character and
+everything after it until the end-of-line is considered a comment and
 is ignored, except for commands that don't consider comments, as shown in
 examples below.  A comment can start on any character position on the line,
-but not when it is part of the command, e.g. in a string.
+but not when it is part of the command, e.g. inside a string.
 
 The character " (the double quote mark) starts a comment in legacy script.  
+This involves some cleverness to make sure double quoted strings are not
+recognized as comments (just one reason to prefer |Vim9| script).
 
 There is a little "catch" with comments for some commands.  Examples: >
 
@@ -1823,11 +1826,12 @@ There is a little "catch" with comments for some commands.  Examples: >
 	execute cmd		# do it
 	!ls *.c			# list C files
 
-The abbreviation 'dev' will be expanded to 'development  # shorthand'.  The
-mapping of <F3> will actually be the whole line after the 'o# ....' including
-the '# insert include'.  The `execute` command will give an error.  The `!`
-command will send everything after it to the shell, most likely causing an
-error.
+- The abbreviation 'dev' will be expanded to 'development  # shorthand'.
+- The mapping of <F3> will actually be the whole line after the 'o# ....'
+  including the '# insert include'.
+- The `execute` command will give an error.
+- The `!` command will send everything after it to the shell, most likely
+  causing an error.
 
 There can be no comment after `map`, `abbreviate`, `execute` and `!` commands
 (there are a few more commands with this restriction).  For the `map`,
@@ -1849,7 +1853,8 @@ trailing whitespace is included: >
 
 	map <F4> o#include  
 
-To spot these problems, you can highlight trailing spaces: >
+Here it is intended, in other cases it might be accidental.  To spot these
+problems, you can highlight trailing spaces: >
 	match Search /\s\+$/
 
 For Unix there is one special way to comment a line, that allows making a Vim
@@ -1858,75 +1863,24 @@ script executable, and it also works in legacy script: >
 	echo "this is a Vim script"
 	quit
 
+==============================================================================
+*41.12*	Fileformat
 
-PITFALLS
+The end-of-line character depends on the system.  For Vim scripts it is
+recommended to always use the Unix fileformat.  Lines are then separated with
+the Newline character.  This also works on any other system.  That way you can
+copy your Vim scripts from MS-Windows to Unix and they still work.  See
+|:source_crnl|.  To be sure it is set right, do this before writing the file:
+>
+	:setlocal fileformat=unix
 
-An even bigger problem arises in the following example: >
-
-	map ,ab o#include
-	unmap ,ab 
-
-Here the unmap command will not work, because it tries to unmap ",ab ".  This
-does not exist as a mapped sequence.  An error will be issued, which is very
-hard to identify, because the ending whitespace character in `unmap ,ab ` is
-not visible.
-
-And this is the same as what happens when one uses a comment after an 'unmap'
-command: >
-
-	unmap ,ab     # comment
-
-Here the comment part will be ignored.  However, Vim will try to unmap
-',ab     ', which does not exist.  Rewrite it as: >
-
-	unmap ,ab|    # comment
-
-
-RESTORING THE VIEW
-
-Sometimes you want to make a change and go back to where the cursor was.
-Restoring the relative position would also be nice, so that the same line
-appears at the top of the window.
-
-This example yanks the current line, puts it above the first line in the file
-and then restores the view: >
-
-	map ,p ma"aYHmbgg"aP`bzt`a
-
-What this does: >
-	ma"aYHmbgg"aP`bzt`a
-<	ma			set mark a at cursor position
-	  "aY			yank current line into register a
-	     Hmb		go to top line in window and set mark b there
-		gg		go to first line in file
-		  "aP		put the yanked line above it
-		     `b		go back to top line in display
-		       zt	position the text in the window as before
-			 `a	go back to saved cursor position
-
-
-PACKAGING
-
-Sometimes you will want to use global variables or functions, so that they can
-be used anywhere.  A good example is a global variable that passes a
-preference to a  plugin.  To avoid other scripts using the same name, use a
-prefix that is very unlikely to be used elsewhere.  For example, if you have a
-"mytags" plugin, you could use: >
-
-	g:mytags_location = '$HOME/project'
-	g:mytags_style = 'fast'
-
-To minimize interference between plugins keep as much as possible local to the
-script.  |Vim9| script helps you with that, by default functions and variables
-are script-local.
-
-If you split your plugin into parts, you can use `import` and `export` to
-share items between those parts.  See `:export` for the details.
-
-More information about writing plugins is in |usr_51.txt|.
+When using "dos" fileformat, lines are separated with CR-NL, two characters.
+The CR character causes various problems, better avoid this.
 
 ==============================================================================
 
+Advance information about writing Vim script is in |usr_50.txt|.
+
 Next chapter: |usr_42.txt|  Add new menus
 
 Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:

runtime/doc/usr_50.txt

@@ -1,22 +1,128 @@
-*usr_50.txt*	For Vim version 8.2.  Last change: 2022 May 13
+*usr_50.txt*	For Vim version 8.2.  Last change: 2022 Jun 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
 			 Advanced Vim script writing
 
 
-TODO - this chapter is to be written
-
-|50.1|	Writing stuff
+|50.1|	Exceptions
+|50.2|    Function with variable number of arguments
+|50.3|	Restoring the view
 
      Next chapter: |usr_51.txt|  Create a plugin
  Previous chapter: |usr_45.txt|  Select your language (local)
 Table of contents: |usr_toc.txt|
 
 ==============================================================================
-*50.1*	Writing stuff
+*50.1*	Exceptions
 
-TODO
+Let's start with an example: >
+
+	try
+	   read ~/templates/pascal.tmpl
+	catch /E484:/
+	   echo "Sorry, the Pascal template file cannot be found."
+	endtry
+
+The `read` command will fail if the file does not exist.  Instead of
+generating an error message, this code catches the error and gives the user a
+message with more information.
+
+For the commands in between `try` and `endtry` errors are turned into
+exceptions.  An exception is a string.  In the case of an error the string
+contains the error message.  And every error message has a number.  In this
+case, the error we catch contains "E484:".  This number is guaranteed to stay
+the same (the text may change, e.g., it may be translated).
+
+Besides being able to give a nice error message, Vim will also continue
+executing commands after the `:endtry`.  Otherwise, once an uncaught error is
+encountered, execution of the script/function/mapping will be aborted.
+
+When the `read` command causes another error, the pattern "E484:" will not
+match in it.  Thus this exception will not be caught and result in the usual
+error message and execution is aborted.
+
+You might be tempted to do this: >
+
+	try
+	   read ~/templates/pascal.tmpl
+	catch
+	   echo "Sorry, the Pascal template file cannot be found."
+	endtry
+
+This means all errors are caught.  But then you will not see an error that
+would indicate a completely different problem, such as "E21: Cannot make
+changes, 'modifiable' is off".  Think twice before you catch any error!
+
+Another useful mechanism is the `finally` command: >
+
+	var tmp = tempname()
+	try
+	   exe ":.,$write " .. tmp
+	   exe "!filter " .. tmp
+	   :.,$delete
+	   exe ":$read " .. tmp
+	finally
+	   delete(tmp)
+	endtry
+
+This filters the lines from the cursor until the end of the file through the
+"filter" command, which takes a file name argument.  No matter if the
+filtering works, if something goes wrong in between `try` and `finally` or the
+user cancels the filtering by pressing CTRL-C, the `delete(tmp)` call is
+always executed.  This makes sure you don't leave the temporary file behind.
+
+The `finally` does not catch the exception, the error will still abort
+further execution.
+
+More information about exception handling can be found in the reference
+manual: |exception-handling|.
+
+==============================================================================
+*50.2*	Function with variable number of arguments
+
+Vim enables you to define functions that have a variable number of arguments.
+The following command, for instance, defines a function that must have 1
+argument (start) and can have up to 20 additional arguments: >
+
+	def Show(start: string, ...items: list<string>)
+
+The variable "items" will be a list in the function containing the extra
+arguments.  You can use it like any list, for example: >
+
+	def Show(start: string, ...items: list<string>)
+	  echohl Title
+	  echo "start is " .. start
+	  echohl None
+	  for index in range(len(items))
+	    echon $"  Arg {index} is {items[index]}"
+	  endfor
+	  echo
+	enddef
+
+You can call it like this: >
+
+	Show('Title', 'one', 'two', 'three')
+<	start is Title  Arg 0 is one  Arg 1 is two  Arg 2 is three ~
+	
+This uses the `echohl` command to specify the highlighting used for the
+following `echo` command.  `echohl None` stops it again.  The `echon` command
+works like `echo`, but doesn't output a line break.
+
+If you call it with one argument the "items" list will be empty.
+`range(len(items))` returns a list with the indexes, what `for` loops over,
+we'll explain that further down.
+
+==============================================================================
+*50.3*	Restoring the view
+
+Sometimes you want to jump around, make a change and then go back to the same
+position and view.  For example to change something in the file header.  This
+can be done with two functions: >
+
+	var view = winsaveview()
+	# Move around, make changes
+	winrestview(view)
 
 ==============================================================================
 

runtime/doc/usr_51.txt

@@ -1,4 +1,4 @@
-*usr_51.txt*	For Vim version 8.2.  Last change: 2022 May 14
+*usr_51.txt*	For Vim version 8.2.  Last change: 2022 Jun 03
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -12,11 +12,9 @@ most common Vim plugins.
 |51.1|	Writing a generic plugin
 |51.2|	Writing a filetype plugin
 |51.3|	Writing a compiler plugin
-|51.4|	Writing a plugin that loads quickly
-|51.5|	Writing library scripts
-|51.6|	Distributing Vim scripts
+|51.4|	Distributing Vim scripts
 
-     Next chapter: |usr_52.txt|  Write plugins using Vim9 script
+     Next chapter: |usr_52.txt|  Write large plugins
  Previous chapter: |usr_50.txt|  Advanced Vim script writing
 Table of contents: |usr_toc.txt|
 
@@ -36,6 +34,9 @@ In this section the first type is explained.  Most items are also relevant for
 writing filetype plugins.  The specifics for filetype plugins are in the next
 section |write-filetype-plugin|.
 
+We will use |Vim9| syntax here, the recommended way to write new plugins.
+Make sure the file starts with the `vim9script` command.
+
 
 NAME
 
@@ -55,11 +56,11 @@ BODY
 
 Let's start with the body of the plugin, the lines that do the actual work: >
 
- 14	iabbrev teh the
- 15	iabbrev otehr other
- 16	iabbrev wnat want
- 17	iabbrev synchronisation
- 18		\ synchronization
+ 12	iabbrev teh the
+ 13	iabbrev otehr other
+ 14	iabbrev wnat want
+ 15	iabbrev synchronisation
+ 16		\ synchronization
 
 The actual list should be much longer, of course.
 
@@ -98,28 +99,6 @@ the top of the plugin should be sufficient.  Example: >
   5	# License:	This file is placed in the public domain.
 
 
-LINE CONTINUATION AND AVOIDING SIDE EFFECTS		 *use-cpo-save*
-
-In line 18 above, the line-continuation mechanism is used |line-continuation|.
-Users with 'compatible' set will run into trouble here, they will get an error
-message.  We can't just reset 'compatible', because that has a lot of side
-effects.  Instead, we will set the 'cpoptions' option to its Vim default
-value and restore it later.  That will allow the use of line-continuation and
-make the script work for most people.  It is done like this: >
-
- 11	var save_cpo = &cpo
- 12	set cpo&vim
- ..
- 42	&cpo = save_cpo
-
-We first store the old value of 'cpoptions' in the "save_cpo" variable.  At
-the end of the plugin this value is restored.
-
-Notice that "save_cpo" is a script-local variable.  A global variable could
-already be in use for something else.  Always use script-local variables for
-things that are only used in the script.
-
-
 NOT LOADING
 
 It is possible that a user doesn't always want to load this plugin.  Or the
@@ -153,7 +132,7 @@ for this mapping, but the user might already use it for something else.  To
 allow the user to define which keys a mapping in a plugin uses, the <Leader>
 item can be used: >
 
- 22	  map <unique> <Leader>a  <Plug>TypecorrAdd;
+ 20	  map <unique> <Leader>a  <Plug>TypecorrAdd;
 
 The "<Plug>TypecorrAdd;" thing will do the work, more about that further on.
 
@@ -171,9 +150,9 @@ already happened to exist. |:map-<unique>|
 But what if the user wants to define his own key sequence?  We can allow that
 with this mechanism: >
 
- 21	if !hasmapto('<Plug>TypecorrAdd;')
- 22	  map <unique> <Leader>a  <Plug>TypecorrAdd;
- 23	endif
+ 19	if !hasmapto('<Plug>TypecorrAdd;')
+ 20	  map <unique> <Leader>a  <Plug>TypecorrAdd;
+ 21	endif
 
 This checks if a mapping to "<Plug>TypecorrAdd;" already exists, and only
 defines the mapping from "<Leader>a" if it doesn't.  The user then has a
@@ -196,11 +175,11 @@ would need to prefix the name with "s:".
 
 We will define a function that adds a new typing correction: >
 
- 30	def Add(from: string, correct: bool)
- 31	  var to = input($"type the correction for {from}: ")
- 32	  exe $":iabbrev {from} {to}"
- ..
- 36	enddef
+ 28	def Add(from: string, correct: bool)
+ 29	  var to = input($"type the correction for {from}: ")
+ 30	  exe $":iabbrev {from} {to}"
+ ...
+ 34	enddef
 
 Now we can call the function Add() from within this script.  If another
 script also defines Add(), it will be local to that script and can only
@@ -210,9 +189,9 @@ which is again another function.
 <SID> can be used with mappings.  It generates a script ID, which identifies
 the current script.  In our typing correction plugin we use it like this: >
 
- 24	noremap <unique> <script> <Plug>TypecorrAdd;  <SID>Add
- ..
- 28	noremap <SID>Add  :call <SID>Add(expand("<cword>"), true)<CR>
+ 22	noremap <unique> <script> <Plug>TypecorrAdd;  <SID>Add
+ ...
+ 26	noremap <SID>Add  :call <SID>Add(expand("<cword>"), true)<CR>
 
 Thus when a user types "\a", this sequence is invoked: >
 
@@ -232,7 +211,7 @@ Add() in other places (the script itself, autocommands, user commands).
 
 We can also add a menu entry to do the same as the mapping: >
 
- 26	noremenu <script> Plugin.Add\ Correction      <SID>Add
+ 24	noremenu <script> Plugin.Add\ Correction      <SID>Add
 
 The "Plugin" menu is recommended for adding menu items for plugins.  In this
 case only one item is used.  When adding more items, creating a submenu is
@@ -276,9 +255,9 @@ USER COMMAND
 
 Now let's add a user command to add a correction: >
 
- 38	if !exists(":Correct")
- 39	  command -nargs=1  Correct  :call Add(<q-args>, false)
- 40	endif
+ 36	if !exists(":Correct")
+ 37	  command -nargs=1  Correct  :call Add(<q-args>, false)
+ 38	endif
 
 The user command is defined only if no command with the same name already
 exists.  Otherwise we would get an error here.  Overriding the existing user
@@ -299,20 +278,21 @@ the same script again. |s:var|
 
 The nice thing about |Vim9| script is that variables are local to the script
 by default.  You can prepend "s:" if you like, but you do not need to.  And
-functions in the script can also use the script variables without a prefix.
+functions in the script can also use the script variables without a prefix
+(they must be declared before the function for this to work).
 
 Script-local variables can also be used in functions, autocommands and user
 commands that are defined in the script.  Thus they are the perfect way to
 share information between parts of your plugin, without it leaking out.  In
 our example we can add a few lines to count the number of corrections: >
 
- 19	var count = 4
- ..
- 30	def Add(from: string, correct: bool)
- ..
- 34	  count += 1
- 35	  echo "you now have " .. count .. " corrections"
- 36	enddef
+ 17	var count = 4
+ ...
+ 28	def Add(from: string, correct: bool)
+ ...
+ 32	  count += 1
+ 33	  echo "you now have " .. count .. " corrections"
+ 34	enddef
 
 "count" is declared and initialized to 4 in the script itself.  When later
 the Add() function is called, it increments "count".  It doesn't matter from
@@ -334,40 +314,36 @@ Here is the resulting complete example: >
   8	  finish
   9	endif
  10	g:loaded_typecorrect = 1
- 11	var save_cpo = &cpo
- 12	set cpo&vim
- 13
- 14	iabbrev teh the
- 15	iabbrev otehr other
- 16	iabbrev wnat want
- 17	iabbrev synchronisation
- 18		\ synchronization
- 19	var count = 4
- 20
- 21	if !hasmapto('<Plug>TypecorrAdd;')
- 22	  map <unique> <Leader>a  <Plug>TypecorrAdd;
- 23	endif
- 24	noremap <unique> <script> <Plug>TypecorrAdd;  <SID>Add
+ 11
+ 12	iabbrev teh the
+ 13	iabbrev otehr other
+ 14	iabbrev wnat want
+ 15	iabbrev synchronisation
+ 16		\ synchronization
+ 17	var count = 4
+ 18
+ 19	if !hasmapto('<Plug>TypecorrAdd;')
+ 20	  map <unique> <Leader>a  <Plug>TypecorrAdd;
+ 21	endif
+ 22	noremap <unique> <script> <Plug>TypecorrAdd;  <SID>Add
+ 23
+ 24	noremenu <script> Plugin.Add\ Correction      <SID>Add
  25
- 26	noremenu <script> Plugin.Add\ Correction      <SID>Add
+ 26	noremap <SID>Add  :call <SID>Add(expand("<cword>"), true)<CR>
  27
- 28	noremap <SID>Add  :call <SID>Add(expand("<cword>"), true)<CR>
- 29
- 30	def Add(from: string, correct: bool)
- 31	  var to = input("type the correction for " .. from .. ": ")
- 32	  exe ":iabbrev " .. from .. " " .. to
- 33	  if correct | exe "normal viws\<C-R>\" \b\e" | endif
- 34	  count += 1
- 35	  echo "you now have " .. count .. " corrections"
- 36	enddef
- 37
- 38	if !exists(":Correct")
- 39	  command -nargs=1  Correct  call Add(<q-args>, false)
- 40	endif
- 41
- 42	&cpo = save_cpo
+ 28	def Add(from: string, correct: bool)
+ 29	  var to = input("type the correction for " .. from .. ": ")
+ 30	  exe ":iabbrev " .. from .. " " .. to
+ 31	  if correct | exe "normal viws\<C-R>\" \b\e" | endif
+ 32	  count += 1
+ 33	  echo "you now have " .. count .. " corrections"
+ 34	enddef
+ 35
+ 36	if !exists(":Correct")
+ 37	  command -nargs=1  Correct  call Add(<q-args>, false)
+ 38	endif
 
-Line 33 wasn't explained yet.  It applies the new correction to the word under
+Line 31 wasn't explained yet.  It applies the new correction to the word under
 the cursor.  The |:normal| command is used to use the new abbreviation.  Note
 that mappings and abbreviations are expanded here, even though the function
 was called from a mapping defined with ":noremap".
@@ -413,24 +389,6 @@ Using references to other parts of the help in || is recommended.  This makes
 it easy for the user to find associated help.
 
 
-FILETYPE DETECTION					*plugin-filetype*
-
-If your filetype is not already detected by Vim, you should create a filetype
-detection snippet in a separate file.  It is usually in the form of an
-autocommand that sets the filetype when the file name matches a pattern.
-Example: >
-
-	au BufNewFile,BufRead *.foo		setlocal filetype=foofoo
-
-Write this single-line file as "ftdetect/foofoo.vim" in the first directory
-that appears in 'runtimepath'.  For Unix that would be
-"~/.vim/ftdetect/foofoo.vim".  The convention is to use the name of the
-filetype for the script name.
-
-You can make more complicated checks if you like, for example to inspect the
-contents of the file to recognize the language.  Also see |new-filetype|.
-
-
 SUMMARY							*plugin-special*
 
 Summary of special things to use in a plugin:
@@ -497,7 +455,7 @@ you can write the different setting in a script: >
 Now write this in the "after" directory, so that it gets sourced after the
 distributed "vim.vim" ftplugin |after-directory|.  For Unix this would be
 "~/.vim/after/ftplugin/vim.vim".  Note that the default plugin will have set
-"b:did_ftplugin", but it is ignored here.
+"b:did_ftplugin", it is ignored here.
 
 
 OPTIONS
@@ -591,6 +549,9 @@ This construct makes sure the function is only defined once: >
 	  enddef
 	endif
 <
+Don't forget to use "noclear" with the `vim9script` command to avoid that the
+function is deleted when the script is sourced a second time.
+
 
 UNDO						*undo_indent* *undo_ftplugin*
 
@@ -598,15 +559,12 @@ When the user does ":setfiletype xyz" the effect of the previous filetype
 should be undone.  Set the b:undo_ftplugin variable to the commands that will
 undo the settings in your filetype plugin.  Example: >
 
-	let b:undo_ftplugin = "setlocal fo< com< tw< commentstring<"
+	b:undo_ftplugin = "setlocal fo< com< tw< commentstring<"
 		\ .. "| unlet b:match_ignorecase b:match_words b:match_skip"
 
 Using ":setlocal" with "<" after the option name resets the option to its
 global value.  That is mostly the best way to reset the option value.
 
-This does require removing the "C" flag from 'cpoptions' to allow line
-continuation, as mentioned above |use-cpo-save|.
-
 For undoing the effect of an indent script, the b:undo_indent variable should
 be set accordingly.
 
@@ -625,6 +583,24 @@ these three forms:
 "stuff" is the filetype, "foo" and "bar" are arbitrary names.
 
 
+FILETYPE DETECTION					*plugin-filetype*
+
+If your filetype is not already detected by Vim, you should create a filetype
+detection snippet in a separate file.  It is usually in the form of an
+autocommand that sets the filetype when the file name matches a pattern.
+Example: >
+
+	au BufNewFile,BufRead *.foo		setlocal filetype=foofoo
+
+Write this single-line file as "ftdetect/foofoo.vim" in the first directory
+that appears in 'runtimepath'.  For Unix that would be
+"~/.vim/ftdetect/foofoo.vim".  The convention is to use the name of the
+filetype for the script name.
+
+You can make more complicated checks if you like, for example to inspect the
+contents of the file to recognize the language.  Also see |new-filetype|.
+
+
 SUMMARY							*ftplugin-special*
 
 Summary of special things to use in a filetype plugin:
@@ -693,149 +669,7 @@ last, thus it should be in a directory at the end of 'runtimepath'.  For Unix
 that could be ~/.vim/after/compiler.
 
 ==============================================================================
-*51.4*	Writing a plugin that loads quickly	*write-plugin-quickload*
-
-A plugin may grow and become quite long.  The startup delay may become
-noticeable, while you hardly ever use the plugin.  Then it's time for a
-quickload plugin.
-
-The basic idea is that the plugin is loaded twice.  The first time user
-commands and mappings are defined that offer the functionality.  The second
-time the functions that implement the functionality are defined.
-
-It may sound surprising that quickload means loading a script twice.  What we
-mean is that it loads quickly the first time, postponing the bulk of the
-script to the second time, which only happens when you actually use it.  When
-you always use the functionality it actually gets slower!
-
-This uses a FuncUndefined autocommand.  Since Vim 7 there is an alternative:
-use the |autoload| functionality |51.5|.  That will also use |Vim9| script
-instead of legacy script that is used here.
-
-The following example shows how it's done: >
-
-	" Vim global plugin for demonstrating quick loading
-	" Last Change:	2005 Feb 25
-	" Maintainer:	Bram Moolenaar <Bram@vim.org>
-	" License:	This file is placed in the public domain.
-
-	if !exists("s:did_load")
-		command -nargs=* BNRead  call BufNetRead(<f-args>)
-		map <F19> :call BufNetWrite('something')<CR>
-
-		let s:did_load = 1
-		exe 'au FuncUndefined BufNet* source ' .. expand('<sfile>')
-		finish
-	endif
-
-	function BufNetRead(...)
-		echo 'BufNetRead(' .. string(a:000) .. ')'
-		" read functionality here
-	endfunction
-
-	function BufNetWrite(...)
-		echo 'BufNetWrite(' .. string(a:000) .. ')'
-		" write functionality here
-	endfunction
-
-When the script is first loaded "s:did_load" is not set.  The commands between
-the "if" and "endif" will be executed.  This ends in a |:finish| command, thus
-the rest of the script is not executed.
-
-The second time the script is loaded "s:did_load" exists and the commands
-after the "endif" are executed.  This defines the (possible long)
-BufNetRead() and BufNetWrite() functions.
-
-If you drop this script in your plugin directory Vim will execute it on
-startup.  This is the sequence of events that happens:
-
-1. The "BNRead" command is defined and the <F19> key is mapped when the script
-   is sourced at startup.  A |FuncUndefined| autocommand is defined.  The
-   ":finish" command causes the script to terminate early.
-
-2. The user types the BNRead command or presses the <F19> key.  The
-   BufNetRead() or BufNetWrite() function will be called.
-
-3. Vim can't find the function and triggers the |FuncUndefined| autocommand
-   event.  Since the pattern "BufNet*" matches the invoked function, the
-   command "source fname" will be executed.  "fname" will be equal to the name
-   of the script, no matter where it is located, because it comes from
-   expanding "<sfile>" (see |expand()|).
-
-4. The script is sourced again, the "s:did_load" variable exists and the
-   functions are defined.
-
-Notice that the functions that are loaded afterwards match the pattern in the
-|FuncUndefined| autocommand.  You must make sure that no other plugin defines
-functions that match this pattern.
-
-==============================================================================
-*51.5*	Writing library scripts			*write-library-script*
-
-Some functionality will be required in several places.  When this becomes more
-than a few lines you will want to put it in one script and use it from many
-scripts.  We will call that one script a library script.
-
-Manually loading a library script is possible, so long as you avoid loading it
-when it's already done.  You can do this with the |exists()| function.
-Example: >
-
-	if !exists('*MyLibFunction')
-	   runtime library/mylibscript.vim
-	endif
-	MyLibFunction(arg)
-
-Here you need to know that MyLibFunction() is defined in a script
-"library/mylibscript.vim" in one of the directories in 'runtimepath'.
-
-To make this a bit simpler Vim offers the autoload mechanism.  Then the
-example looks like this: >
-
-	mylib#myfunction(arg)
-
-That's a lot simpler, isn't it?  Vim will recognize the function name by the
-embedded "#" character and when it's not defined search for the script
-"autoload/mylib.vim" in 'runtimepath'.  That script must define the
-"mylib#myfunction()" function.
-
-You can put many other functions in the mylib.vim script, you are free to
-organize your functions in library scripts.  But you must use function names
-where the part before the '#' matches the script name.  Otherwise Vim would
-not know what script to load.
-
-If you get really enthusiastic and write lots of library scripts, you may
-want to use subdirectories.  Example: >
-
-	netlib#ftp#read('somefile')
-
-For Unix the library script used for this could be:
-
-	~/.vim/autoload/netlib/ftp.vim
-
-Where the function is defined like this: >
-
-	def netlib#ftp#read(fname: string)
-		#  Read the file fname through ftp
-	enddef
-
-Notice that the name the function is defined with is exactly the same as the
-name used for calling the function.  And the part before the last '#'
-exactly matches the subdirectory and script name.
-
-You can use the same mechanism for variables: >
-
-	var weekdays = dutch#weekdays
-
-This will load the script "autoload/dutch.vim", which should contain something
-like: >
-
-	var dutch#weekdays = ['zondag', 'maandag', 'dinsdag', 'woensdag',
-		\ 'donderdag', 'vrijdag', 'zaterdag']
-
-Further reading: |autoload|.
-
-==============================================================================
-*51.6*	Distributing Vim scripts			*distribute-script*
+*51.4*	Distributing Vim scripts			*distribute-script*
 
 Vim users will look for scripts on the Vim website: http://www.vim.org.
 If you made something that is useful for others, share it!
@@ -855,6 +689,6 @@ It's good if you add a line to allow automatic updating.  See |glvs-plugins|.
 
 ==============================================================================
 
-Next chapter: |usr_52.txt|  Write plugins using Vim9 script
+Next chapter: |usr_52.txt|  Write large plugins
 
 Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:

runtime/doc/usr_52.txt

@@ -1,25 +1,25 @@
-*usr_52.txt*	For Vim version 8.2.  Last change: 2022 May 21
+*usr_52.txt*	For Vim version 8.2.  Last change: 2022 Jun 04
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
-		       Write plugins using Vim9 script
+		       Write larger plugins
 
+When plugins do more than simple things, they tend to grow big.  This file
+explains how to make sure they still load fast and how to split them up in
+smaller parts.
 
-The Vim9 script language is used for writing plugins, especially larger ones
-that use multiple files.  This chapter explains how to split up a plugin into
-modules, import and export items and keep the rest local.
-
-|52.1|	Introduction
-|52.2|	Variable declarations
-|52.3|	Functions and types
-|52.4|	Using a Vim9 script from legacy script
+|52.1|	Export and import
+|52.2|	Autoloading
+|52.3|	Autoloading without import/export
+|52.4|	Other mechanisms to use
+|52.5|	Using a Vim9 script from legacy script
 
      Next chapter: |usr_90.txt|  Installing Vim
  Previous chapter: |usr_51.txt|  Create a plugin
 Table of contents: |usr_toc.txt|
 
 ==============================================================================
-*52.1*	Introduction				*vim9-script-intro*
+*52.1*	Export and import
 
 Vim9 script was designed to make it easier to write large Vim scripts.  It
 looks more like other script languages, especially Typescript.  Also,
@@ -27,154 +27,302 @@ functions are compiled into instructions that can be executed quickly.  This
 makes Vim9 script a lot faster, up to a 100 times.
 
 The basic idea is that a script file has items that are private, only used
-inside the script file, and items that are exported, used outside of the
-script file.  The exported items can then be used by scripts that import them.
-That makes very clear what is defined where.
+inside the script file, and items that are exported, which can be used by
+scripts that import them.  That makes very clear what is defined where.
 
 Let's start with an example, a script that exports one function and has one
 private function: >
 
-	vim9script  " This indicates a Vim9 script file.
+	vim9script
 
-	export def GetMessage(): string
-	   let result = ''
-	   ...
-	   result = GetPart(count)
-	   ...
+	export def GetMessage(count: string): string
+	   var nr = str2nr(count)
+	   var result = $'To {nr} we say '
+	   result ..= GetReply(nr)
 	   return result
 	enddef
 
-	def GetPart(nr: number): string
-	  if nr == 4
+	def GetReply(nr: number): string
+	  if nr == 42
 	     return 'yes'
+	  elseif nr = 22
+	     return 'maybe'
 	  else
 	     return 'no'
 	  endif
 	enddef
 
-The `vim9script` command must be the very first command in the file.  Without
-it Vim will assume legacy script syntax.
+The `vim9script` command is required, `export` only works in a |Vim9| script.
 
-The `export def GetMessage(): string` line starts with `export`, meaning that
-this function can be imported and called by other scripts. The line
-`def GetPart(...` does not start with `export`, this is a script-local
-function, it can only be used inside this script file.
+The `export def GetMessage(...` line starts with `export`, meaning that this
+function can be called by other scripts.  The line `def GetReply(...` does not
+start with `export`, this is a script-local function, it can only be used
+inside this script file.
 
-In the `export def GetMessage(): string` line you will notice the colon and
-the return type.  Vim9 functions, defined with `def`, require specifying the
-type of arguments and the return type.  That way Vim can compile the code
-efficiently.  The GetPart function defines an argument "nr" of type "number".
+Now about the script where this is imported.  In this example we use this
+layout, which works well for a plugin below the "pack" directory:
+	.../plugin/theplugin.vim
+	.../lib/getmessage.vim
 
-Notice that the assignment `result = GetPart(count)` does not use the `let`
-command.  That is explained in the next section.
+Assuming the "..." directory has been added to 'runtimepath', Vim will look
+for plugins in the "plugin" directory and source "theplugin.vim".  Vim does
+not recognize the "lib" directory, you can put any scripts there.
+
+The above script that exports GetMessage() goes in lib/getmessage.vim.  The
+GetMessage() function is used in plugin/theplugin.vim: >
+
+	vim9script
+
+	import "../lib/getmessage.vim"
+	command -nargs=1 ShowMessage echomsg getmessage.GetMessage(<f-args>)
+
+The `import` command uses a relative path, it starts with "../", which means
+to go one directory up.  For other kinds of paths see the `:import` command.
+
+How we can try out the command that the plugin provides: >
+	ShowMessage 1
+<	To 1 we say no ~
+>
+	ShowMessage 22
+<	To 22 we say maybe ~
+
+Notice that the function GetMessage() is prefixed with the imported script
+name "getmessage".  That way, for every imported function used, you know what
+script it was imported from.  If you import several scripts each of them could
+define a GetMessage() function: >
+
+	vim9script
+
+	import "../lib/getmessage.vim"
+	import "../lib/getother.vim"
+	command -nargs=1 ShowMessage echomsg getmessage.GetMessage(<f-args>)
+	command -nargs=1 ShowOther echomsg getother.GetMessage(<f-args>)
+
+If the imported script name is long or you use it in many places, you can
+shorten it by adding an "as" argument: >
+	import "../lib/getmessage.vim" as msg
+	command -nargs=1 ShowMessage echomsg msg.GetMessage(<f-args>)
+
+
+RELOADING
+
+One thing to keep in mind: the imported "lib/getmessage.vim" script will be
+sourced only once.  When it is imported a second time sourcing it will be
+skipped, since the items in it have already been created.  It does not matter
+if this import command is in another script, or in the same script that is
+sourced again.
+
+This is efficient when using a plugin, but when still developing a plugin it
+means that changing "lib/getmessage.vim" after it has been imported will have
+no effect.  You need to quit Vim and start it again. (Rationale: the items
+defined in the script could be used in a compiled function, sourcing the
+script again may break those functions).
+
+
+USING GLOBALS
+
+Sometimes you will want to use global variables or functions, so that they can
+be used anywhere.  A good example is a global variable that passes a
+preference to a plugin.  To avoid other scripts using the same name, use a
+prefix that is very unlikely to be used elsewhere.  For example, if you have a
+"mytags" plugin, you could use: >
+
+	g:mytags_location = '$HOME/project'
+	g:mytags_style = 'fast'
 
 ==============================================================================
-*52.2*	Variable declarations				*vim9-declarations*
+*52.2*	Autoloading
 
-In Vim9 script variables are declared once with a `:let` or `:const` command.
-Assigning a value is done without `:let` and it is not possible to `:unlet`
-the variable.
+After splitting your large script into pieces, all the lines will still be
+loaded and executed the moment the script is used.  Every `import` loads the
+imported script to find the items defined there.  Although that is good for
+finding errors early, it also takes time.  Which is wasted if the
+functionality is not often used.
 
-In most cases you will want to declare the variable and initialize it at the
-same time: >
-	let myText = 'some text'
-	...
-	myText = 'other text'
+Instead of having `import` load the script immediately, it can be postponed
+until needed.  Using the example above, only one change needs to be made in
+the plugin/theplugin.vim script: >
+	import autoload "../lib/getmessage.vim"
 
-The type of the variable will be inferred from the expression.  In this case
-it is a string.  If you initialize with a number, then the type is number: >
-	let myNumber = 1234
-	...
-	myNumber = 0
+Nothing in the rest of the script needs to change.  However, the types will
+not be checked.  Not even the existence of the GetMessage() function is
+checked until it is used.  You will have to decide what is more important for
+your script: fast startup or getting errors early.  You can also add the
+"autoload" argument later, after you have checked everything works.
 
-If you try to assign a string to this variable, you will get an error: >
-	let myNumber = 'this fails!'
 
-In the rare case you want a variable that can take values of any type, you
-have to specify the type: >
-	let myVar: any = 1234
-	myVar = 'text also works'
+AUTOLOAD DIRECTORY
 
-You can also declare a variable without assigning a value.  In that case Vim
-will initialize it to zero or empty: >
-	let word: string
-	if condition
-	  word = 'yes'
-	else
-	  word = 'no'
+Another form is to use autoload with a script name that is not an absolute or
+relative path: >
+	import autload "monthlib.vim"
+
+This will search for the script "monthlib.vim" in the autoload directories of
+'runtimepath'.  With Unix one of the directories often is "~/.vim/autoload".
+
+The main advantage of this is that this script can be easily shared with other
+scripts.  You do need to make sure that the script name is unique, since Vim
+will search all the "autoload" directories in 'runtimepath', and if you are
+using several plugins with a plugin manager, it may add a directory to
+'runtimepath', each of which might have an "autoload" directory.
+
+Without autoload: >
+	import "monthlib.vim"
+
+Vim will search for the script "monthlib.vim" in the import directories of
+'runtimepath'.  Note that in this case adding or removing "autoload" changes
+where the script is found.  With a relative or absolute path the location does
+not change.
+
+==============================================================================
+*52.3*	Autoloading without import/export
+
+						*write-library-script*
+A mechanism from before import/export is still useful and some users may find
+it a bit simpler.  The idea is that you call a function with a special name.
+That function is then in an autoload script.  We will call that one script a
+library script.
+
+The autoload mechanism is based on a function name that has "#" characters: >
+
+	mylib#myfunction(arg)
+
+Vim will recognize the function name by the embedded "#" character and when
+it is not defined yet search for the script "autoload/mylib.vim" in
+'runtimepath'.  That script must define the "mylib#myfunction()" function.
+Obviously the name "mylib" is the part before the "#" and is used as the name
+of the script, adding ".vim".
+
+You can put many other functions in the mylib.vim script, you are free to
+organize your functions in library scripts.  But you must use function names
+where the part before the '#' matches the script name.  Otherwise Vim would
+not know what script to load.  This is where it differs from the import/export
+mechanism.
+
+If you get really enthusiastic and write lots of library scripts, you may
+want to use subdirectories.  Example: >
+
+	netlib#ftp#read('somefile')
+
+Here the script name is taken from the function name up to the last "#". The
+"#" in the middle are replaced by a slash, the last one by ".vim".  Thus you
+get "netlib/ftp.vim".  For Unix the library script used for this could be:
+
+	~/.vim/autoload/netlib/ftp.vim
+
+Where the function is defined like this: >
+
+	def netlib#ftp#read(fname: string)
+		#  Read the file fname through ftp
+	enddef
+
+Notice that the name the function is defined with is exactly the same as the
+name used for calling the function.  And the part before the last '#'
+exactly matches the subdirectory and script name.
+
+You can use the same mechanism for variables: >
+
+	var weekdays = dutch#weekdays
+
+This will load the script "autoload/dutch.vim", which should contain something
+like: >
+
+	var dutch#weekdays = ['zondag', 'maandag', 'dinsdag', 'woensdag',
+		\ 'donderdag', 'vrijdag', 'zaterdag']
+
+Further reading: |autoload|.
+
+==============================================================================
+*52.4*	Other mechanisms to use
+
+Some may find the use of several files a hassle and prefer to keep everything
+together in one script.  To avoid this resulting in slow startup there is a
+mechanism that only defines a small part and postpones the rest to when it is
+actually used.  *write-plugin-quickload*
+
+The basic idea is that the plugin is loaded twice.  The first time user
+commands and mappings are defined that offer the functionality.  The second
+time the functions that implement the functionality are defined.
+
+It may sound surprising that quickload means loading a script twice.  What we
+mean is that it loads quickly the first time, postponing the bulk of the
+script to the second time, which only happens when you actually use it.  When
+you always use the functionality it actually gets slower!
+
+This uses a FuncUndefined autocommand.  This works differently from the
+|autoload| functionality explained above.
+
+The following example shows how it's done: >
+
+	" Vim global plugin for demonstrating quick loading
+	" Last Change:	2005 Feb 25
+	" Maintainer:	Bram Moolenaar <Bram@vim.org>
+	" License:	This file is placed in the public domain.
+
+	if !exists("s:did_load")
+		command -nargs=* BNRead  call BufNetRead(<f-args>)
+		map <F19> :call BufNetWrite('something')<CR>
+
+		let s:did_load = 1
+		exe 'au FuncUndefined BufNet* source ' .. expand('<sfile>')
+		finish
 	endif
 
-Although it's shorter to do: >
-	let word = condition ? 'yes' : 'no'
+	function BufNetRead(...)
+		echo 'BufNetRead(' .. string(a:000) .. ')'
+		" read functionality here
+	endfunction
+
+	function BufNetWrite(...)
+		echo 'BufNetWrite(' .. string(a:000) .. ')'
+		" write functionality here
+	endfunction
+
+When the script is first loaded "s:did_load" is not set.  The commands between
+the "if" and "endif" will be executed.  This ends in a |:finish| command, thus
+the rest of the script is not executed.
+
+The second time the script is loaded "s:did_load" exists and the commands
+after the "endif" are executed.  This defines the (possible long)
+BufNetRead() and BufNetWrite() functions.
+
+If you drop this script in your plugin directory Vim will execute it on
+startup.  This is the sequence of events that happens:
+
+1. The "BNRead" command is defined and the <F19> key is mapped when the script
+   is sourced at startup.  A |FuncUndefined| autocommand is defined.  The
+   ":finish" command causes the script to terminate early.
+
+2. The user types the BNRead command or presses the <F19> key.  The
+   BufNetRead() or BufNetWrite() function will be called.
+
+3. Vim can't find the function and triggers the |FuncUndefined| autocommand
+   event.  Since the pattern "BufNet*" matches the invoked function, the
+   command "source fname" will be executed.  "fname" will be equal to the name
+   of the script, no matter where it is located, because it comes from
+   expanding "<sfile>" (see |expand()|).
+
+4. The script is sourced again, the "s:did_load" variable exists and the
+   functions are defined.
+
+Notice that the functions that are loaded afterwards match the pattern in the
+|FuncUndefined| autocommand.  You must make sure that no other plugin defines
+functions that match this pattern.
 
 ==============================================================================
-*52.3*	Functions and types
-
-Legacy Vim script only checks types at runtime, when the code is executed.
-And it's permissive, often a computation gives an unexpected value instead of
-reporting an error.  Thus you can define a function and think it's fine, but
-notice a problem only later when the function is called: >
-	func Concatenate(base, add)
-	   return a:base + a:add
-	endfunc
-
-Can you spot the error?  Try this: >
-	echo Concatenate('base', 'text')
-And you'll see zero.  Why?  Because in legacy Vim script "+" will convert the
-arguments to numbers, and any string without a number results in zero!  That's
-not what you expected.
-
-With `:def` the type checking happens when compiling the function.  You need
-to specify the argument types and the return type to make that possible.  Also
-notice that the argument names are used without the "a:" prefix: >
-	def Concatenate(base: string, add: string): string
-	   return base + add
-	enddef
-	defcompile Concatenate
-
-Here we use `:defcompile` to do the compilation right away, without it the
-compilation would happen when the function is first called.  Vim will tell you
-what you did wrong: >
-	E1051: Wrong argument type for +
-
-Side note: here the context is legacy script.  When using Vim9 script you
-would put `:defcompile` at the end of the script to check for errors in all
-the functions defined in it.
-
-Vim9 script is strict, it uses the "+" operator only for numbers and floats.
-For string concatenation ".." must be used.  This avoids mistakes and avoids
-the automatic conversion that gave a surprising result above.  So you change
-the first line of the function to: >
-	   s:collected ..= add
-And now it works.
-
-If the function does not return anything, just leave out the return type: >
-	def ReportResult(result: string)
-	   echo 'The result is: ' .. result
-	enddef
-
-This is also checked, if you try to return a value you'll get an error.
-
-In case you don't care about types or have a function that does work with
-multiple types, you can use the "any" type: >
-	def Store(key: string, value: any)
-	  resultDict[key] = value
-	enddef
-
-==============================================================================
-*52.4*	Using a Vim9 script from legacy script		*source-vim9-script*
+*52.5*	Using a Vim9 script from legacy script		*source-vim9-script*
 
 In some cases you have a legacy Vim script where you want to use items from a
 Vim9 script.  For example in your .vimrc you want to initialize a plugin.  The
 best way to do this is to use `:import`.  For example: >
 
-	import Init as NiceInit from 'myNicePlugin.vim'
-	call NiceInit('today')
+	import 'myNicePlugin.vim'
+	call myNicePlugin.NiceInit('today')
 
-This finds the exported function "Init" in the Vim9 script file and makes it
-available as script-local item "NiceInit". `:import` always uses the script
-namespace, even when "s:" is not given.  If "myNicePlugin.vim" was already
-sourced it is not sourced again.
+This finds the exported function "NiceInit" in the Vim9 script file and makes
+it available as script-local item "myNicePlugin.NiceInit". `:import` always
+uses the script namespace, even when "s:" is not given.  If "myNicePlugin.vim"
+was already sourced it is not sourced again.
 
 Besides avoiding putting any items in the global namespace (where name clashes
 can cause unexpected errors), this also means the script is sourced only once,
@@ -190,4 +338,5 @@ will have to make sure to use a unique name for these global items. Example: >
 
 Next chapter: |usr_90.txt|  Installing Vim
 
+
 Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:

runtime/doc/usr_toc.txt

@@ -1,4 +1,4 @@
-*usr_toc.txt*	For Vim version 8.2.  Last change: 2022 May 13
+*usr_toc.txt*	For Vim version 8.2.  Last change: 2022 Jun 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -46,8 +46,8 @@ Tuning Vim ~
 
 Writing Vim script ~
 |usr_50.txt|  Advanced Vim script writing
-|usr_51.txt|  Create a plugin
-|usr_52.txt|  Write plugins using Vim9 script
+|usr_51.txt|  Write plugins
+|usr_52.txt|  Write larger plugins
 
 Making Vim Run ~
 |usr_90.txt|  Installing Vim
@@ -304,8 +304,10 @@ Make Vim work as you like it.
 		|41.6|	Using functions
 		|41.7|	Defining a function
 		|41.8|	Lists and Dictionaries
-		|41.9|	Exceptions
-		|41.10|	Various remarks
+		|41.9|	White space
+		|41.10|	Line continuation
+		|41.11|	Comments
+		|41.12|	Fileformat
 
 |usr_42.txt|  Add new menus
 		|42.1|	Introduction
@@ -341,21 +343,23 @@ Make Vim work as you like it.
 ==============================================================================
 Writing Vim script ~
 
-|usr_50.txt|  TODO
+|usr_50.txt|  Advanced Vim script writing
+		|50.1|	Exceptions
+		|50.2|    Function with variable number of arguments
+		|50.3|	Restoring the view
 
 |usr_51.txt|  Write plugins
 		|51.1|	Writing a generic plugin
 		|51.2|	Writing a filetype plugin
 		|51.3|	Writing a compiler plugin
-		|51.4|	Writing a plugin that loads quickly
-		|51.5|	Writing library scripts
-		|51.6|	Distributing Vim scripts
+		|51.4|	Distributing Vim scripts
 
-|usr_52.txt|  Write plugins using Vim9 script
-		|52.1|	Introduction
-		|52.2|	Variable declarations
-		|52.3|	Functions and types
-		|52.4|	Using a Vim9 script from legacy script
+|usr_52.txt|  Write larger plugins
+		|52.1|	Export and import
+		|52.2|	Autoloading
+		|52.3|	Autoloading without import/export
+		|52.4|	Other mechanisms to use
+		|52.5|	Using a Vim9 script from legacy script
 
 ==============================================================================
 Making Vim Run ~

runtime/doc/version5.txt

@@ -3262,7 +3262,7 @@ Files can be encrypted when writing and decrypted when reading.  Added the
 on patch from Mohsin Ahmed)
 
 When reading a file, there is an automatic detection whether it has been
-crypted.  Vim will then prompt for the key.
+encrypted.  Vim will then prompt for the key.
 
 Note that the encryption method is not compatible with Vi.  The encryption is
 not unbreakable.  This allows it to be exported from the US.
@@ -7622,7 +7622,7 @@ argument was fixed.
 Previously released patches for Vim 5.7:
 
 Patch 5.7.001
-Problem:    When the current buffer is crypted, and another modified buffer
+Problem:    When the current buffer is encrypted, and another modified buffer
 	    isn't, ":wall" will encrypt the other buffer.
 Solution:   In buf_write() use "buf" instead of "curbuf" to check for the
 	    crypt key.

runtime/doc/vim9.txt

@@ -1,4 +1,4 @@
-*vim9.txt*	For Vim version 8.2.  Last change: 2022 May 21
+*vim9.txt*	For Vim version 8.2.  Last change: 2022 Jun 20
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -86,7 +86,7 @@ script and `:def` functions; details are below:
 	var count = 0
 	count += 3
 - Constants can be declared with `:final` and `:const`: >
-	final matches = []		  # add matches
+	final matches = []		  # add to the list later
 	const names = ['Betty', 'Peter']  # cannot be changed
 - `:final` cannot be used as an abbreviation of `:finally`.
 - Variables and functions are script-local by default.
@@ -177,12 +177,12 @@ created yet.  In this case you can call `execute()` to invoke it at runtime. >
 `:def` has no options like `:function` does: "range", "abort", "dict" or
 "closure".  A `:def` function always aborts on an error (unless `:silent!` was
 used for the command or the error was caught a `:try` block), does not get a
-range passed cannot be a "dict" function, and can always be a closure.
+range passed, cannot be a "dict" function, and can always be a closure.
 						*vim9-no-dict-function*
 Later classes will be added, which replaces the "dict function" mechanism.
 For now you will need to pass the dictionary explicitly: >
-	def DictFunc(d: dict<any>, arg: string)
-	   echo d[arg]
+	def DictFunc(self: dict<any>, arg: string)
+	   echo self[arg]
 	enddef
 	var ad = {item: 'value', func: DictFunc}
 	ad.func(ad, 'item')
@@ -223,7 +223,7 @@ The argument "_" (an underscore) can be used to ignore the argument.  This is
 most useful in callbacks where you don't need it, but do need to give an
 argument to match the call.  E.g. when using map() two arguments are passed,
 the key and the value, to ignore the key: >
-	map(myList, (_, v) => v * 2)
+	map(numberList, (_, v) => v * 2)
 There is no error for using the "_" argument multiple times.  No type needs to
 be given.
 
@@ -234,7 +234,7 @@ When using `:function` or `:def` to specify a new function at the script level
 in a Vim9 script, the function is local to the script.  Like prefixing "s:" in
 legacy script.  To define a global function or variable the "g:" prefix must
 be used.  For functions in a script that is to be imported and in an autoload
-script "export" needs to be used. >
+script "export" needs to be used for those to be used elsewhere. >
 	def ThisFunction()          # script-local
 	def g:ThatFunction()        # global
 	export def Function()       # for import and import autoload
@@ -250,13 +250,20 @@ argument, pass the function reference itself: >
 	  var Fok = function(Inner)     # OK
 	  var Fbad = function('Inner')  # does not work
 
-It is not possible to define a script-local function.  It is possible to
-define a global function by using the "g:" prefix.
+Detail: this is because "Inner" will actually become a function reference to a
+function with a generated name.
+
+It is not possible to define a script-local function in a function.  You can
+define a local function and assign it to a script-local funcref (it must have
+been declared at the script level).  It is possible to define a global
+function by using the "g:" prefix.
 
 When referring to a function and no "s:" or "g:" prefix is used, Vim will
 search for the function:
 - in the function scope, in block scopes
-- in the script scope, possibly imported
+- in the script scope
+
+Imported functions are found with the prefix from the `:import` command.
 
 Since a script-local function reference can be used without "s:" the name must
 start with an upper case letter even when using the "s:" prefix.  In legacy
@@ -272,6 +279,7 @@ variables and functions in a legacy script do use "s:", while in a Vim9 script
 they do not use "s:".  This matches what you see in the rest of the file.
 
 In legacy functions the use of "s:" for script items is required, as before.
+No matter if the script is Vim9 or legacy.
 
 In all cases the function must be defined before used.  That is when it is
 called, when `:defcompile` causes it to be compiled, or when code that calls
@@ -279,11 +287,13 @@ it is being compiled (to figure out the return type).
 
 The result is that functions and variables without a namespace can usually be
 found in the script, either defined there or imported.  Global functions and
-variables could be defined anywhere (good luck finding out where!).
+variables could be defined anywhere (good luck finding out where!  You can
+often see where it was last set using |:verbose|).
 							*E1102*
 Global functions can still be defined and deleted at nearly any time.  In
 Vim9 script script-local functions are defined once when the script is sourced
-and cannot be deleted or replaced.
+and cannot be deleted or replaced by itself (it can be by reloading the
+script).
 
 When compiling a function and a function call is encountered for a function
 that is not (yet) defined, the |FuncUndefined| autocommand is not triggered.
@@ -350,6 +360,13 @@ The declaration must be done earlier: >
 	   inner = 0
 	endif
 	echo inner
+
+Although this is shorter and faster for simple values: >
+	var inner = 0
+	if cond
+	   inner = 5
+	endif
+	echo inner
 <							*E1025* *E1128*
 To intentionally hide a variable from code that follows, a block can be
 used: >
@@ -1595,7 +1612,7 @@ and cannot be accessed by the importing script.
 This mechanism exists for writing a script that can be sourced (imported) by
 other scripts, while making sure these other scripts only have access to what
 you want them to.  This also avoids using the global namespace, which has a
-risc of name collisions.  For example when you have two plugins with similar
+risk of name collisions.  For example when you have two plugins with similar
 functionality.
 
 You can cheat by using the global namespace explicitly.  That should be done
@@ -1741,7 +1758,9 @@ used: >
 
 When the mapping is defined "<SID>name." will be replaced with <SNR> and the
 script ID of the imported script.
-
+An even simpler solution is using |<ScriptCmd>|: >
+	noremap ,a <ScriptCmd>name.Function()<CR>
+<
 							*:import-cycle*
 The `import` commands are executed when encountered.  If script A imports
 script B, and B (directly or indirectly) imports A, this will be skipped over.
@@ -1825,13 +1844,6 @@ Or: >
 	test_override('ALL', 0)
 
 
-Import in legacy Vim script ~
-
-If an `import` statement is used in legacy Vim script, the script-local "s:"
-namespace will be used for the imported items, even when "s:" is not
-specified.
-
-
 ==============================================================================
 
 6. Future work: classes					*vim9-classes*
@@ -1945,13 +1957,14 @@ We can also remove clutter, mainly things that were done to make Vim script
 backwards compatible with the good old Vi commands.
 
 Examples:
-- Drop `:call` for calling a function and `:eval` for manipulating data.
+- Drop `:call` for calling a function and `:eval` for evaluating an
+  expression.
 - Drop using a leading backslash for line continuation, automatically figure
   out where an expression ends.
 
 However, this does require that some things need to change:
 - Comments start with # instead of ", to avoid confusing them with strings.
-  This is good anyway, it is known from several popular languages.
+  This is good anyway, it is also used by several popular languages.
 - Ex command ranges need to be prefixed with a colon, to avoid confusion with
   expressions (single quote can be a string or a mark, "/" can be divide or a
   search command, etc.).
@@ -2081,12 +2094,13 @@ values are accepted:
 	false: `false`, `v:false`, `0`, `0 > 9`
 Note that the number zero is false and the number one is true.  This is more
 permissive than most other languages.  It was done because many builtin
-functions return these values.
+functions return these values, and changing that causes more problems than it
+solves.  After using this for a while it turned out to work well.
 
 If you have any type of value and want to use it as a boolean, use the `!!`
 operator:
-	true: `!!'text'`, `!![99]`, `!!{'x': 1}`, `!!99`
-	false: `!!''`, `!![]`, `!!{}`
+	true: `!!'text'`   `!![99]`   `!!{'x': 1}`   `!!99`
+	false: `!!''`   `!![]`   `!!{}`
 
 From a language like JavaScript we have this handy construct: >
 	GetName() || 'unknown'
@@ -2108,19 +2122,20 @@ In Vim9 script a mechanism very similar to the JavaScript import and export
 mechanism is supported.  It is a variant to the existing `:source` command
 that works like one would expect:
 - Instead of making everything global by default, everything is script-local,
-  unless exported.
+  some of these are exported.
 - When importing a script the symbols that are imported are explicitly listed,
   avoiding name conflicts and failures if functionality is added later.
 - The mechanism allows for writing a big, long script with a very clear API:
-  the exported function(s) and class(es).
+  the exported functions, variables and classes.
 - By using relative paths loading can be much faster for an import inside of a
   package, no need to search many directories.
-- Once an import has been used, it can be cached and loading it again can be
-  avoided.
+- Once an import has been used, its items are cached and loading it again is
+  not needed.
 - The Vim-specific use of "s:" to make things script-local can be dropped.
 
-When sourcing a Vim9 script from a legacy script, only the items defined
-globally can be used, not the exported items.  Alternatives considered:
+When sourcing a Vim9 script (from a Vim9 or legacy script), only the items
+defined globally can be used, not the exported items.  Alternatives
+considered:
 - All the exported items become available as script-local items.  This makes
   it uncontrollable what items get defined and likely soon leads to trouble.
 - Use the exported items and make them global.  Disadvantage is that it's then
@@ -2128,7 +2143,7 @@ globally can be used, not the exported items.  Alternatives considered:
 - Completely disallow sourcing a Vim9 script, require using `:import`.  That
   makes it difficult to use scripts for testing, or sourcing them from the
   command line to try them out.
-Note that you can also use `:import` in legacy Vim script, see above.
+Note that you CAN also use `:import` in legacy Vim script, see above.
 
 
 Compiling functions early ~
@@ -2146,17 +2161,17 @@ figure out their type, so that forward references are found, and only then
 execute the script and compile the functions.  This means the script has to be
 parsed twice, which is slower, and some conditions at the script level, such
 as checking if a feature is supported, are hard to use.  An attempt was made
-to see if it works, but it turned out to be impossible to make work nicely.
+to see if it works, but it turned out to be impossible to make work well.
 
 It would be possible to compile all the functions at the end of the script.
 The drawback is that if a function never gets called, the overhead of
 compiling it counts anyway.  Since startup speed is very important, in most
 cases it's better to do it later and accept that syntax and type errors are
 only reported then.  In case these errors should be found early, e.g. when
-testing, the `:defcompile` command will help out.
+testing, a `:defcompile` command at the end of the script will help out.
 
 
-Why not use an embedded language? ~
+Why not use an existing embedded language? ~
 
 Vim supports interfaces to Perl, Python, Lua, Tcl and a few others.  But
 these interfaces have never become widely used, for various reasons.  When
@@ -2165,8 +2180,8 @@ and concentrate on Vim script.
 
 Still, plugin writers may find other languages more familiar, want to use
 existing libraries or see a performance benefit.  We encourage plugin authors
-to write code in any language and run it as an external tool, using jobs and
-channels.  We can try to make this easier somehow.
+to write code in any language and run it as an external process, using jobs
+and channels.  We can try to make this easier somehow.
 
 Using an external tool also has disadvantages.  An alternative is to convert
 the tool into Vim script.  For that to be possible without too much
@@ -2182,9 +2197,10 @@ dictionary.  With some care this can be made to work, but it does not look
 like real classes.  On top of that, it's quite slow, because of the use of
 dictionaries.
 
-The support of classes in Vim9 script is a "minimal common functionality" of
-class support in most languages.  It works much like Java, which is the most
-popular programming language.
+It would be good to support real classes, and this is planned for a later
+version.  The support is a "minimal common functionality" of class support in
+most languages.  It will work much like Java, which is the most popular
+programming language.
 
 
 

runtime/doc/visual.txt

@@ -1,4 +1,4 @@
-*visual.txt*    For Vim version 8.2.  Last change: 2022 May 06
+*visual.txt*    For Vim version 8.2.  Last change: 2022 Jun 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -509,6 +509,13 @@ work both in Visual mode and in Select mode.  When these are used in Select
 mode Vim automatically switches to Visual mode, so that the same behavior as
 in Visual mode is effective.  If you don't want this use |:xmap| or |:smap|.
 
+One particular edge case: >
+  	:vnoremap <C-K> <Esc>
+This ends Visual mode when in Visual mode, but in Select mode it does not
+work, because Select mode is restored after executing the mapped keys.  You
+need to use: >
+  	:snoremap <C-K> <Esc>
+<
 Users will expect printable characters to replace the selected area.
 Therefore avoid mapping printable characters in Select mode.  Or use
 |:sunmap|  after |:map| and |:vmap| to remove it for Select mode.

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Apr 25
+" Last Change:	2022 Jun 03
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -409,7 +409,7 @@ au BufNewFile,BufRead *.cu,*.cuh		setf cuda
 
 " Dockerfile; Podman uses the same syntax with name Containerfile
 " Also see Dockerfile.* below.
-au BufNewFile,BufRead Containerfile,Dockerfile,*.Dockerfile	setf dockerfile
+au BufNewFile,BufRead Containerfile,Dockerfile,dockerfile,*.[dD]ockerfile	setf dockerfile
 
 " WildPackets EtherPeek Decoder
 au BufNewFile,BufRead *.dcd			setf dcd
@@ -819,6 +819,9 @@ au BufNewFile,BufRead *.hjson			setf hjson
 " Hollywood
 au BufRead,BufNewFile *.hws			setf hollywood
 
+" Hoon
+au BufRead,BufNewFile *.hoon			setf hoon
+
 " Tilde (must be before HTML)
 au BufNewFile,BufRead *.t.html			setf tilde
 
@@ -1172,6 +1175,9 @@ au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc	setf monk
 " MOO
 au BufNewFile,BufRead *.moo			setf moo
 
+" Moonscript
+au BufNewFile,BufRead *.moon			setf moonscript
+
 " Modconf
 au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf modconf
 
@@ -1284,25 +1290,25 @@ au BufNewFile,BufRead opam,*.opam,*.opam.template setf opam
 au BufNewFile,BufRead [a-zA-Z0-9]*Dict\(.*\)\=,[a-zA-Z]*Properties\(.*\)\=,*Transport\(.*\),fvSchemes,fvSolution,fvConstrains,fvModels,*/constant/g,*/0\(\.orig\)\=/* call dist#ft#FTfoam()
 
 " OpenROAD
-au BufNewFile,BufRead *.or			setf openroad
+au BufNewFile,BufRead *.or				setf openroad
 
 " OPL
-au BufNewFile,BufRead *.[Oo][Pp][Ll]		setf opl
+au BufNewFile,BufRead *.[Oo][Pp][Ll]			setf opl
 
 " OpenSCAD
-au BufNewFile,BufRead *.scad		setf openscad		
+au BufNewFile,BufRead *.scad				setf openscad		
 
 " Oracle config file
-au BufNewFile,BufRead *.ora			setf ora
+au BufNewFile,BufRead *.ora				setf ora
 
 " Org
-au BufNewFile,BufRead *.org,*.org_archive	setf org
+au BufNewFile,BufRead *.org,*.org_archive		setf org
 
 " Packet filter conf
-au BufNewFile,BufRead pf.conf			setf pf
+au BufNewFile,BufRead pf.conf				setf pf
 
-" Pacman config
-au BufNewFile,BufRead */etc/pacman.conf		setf conf
+" ini style config files, using # comments
+au BufNewFile,BufRead */etc/pacman.conf,mpv.conf	setf confini
 
 " Pacman hooks
 au BufNewFile,BufRead *.hook
@@ -1317,36 +1323,36 @@ au BufNewFile,BufRead */etc/pam.conf			setf pamconf
 au BufNewFile,BufRead pam_env.conf,.pam_environment	setf pamenv
 
 " PApp
-au BufNewFile,BufRead *.papp,*.pxml,*.pxsl	setf papp
+au BufNewFile,BufRead *.papp,*.pxml,*.pxsl		setf papp
 
 " Password file
 au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
 
 " Pascal (also *.p, *.pp, *.inc)
-au BufNewFile,BufRead *.pas			setf pascal
+au BufNewFile,BufRead *.pas				setf pascal
 
 " Pascal or Puppet manifest
-au BufNewFile,BufRead *.pp			call dist#ft#FTpp()
+au BufNewFile,BufRead *.pp				call dist#ft#FTpp()
 
 " Delphi or Lazarus program file
-au BufNewFile,BufRead *.dpr,*.lpr		setf pascal
+au BufNewFile,BufRead *.dpr,*.lpr			setf pascal
 
 " Free Pascal makefile definition file
-au BufNewFile,BufRead *.fpc			setf fpcmake
+au BufNewFile,BufRead *.fpc				setf fpcmake
 
 " PDF
-au BufNewFile,BufRead *.pdf			setf pdf
+au BufNewFile,BufRead *.pdf				setf pdf
 
 " PCMK - HAE - crm configure edit
-au BufNewFile,BufRead *.pcmk			setf pcmk
+au BufNewFile,BufRead *.pcmk				setf pcmk
 
 " Perl
 if has("fname_case")
-  au BufNewFile,BufRead *.pl,*.PL		call dist#ft#FTpl()
+  au BufNewFile,BufRead *.pl,*.PL			call dist#ft#FTpl()
 else
-  au BufNewFile,BufRead *.pl			call dist#ft#FTpl()
+  au BufNewFile,BufRead *.pl				call dist#ft#FTpl()
 endif
-au BufNewFile,BufRead *.plx,*.al,*.psgi		setf perl
+au BufNewFile,BufRead *.plx,*.al,*.psgi			setf perl
 
 " Perl, XPM or XPM2
 au BufNewFile,BufRead *.pm

runtime/ftplugin/confini.vim

@@ -0,0 +1,10 @@
+" Vim filetype plugin file
+" Language: confini
+
+" Quit if a ftplugin file was already loaded
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Use the cfg plugin, it's similar enough.
+runtime! ftplugin/cfg.vim

runtime/ftplugin/cs.vim

@@ -1,29 +1,43 @@
 " Vim filetype plugin file
-" Language:	C#
-" Maintainer:	Johannes Zellner <johannes@zellner.org>
-" Last Change:	Tue, 09 Mar 2004 14:09:33 CET
+" Language:            C#
+" Maintainer:          Nick Jensen <nickspoon@gmail.com>
+" Former Maintainer:   Johannes Zellner <johannes@zellner.org>
+" Last Change:         2021-12-07
+" License:             Vim (see :h license)
+" Repository:          https://github.com/nickspoons/vim-cs
 
-" Only do this when not done yet for this buffer
-if exists("b:did_ftplugin")
+if exists('b:did_ftplugin')
   finish
 endif
-
-" Don't load another plugin for this buffer
 let b:did_ftplugin = 1
-let s:keepcpo= &cpo
-set cpo&vim
+
+let s:save_cpo = &cpoptions
+set cpoptions&vim
 
 " Set 'formatoptions' to break comment lines but not other lines,
 " and insert the comment leader when hitting <CR> or using "o".
-setlocal fo-=t fo+=croql
+setlocal formatoptions-=t formatoptions+=croql
 
 " Set 'comments' to format dashed lists in comments.
 setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:///,://
 
-if has("gui_win32") && !exists("b:browsefilter")
-    let b:browsefilter = "C# Source Files (*.cs)\t*.cs\n" .
-		       \ "All Files (*.*)\t*.*\n"
+let b:undo_ftplugin = 'setl com< fo<'
+
+if exists('loaded_matchit') && !exists('b:match_words')
+  " #if/#endif support included by default
+  let b:match_words = '\%(^\s*\)\@<=#\s*region\>:\%(^\s*\)\@<=#\s*endregion\>,'
+  let b:undo_ftplugin .= ' | unlet! b:match_words'
 endif
 
-let &cpo = s:keepcpo
-unlet s:keepcpo
+if (has('gui_win32') || has('gui_gtk')) && !exists('b:browsefilter')
+  let b:browsefilter = "C# Source Files (*.cs *.csx)\t*.cs;*.csx\n" .
+        \              "C# Project Files (*.csproj)\t*.csproj\n" .
+        \              "Visual Studio Solution Files (*.sln)\t*.sln\n" .
+        \              "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin .= ' | unlet! b:browsefilter'
+endif
+
+let &cpoptions = s:save_cpo
+unlet s:save_cpo
+
+" vim:et:sw=2:sts=2

runtime/ftplugin/fortran.vim

@@ -1,6 +1,6 @@
 " Vim settings file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66)
-" Version:	(v53) 2021 April 06
+" Version:	(v53) 2021 April 06 (updated 2022 May 22)
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-plugin from Vim
 " Credits:
@@ -105,12 +105,13 @@ if !exists("b:match_words")
   let s:notselect = '\%(\<select\s\+\)\@<!'
   let s:notelse = '\%(\<end\s\+\|\<else\s\+\)\@<!'
   let s:notprocedure = '\%(\s\+procedure\>\)\@!'
+  let s:nothash = '\%(^\s*#\s*\)\@<!'
   let b:match_ignorecase = 1
   let b:match_words =
     \ '(:),' .
     \ '\<select\s*case\>:' . s:notselect. '\<case\>:\<end\s*select\>,' .
     \ s:notelse . '\<if\s*(.\+)\s*then\>:' .
-    \ '\<else\s*\%(if\s*(.\+)\s*then\)\=\>:\<end\s*if\>,'.
+    \ s:nothash . '\<else\s*\%(if\s*(.\+)\s*then\)\=\>:' . s:nothash . '\<end\s*if\>,'.
     \ 'do\s\+\(\d\+\):\%(^\s*\)\@<=\1\s,'.
     \ s:notend . '\<do\>:\<end\s*do\>,'.
     \ s:notelse . '\<where\>:\<elsewhere\>:\<end\s*where\>,'.
@@ -122,7 +123,8 @@ if !exists("b:match_words")
     \ s:notend . '\<subroutine\>:\<end\s*subroutine\>,'.
     \ s:notend . '\<function\>:\<end\s*function\>,'.
     \ s:notend . '\<module\>' . s:notprocedure . ':\<end\s*module\>,'.
-    \ s:notend . '\<program\>:\<end\s*program\>'
+    \ s:notend . '\<program\>:\<end\s*program\>,'.
+    \ '\%(^\s*\)\@<=#\s*if\%(def\|ndef\)\=\>:\%(^\s*\)\@<=#\s*\%(elif\|else\)\>:\%(^\s*\)\@<=#\s*endif\>'
 endif
 
 " File filters for :browse e

runtime/ftplugin/icon.vim

@@ -0,0 +1,36 @@
+" Vim filetype plugin file
+" Language:	Icon
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2022 Jun 16
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=:#
+setlocal commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let b:undo_ftplugin = "setl fo< com< cms<"
+
+if exists("loaded_matchit")
+    " let b:match_ignorecase = 0
+    let b:match_words  = '^\s*$\s*if\(def\|ndef\)\=\>:^\s*$\s*elif\>:^\s*$\s*else\>:^\s*$\s*endif\>,' .
+	  \		 '\<procedure\>:\<\%(initial\|return\|suspend\|fail\)\>:\<end\>'
+    let b:undo_ftplugin ..= " | unlet! b:match_words"
+endif
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Icon Source Files (*.icn)\t*.icn\n" .
+	\	       "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8

runtime/ftplugin/m3build.vim

@@ -1,21 +1,20 @@
 " Vim filetype plugin file
 " Language:	Modula-3 Makefile
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2021 April 15
+" Last Change:	2022 June 12
 
 if exists("b:did_ftplugin")
   finish
 endif
-let b:did_ftplugin = 1
 
 let s:cpo_save = &cpo
 set cpo&vim
 
 runtime! ftplugin/m3quake.vim
 
-if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "Modula-3 Makefile (m3makefile m3overrides)\tm3makefile;m3overrides\n" ..
-	\	       "All Files (*.*)\t*.*\n"
+if (has("gui_win32") || has("gui_gtk")) && exists("b:m3quake_set_browsefilter")
+    let b:browsefilter = "Modula-3 Makefile (m3makefile m3overrides)\tm3makefile;m3overrides\n" ..
+	  \		 "All Files (*.*)\t*.*\n"
 endif
 
 let &cpo = s:cpo_save

runtime/ftplugin/m3quake.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	Modula-3 Quake
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2021 April 15
+" Last Change:	2022 June 12
 
 if exists("b:did_ftplugin")
   finish
@@ -15,18 +15,20 @@ setlocal comments=s1:/*,mb:*,ex:*/,:%
 setlocal commentstring=%\ %s
 setlocal formatoptions-=t formatoptions+=croql
 
+let b:undo_ftplugin = "setl fo< com< cms<"
+
 if exists("loaded_matchit") && !exists("b:match_words")
   let b:match_words = '\<\%(proc\|if\|foreach\)\>:\<else\>:\<end\>'
+  let b:undo_ftplugin ..= " | unlet! b:match_words"
 endif
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "Modula-3 Quake Source Files (*.quake)\t*.quake\n" ..
 	\	       "All Files (*.*)\t*.*\n"
+  let b:m3quake_set_browsefilter = 1
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter b:m3quake_set_browsefilter"
 endif
 
-let b:undo_ftplugin = "setl fo< com< cms< " ..
-      \		      "| unlet! b:browsefilter b:match_words"
-
 let &cpo = s:cpo_save
 unlet s:cpo_save
 

runtime/ftplugin/man.vim

@@ -2,12 +2,14 @@
 " Language:	man
 " Maintainer:	Jason Franklin <vim@justemail.net>
 " Maintainer:	SungHyun Nam <goweol@gmail.com>
-" Last Change: 	2021 Sep 26
+" Autoload Split: Bram Moolenaar
+" Last Change: 	2022 Jun 18
 
 " To make the ":Man" command available before editing a manual page, source
 " this script from your startup vimrc file.
 
-" If 'filetype' isn't "man", we must have been called to only define ":Man".
+" If 'filetype' isn't "man", we must have been called to define ":Man" and not
+" to do the filetype plugin stuff.
 if &filetype == "man"
 
   " Only do this when not done yet for this buffer
@@ -34,8 +36,8 @@ if &filetype == "man"
     endif
     nnoremap <buffer> <Plug>ManBS :%s/.\b//g<CR>:setl nomod<CR>''
 
-    nnoremap <buffer> <silent> <c-]> :call <SID>PreGetPage(v:count)<CR>
-    nnoremap <buffer> <silent> <c-t> :call <SID>PopPage()<CR>
+    nnoremap <buffer> <silent> <c-]> :call dist#man#PreGetPage(v:count)<CR>
+    nnoremap <buffer> <silent> <c-t> :call dist#man#PopPage()<CR>
     nnoremap <buffer> <silent> q :q<CR>
 
     " Add undo commands for the maps
@@ -55,196 +57,9 @@ if &filetype == "man"
 endif
 
 if exists(":Man") != 2
-  com -nargs=+ -complete=shellcmd Man call s:GetPage(<q-mods>, <f-args>)
-  nmap <Leader>K :call <SID>PreGetPage(0)<CR>
-  nmap <Plug>ManPreGetPage :call <SID>PreGetPage(0)<CR>
-endif
-
-" Define functions only once.
-if !exists("s:man_tag_depth")
-
-let s:man_tag_depth = 0
-
-let s:man_sect_arg = ""
-let s:man_find_arg = "-w"
-try
-  if !has("win32") && $OSTYPE !~ 'cygwin\|linux' && system('uname -s') =~ "SunOS" && system('uname -r') =~ "^5"
-    let s:man_sect_arg = "-s"
-    let s:man_find_arg = "-l"
-  endif
-catch /E145:/
-  " Ignore the error in restricted mode
-endtry
-
-func s:PreGetPage(cnt)
-  if a:cnt == 0
-    let old_isk = &iskeyword
-    if &ft == 'man'
-      setl iskeyword+=(,)
-    endif
-    let str = expand("<cword>")
-    let &l:iskeyword = old_isk
-    let page = substitute(str, '(*\(\k\+\).*', '\1', '')
-    let sect = substitute(str, '\(\k\+\)(\([^()]*\)).*', '\2', '')
-    if match(sect, '^[0-9 ]\+$') == -1
-      let sect = ""
-    endif
-    if sect == page
-      let sect = ""
-    endif
-  else
-    let sect = a:cnt
-    let page = expand("<cword>")
-  endif
-  call s:GetPage('', sect, page)
-endfunc
-
-func s:GetCmdArg(sect, page)
-
-  if empty(a:sect)
-    return shellescape(a:page)
-  endif
-
-  return s:man_sect_arg . ' ' . shellescape(a:sect) . ' ' . shellescape(a:page)
-endfunc
-
-func s:FindPage(sect, page)
-  let l:cmd = printf('man %s %s', s:man_find_arg, s:GetCmdArg(a:sect, a:page))
-  call system(l:cmd)
-
-  if v:shell_error
-    return 0
-  endif
-
-  return 1
-endfunc
-
-func s:GetPage(cmdmods, ...)
-  if a:0 >= 2
-    let sect = a:1
-    let page = a:2
-  elseif a:0 >= 1
-    let sect = ""
-    let page = a:1
-  else
-    return
-  endif
-
-  " To support:	    nmap K :Man <cword>
-  if page == '<cword>'
-    let page = expand('<cword>')
-  endif
-
-  if !exists('g:ft_man_no_sect_fallback') || (g:ft_man_no_sect_fallback == 0)
-    if sect != "" && s:FindPage(sect, page) == 0
-      let sect = ""
-    endif
-  endif
-  if s:FindPage(sect, page) == 0
-    let msg = 'man.vim: no manual entry for "' . page . '"'
-    if !empty(sect)
-      let msg .= ' in section ' . sect
-    endif
-    echomsg msg
-    return
-  endif
-  exec "let s:man_tag_buf_".s:man_tag_depth." = ".bufnr("%")
-  exec "let s:man_tag_lin_".s:man_tag_depth." = ".line(".")
-  exec "let s:man_tag_col_".s:man_tag_depth." = ".col(".")
-  let s:man_tag_depth = s:man_tag_depth + 1
-
-  let open_cmd = 'edit'
-
-  " Use an existing "man" window if it exists, otherwise open a new one.
-  if &filetype != "man"
-    let thiswin = winnr()
-    exe "norm! \<C-W>b"
-    if winnr() > 1
-      exe "norm! " . thiswin . "\<C-W>w"
-      while 1
-	if &filetype == "man"
-	  break
-	endif
-	exe "norm! \<C-W>w"
-	if thiswin == winnr()
-	  break
-	endif
-      endwhile
-    endif
-    if &filetype != "man"
-      if exists("g:ft_man_open_mode")
-        if g:ft_man_open_mode == 'vert'
-	  let open_cmd = 'vsplit'
-        elseif g:ft_man_open_mode == 'tab'
-	  let open_cmd = 'tabedit'
-        else
-	  let open_cmd = 'split'
-        endif
-      else
-	let open_cmd = a:cmdmods . ' split'
-      endif
-    endif
-  endif
-
-  silent execute open_cmd . " $HOME/" . page . '.' . sect . '~'
-
-  " Avoid warning for editing the dummy file twice
-  setl buftype=nofile noswapfile
-
-  setl fdc=0 ma nofen nonu nornu
-  %delete _
-  let unsetwidth = 0
-  if empty($MANWIDTH)
-    let $MANWIDTH = winwidth(0)
-    let unsetwidth = 1
-  endif
-
-  " Ensure Vim is not recursively invoked (man-db does this) when doing ctrl-[
-  " on a man page reference by unsetting MANPAGER.
-  " Some versions of env(1) do not support the '-u' option, and in such case
-  " we set MANPAGER=cat.
-  if !exists('s:env_has_u')
-    call system('env -u x true')
-    let s:env_has_u = (v:shell_error == 0)
-  endif
-  let env_cmd = s:env_has_u ? 'env -u MANPAGER' : 'env MANPAGER=cat'
-  let env_cmd .= ' GROFF_NO_SGR=1'
-  let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page) . ' | col -b'
-  silent exec "r !" . man_cmd
-
-  if unsetwidth
-    let $MANWIDTH = ''
-  endif
-  " Remove blank lines from top and bottom.
-  while line('$') > 1 && getline(1) =~ '^\s*$'
-    1delete _
-  endwhile
-  while line('$') > 1 && getline('$') =~ '^\s*$'
-    $delete _
-  endwhile
-  1
-  setl ft=man nomod
-  setl bufhidden=hide
-  setl nobuflisted
-  setl noma
-endfunc
-
-func s:PopPage()
-  if s:man_tag_depth > 0
-    let s:man_tag_depth = s:man_tag_depth - 1
-    exec "let s:man_tag_buf=s:man_tag_buf_".s:man_tag_depth
-    exec "let s:man_tag_lin=s:man_tag_lin_".s:man_tag_depth
-    exec "let s:man_tag_col=s:man_tag_col_".s:man_tag_depth
-    exec s:man_tag_buf."b"
-    exec s:man_tag_lin
-    exec "norm! ".s:man_tag_col."|"
-    exec "unlet s:man_tag_buf_".s:man_tag_depth
-    exec "unlet s:man_tag_lin_".s:man_tag_depth
-    exec "unlet s:man_tag_col_".s:man_tag_depth
-    unlet s:man_tag_buf s:man_tag_lin s:man_tag_col
-  endif
-endfunc
-
+  com -nargs=+ -complete=shellcmd Man call dist#man#GetPage(<q-mods>, <f-args>)
+  nmap <Leader>K :call dist#man#PreGetPage(0)<CR>
+  nmap <Plug>ManPreGetPage :call dist#man#PreGetPage(0)<CR>
 endif
 
 let &cpo = s:cpo_save

runtime/ftplugin/modula3.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	Modula-3
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2021 Apr 08
+" Last Change:	2022 June 12 
 
 if exists("b:did_ftplugin")
   finish
@@ -14,24 +14,28 @@ set cpo&vim
 setlocal comments=s0:(*,mb:\ ,ex:*)
 setlocal commentstring=(*%s*)
 setlocal formatoptions-=t formatoptions+=croql
+setlocal suffixesadd+=.m3
+setlocal formatprg=m3pp
+
+let b:undo_ftplugin = "setlocal com< cms< fo< fp< sua<"
 
 if exists("loaded_matchit") && !exists("b:match_words")
   let b:match_words = '\<REPEAT\>:\<UNTIL\>,' ..
-		    \ '\<\%(BEGIN\|CASE\|FOR\|IF\|LOCK\|LOOP\|TRY\|TYPECASE\|WHILE\|WITH\)\>' ..
+		    \ '\<\%(BEGIN\|CASE\|FOR\|IF\|LOCK\|LOOP\|TRY\|TYPECASE\|WHILE\|WITH\|RECORD\|OBJECT\)\>' ..
 		    \	':' ..
-		    \	'\<\%(ELSIF\|ELSE\|EXCEPT\|FINALLY\)\>\|\%(^\s*\)\@<=\S.*=>' ..
+		    \	'\<\%(ELSIF\|ELSE\|EXCEPT\|FINALLY\|METHODS\|OVERRIDES\)\>\|\%(^\s*\)\@<=\S.*=>' ..
 		    \	':' ..
-		    \ '\<END\>'
+		    \ '\<END\>,' ..
+		    \ '(\*:\*),<\*:\*>'
+  let b:undo_ftplugin ..= " | unlet! b:match_words"
 endif
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "Modula-3 Source Files (*.m3)\t*.m3\n" ..
 		     \ "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
 
-let b:undo_ftplugin = "setl com< cms< fo< " ..
-		    \ "| unlet! b:browsefilter b:match_words"
-
 let &cpo = s:cpo_save
 unlet s:cpo_save
 

runtime/ftplugin/perl.vim

@@ -3,7 +3,8 @@
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
-" Last Change:   2020 Apr 15
+" License:       Vim License (see :help license)
+" Last Change:   2021 Nov 10
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
@@ -20,27 +21,36 @@ setlocal keywordprg=perldoc\ -f
 setlocal comments=:#
 setlocal commentstring=#%s
 
-" Change the browse dialog on Win32 to show mainly Perl-related files
-if has("gui_win32")
-    let b:browsefilter = "Perl Source Files (*.pl)\t*.pl\n" .
-		       \ "Perl Modules (*.pm)\t*.pm\n" .
-		       \ "Perl Documentation Files (*.pod)\t*.pod\n" .
-		       \ "All Files (*.*)\t*.*\n"
-endif
-
 " Provided by Ned Konz <ned at bike-nomad dot com>
 "---------------------------------------------
 setlocal include=\\<\\(use\\\|require\\)\\>
-setlocal includeexpr=substitute(substitute(substitute(v:fname,'::','/','g'),'->\*','',''),'$','.pm','')
+" '+' is removed to support plugins in Catalyst or DBIx::Class
+" where the leading plus indicates a fully-qualified module name.
+setlocal includeexpr=substitute(substitute(substitute(substitute(v:fname,'+','',''),'::','/','g'),'->\*','',''),'$','.pm','')
 setlocal define=[^A-Za-z_]
 setlocal iskeyword+=:
 
 " The following line changes a global variable but is necessary to make
 " gf and similar commands work. Thanks to Andrew Pimlott for pointing
-" out the problem. If this causes a problem for you, add an
-" after/ftplugin/perl.vim file that contains
-"       set isfname-=:
+" out the problem.
+let s:old_isfname = &isfname
 set isfname+=:
+let s:new_isfname = &isfname
+
+augroup perl_global_options
+  au!
+  exe "au BufEnter * if &filetype == 'perl' | let &isfname = '" . s:new_isfname . "' | endif"
+  exe "au BufLeave * if &filetype == 'perl' | let &isfname = '" . s:old_isfname . "' | endif"
+augroup END
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "setlocal fo< kp< com< cms< inc< inex< def< isk<" .
+      \               " | let &isfname = '" .  s:old_isfname . "'"
+
+if get(g:, 'perl_fold', 0)
+  setlocal foldmethod=syntax
+  let b:undo_ftplugin .= " | setlocal fdm<"
+endif
 
 " Set this once, globally.
 if !exists("perlpath")
@@ -74,16 +84,26 @@ if &l:path == ""
 else
     let &l:path=&l:path.",".perlpath
 endif
+
+let b:undo_ftplugin .= " | setlocal pa<"
 "---------------------------------------------
 
-" Undo the stuff we changed.
-let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isk< isf< kp< path<" .
-	    \	      " | unlet! b:browsefilter"
+" Change the browse dialog to show mainly Perl-related files
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+    let b:browsefilter = "Perl Source Files (*.pl)\t*.pl\n" .
+		       \ "Perl Modules (*.pm)\t*.pm\n" .
+		       \ "Perl Documentation Files (*.pod)\t*.pod\n" .
+		       \ "All Files (*.*)\t*.*\n"
+    let b:undo_ftplugin .= " | unlet! b:browsefilter"
+endif
 
-" proper matching for matchit plugin
-let b:match_skip = 's:comment\|string\|perlQQ\|perlShellCommand\|perlHereDoc\|perlSubstitution\|perlTranslation\|perlMatch\|perlFormatField'
-let b:match_words = '\<if\>:\<elsif\>:\<else\>'
+" Proper matching for matchit plugin
+if exists("loaded_matchit") && !exists("b:match_words")
+    let b:match_skip = 's:comment\|string\|perlQQ\|perlShellCommand\|perlHereDoc\|perlSubstitution\|perlTranslation\|perlMatch\|perlFormatField'
+    let b:match_words = '\<if\>:\<elsif\>:\<else\>'
+    let b:undo_ftplugin .= " | unlet! b:match_words b:match_skip"
+endif
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
-unlet s:save_cpo
+unlet s:save_cpo s:old_isfname s:new_isfname

runtime/ftplugin/pod.vim

@@ -0,0 +1,71 @@
+" Vim filetype plugin file
+" Language:      Perl POD format
+" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Author:        Doug Kearns <dougkearns@gmail.com>
+" Homepage:      https://github.com/vim-perl/vim-perl
+" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
+" License:       Vim License (see :help license)
+" Last Change:   2021 Oct 19
+
+if exists("b:did_ftplugin")
+    finish
+endif
+
+let s:save_cpo = &cpo
+set cpo-=C
+
+setlocal comments=fb:=for\ comment
+setlocal commentstring==for\ comment\ %s
+
+let b:undo_ftplugin = "setl com< cms<"
+
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_words =
+        \ '^=pod\>:^=cut\>,' .
+        \ '^=begin\s\+\(\S\+\):^=end\s\+\1,' .
+        \ '^=over\>:^=item\>:^=back\>,' .
+        \ '[IBCLEFSXZ]<<\%(\s\+\|$\)\@=:\%(\s\+\|^\)\@<=>>,' .
+        \ '[IBCLEFSXZ]<:>'
+  let b:undo_ftplugin .= " | unlet! b:match_words"
+endif
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "POD Source Files (*.pod)\t*.pod\n" .
+        \              "Perl Source Files (*.pl)\t*.pl\n" .
+        \              "Perl Modules (*.pm)\t*.pm\n" .
+        \              "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin .= " | unlet! b:browsefilter"
+endif
+
+function! s:jumpToSection(backwards)
+  let flags = a:backwards ? 'bsWz' : 'sWz'
+  if has('syntax_items')
+    let skip = "synIDattr(synID(line('.'), col('.'), 1), 'name') !~# '\\<podCommand\\>'"
+  else
+    let skip = ''
+  endif
+  for i in range(v:count1)
+    call search('^=\a', flags, 0, 0, skip)
+  endfor
+endfunction
+
+if !exists("no_plugin_maps") && !exists("no_pod_maps")
+  nnoremap <silent> <buffer> ]] <Cmd>call <SID>jumpToSection()<CR>
+  vnoremap <silent> <buffer> ]] <Cmd>call <SID>jumpToSection()<CR>
+  nnoremap <silent> <buffer> ][ <Cmd>call <SID>jumpToSection()<CR>
+  vnoremap <silent> <buffer> ][ <Cmd>call <SID>jumpToSection()<CR>
+  nnoremap <silent> <buffer> [[ <Cmd>call <SID>jumpToSection(1)<CR>
+  vnoremap <silent> <buffer> [[ <Cmd>call <SID>jumpToSection(1)<CR>
+  nnoremap <silent> <buffer> [] <Cmd>call <SID>jumpToSection(1)<CR>
+  vnoremap <silent> <buffer> [] <Cmd>call <SID>jumpToSection(1)<CR>
+  let b:undo_ftplugin .=
+        \ " | silent! exe 'nunmap <buffer> ]]' | silent! exe 'vunmap <buffer> ]]'" .
+        \ " | silent! exe 'nunmap <buffer> ][' | silent! exe 'vunmap <buffer> ]['" .
+        \ " | silent! exe 'nunmap <buffer> ]]' | silent! exe 'vunmap <buffer> ]]'" .
+        \ " | silent! exe 'nunmap <buffer> []' | silent! exe 'vunmap <buffer> []'"
+endif
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set expandtab:

runtime/ftplugin/tap.vim

@@ -0,0 +1,27 @@
+" Vim filetype plugin file
+" Language:      Verbose TAP Output
+" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Homepage:      https://github.com/vim-perl/vim-perl
+" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
+" License:       Vim License (see :help license)
+" Last Change:   2021 Oct 22
+
+" Only do this when not done yet for this buffer
+if exists('b:did_ftplugin')
+    finish
+endif
+let b:did_ftplugin = 1
+
+setlocal foldtext=TAPTestLine_foldtext()
+function! TAPTestLine_foldtext()
+    let line = getline(v:foldstart)
+    let sub = substitute(line, '/\*\|\*/\|{{{\d\=', '', 'g')
+    return sub
+endfunction
+
+setlocal foldminlines=5
+setlocal foldcolumn=2
+setlocal foldenable
+setlocal foldmethod=syntax
+
+let b:undo_ftplugin = 'setlocal foldtext< foldminlines< foldcolumn< foldenable< foldmethod<'

runtime/ftplugin/tt2html.vim

@@ -1,8 +1,10 @@
+" Vim filetype plugin file
 " Language:      TT2 embedded with HTML
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
-" Homepage:      http://github.com/vim-perl/vim-perl
-" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2013-07-21
+" Homepage:      https://github.com/vim-perl/vim-perl
+" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
+" License:       Vim License (see :help license)
+" Last Change:   2018 Mar 28
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")

runtime/ftplugin/xs.vim

@@ -1,9 +1,10 @@
 " Vim filetype plugin file
 " Language:      XS (Perl extension interface language)
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
-" Homepage:      http://github.com/vim-perl/vim-perl
-" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2013-07-21
+" Homepage:      https://github.com/vim-perl/vim-perl
+" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
+" License:       Vim License (see :help license)
+" Last Change:   2018 Mar 28
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")

runtime/import/dist/vimhelp.vim

@@ -4,24 +4,28 @@ vim9script
 
 # Called when editing the doc/syntax.txt file
 export def HighlightGroups()
+  var save_cursor = getcurpos()
   var buf: number = bufnr('%')
-  var lnum: number = search('\*highlight-groups\*', 'cn')
-  while getline(lnum) !~ '===' && lnum < line('$')
+
+  var start: number = search('\*highlight-groups\*', 'c')
+  var end: number = search('^======')
+  for lnum in range(start, end)
     var word: string = getline(lnum)->matchstr('^\w\+\ze\t')
     if word->hlexists()
-      var name = 'help-hl-' .. word
-      if prop_type_list({bufnr: buf})->match(name) == -1
-	prop_type_add('help-hl-' .. word, {
-	  bufnr: buf,
-	  highlight: word,
-	  combine: false,
-	  })
-      else
+      var type = 'help-hl-' .. word
+      if prop_type_list({bufnr: buf})->index(type) != -1
 	# was called before, delete existing properties
-	prop_remove({type: name, bufnr: buf})
+	prop_remove({type: type, bufnr: buf})
+	prop_type_delete(type, {bufnr: buf})
       endif
-      prop_add(lnum, 1, {length: word->strlen(), type: 'help-hl-' .. word})
+      prop_type_add(type, {
+	bufnr: buf,
+	highlight: word,
+	combine: false,
+	})
+      prop_add(lnum, 1, {length: word->strlen(), type: type})
     endif
-    ++lnum
-  endwhile
+  endfor
+
+  setpos('.', save_cursor)
 enddef

runtime/indent/cs.vim

@@ -3,13 +3,10 @@
 " Maintainer:          Nick Jensen <nickspoon@gmail.com>
 " Former Maintainers:  Aquila Deus
 "                      Johannes Zellner <johannes@zellner.org>
-" Last Change:         2018-11-21
-" Filenames:           *.cs
+" Last Change:         2020-03-26
 " License:             Vim (see :h license)
 " Repository:          https://github.com/nickspoons/vim-cs
-"
 
-" Only load this indent file when no other was loaded.
 if exists('b:did_indent')
   finish
 endif
@@ -22,19 +19,23 @@ set cpoptions&vim
 setlocal indentexpr=GetCSIndent(v:lnum)
 
 function! s:IsCompilerDirective(line)
-  return a:line =~? '^\s*#'
+  " Exclude #region and #endregion - these should be indented normally
+  return a:line =~# '^\s*#' && !s:IsRegionDirective(a:line)
+endf
+
+function! s:IsRegionDirective(line)
+  return a:line =~# '^\s*#\s*region' || a:line =~# '^\s*#\s*endregion'
 endf
 
 function! s:IsAttributeLine(line)
-  return a:line =~? '^\s*\[[A-Za-z]' && a:line =~? '\]$'
+  return a:line =~# '^\s*\[[A-Za-z]' && a:line =~# '\]$'
 endf
 
 function! s:FindPreviousNonCompilerDirectiveLine(start_lnum)
   for delta in range(0, a:start_lnum)
     let lnum = a:start_lnum - delta
     let line = getline(lnum)
-    let is_directive = s:IsCompilerDirective(line)
-    if !is_directive
+    if !s:IsCompilerDirective(line) && !s:IsRegionDirective(line)
       return lnum
     endif
   endfor
@@ -58,8 +59,9 @@ function! GetCSIndent(lnum) abort
   let lnum = s:FindPreviousNonCompilerDirectiveLine(a:lnum - 1)
   let previous_code_line = getline(lnum)
   if s:IsAttributeLine(previous_code_line)
-    let ind = indent(lnum)
-    return ind
+    return indent(lnum)
+  elseif s:IsRegionDirective(this_line)
+    return cindent(lnum)
   else
     return cindent(a:lnum)
   endif

runtime/indent/dtd.vim

@@ -4,6 +4,12 @@
 " Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
 " Last Change:		24 Sep 2021
 
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
 setlocal indentexpr=GetDTDIndent()
 setlocal indentkeys=!^F,o,O,>
 setlocal nosmartindent

runtime/indent/julia.vim

@@ -2,9 +2,15 @@
 " Language:	Julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
 " Homepage:	https://github.com/JuliaEditorSupport/julia-vim
-" Last Change:	2016 jun 16
+" Last Change:	2022 Jun 14
 " Notes:        originally based on Bram Molenaar's indent file for vim
 
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
 setlocal autoindent
 
 setlocal indentexpr=GetJuliaIndent()

runtime/indent/perl.vim

@@ -1,9 +1,10 @@
 " Vim indent file
-" Language:      Perl 5
+" Language:      Perl
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
-" Last Change:   2020 Apr 15
+" License:       Vim License (see :help license)
+" Last Change:   2021 Sep 24
 
 " Suggestions and improvements by :
 "   Aaron J. Sherman (use syntax for hints)
@@ -35,6 +36,8 @@ if !b:indent_use_syntax
     setlocal indentkeys+=0=EO
 endif
 
+let b:undo_indent = "setl inde< indk<"
+
 let s:cpo_save = &cpo
 set cpo-=C
 

runtime/indent/systemd.vim

@@ -1,10 +0,0 @@
-" Vim indent file
-" Language:  systemd.unit(5)
-
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
-  finish
-endif
-
-" Looks a lot like dosini files.
-runtime! indent/dosini.vim

runtime/indent/yaml.vim

@@ -2,7 +2,7 @@
 " Language:	YAML
 " Maintainer:	Nikolai Pavlov <zyx.vim@gmail.com>
 " Last Update:	Lukas Reineke
-" Last Change:	2022 May 02
+" Last Change:	2022 Jun 17
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -44,30 +44,30 @@ function s:FindPrevLEIndentedLineMatchingRegex(lnum, regex)
     return plilnum
 endfunction
 
-let s:mapkeyregex='\v^\s*\#@!\S@=%(\''%([^'']|\''\'')*\'''.
-                \                 '|\"%([^"\\]|\\.)*\"'.
+let s:mapkeyregex = '\v^\s*\#@!\S@=%(\''%([^'']|\''\'')*\''' ..
+                \                 '|\"%([^"\\]|\\.)*\"' ..
                 \                 '|%(%(\:\ )@!.)*)\:%(\ |$)'
-let s:liststartregex='\v^\s*%(\-%(\ |$))'
+let s:liststartregex = '\v^\s*%(\-%(\ |$))'
 
 let s:c_ns_anchor_char = '\v%([\n\r\uFEFF \t,[\]{}]@!\p)'
-let s:c_ns_anchor_name = s:c_ns_anchor_char.'+'
-let s:c_ns_anchor_property =  '\v\&'.s:c_ns_anchor_name
+let s:c_ns_anchor_name = s:c_ns_anchor_char .. '+'
+let s:c_ns_anchor_property =  '\v\&' .. s:c_ns_anchor_name
 
 let s:ns_word_char = '\v[[:alnum:]_\-]'
-let s:ns_tag_char  = '\v%(%\x\x|'.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
-let s:c_named_tag_handle     = '\v\!'.s:ns_word_char.'+\!'
+let s:ns_tag_char  = '\v%(%\x\x|' .. s:ns_word_char .. '|[#/;?:@&=+$.~*''()])'
+let s:c_named_tag_handle     = '\v\!' .. s:ns_word_char .. '+\!'
 let s:c_secondary_tag_handle = '\v\!\!'
 let s:c_primary_tag_handle   = '\v\!'
-let s:c_tag_handle = '\v%('.s:c_named_tag_handle.
-            \            '|'.s:c_secondary_tag_handle.
-            \            '|'.s:c_primary_tag_handle.')'
-let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+'
+let s:c_tag_handle = '\v%(' .. s:c_named_tag_handle.
+            \            '|' .. s:c_secondary_tag_handle.
+            \            '|' .. s:c_primary_tag_handle .. ')'
+let s:c_ns_shorthand_tag = '\v' .. s:c_tag_handle .. s:ns_tag_char .. '+'
 let s:c_non_specific_tag = '\v\!'
-let s:ns_uri_char  = '\v%(%\x\x|'.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
-let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>'
-let s:c_ns_tag_property = '\v'.s:c_verbatim_tag.
-            \               '\v|'.s:c_ns_shorthand_tag.
-            \               '\v|'.s:c_non_specific_tag
+let s:ns_uri_char  = '\v%(%\x\x|' .. s:ns_word_char .. '\v|[#/;?:@&=+$,.!~*''()[\]])'
+let s:c_verbatim_tag = '\v\!\<' .. s:ns_uri_char.. '+\>'
+let s:c_ns_tag_property = '\v' .. s:c_verbatim_tag.
+            \               '\v|' .. s:c_ns_shorthand_tag.
+            \               '\v|' .. s:c_non_specific_tag
 
 let s:block_scalar_header = '\v[|>]%([+-]?[1-9]|[1-9]?[+-])?'
 
@@ -142,9 +142,9 @@ function GetYAMLIndent(lnum)
         " - List with
         "   multiline scalar
         return previndent+2
-    elseif prevline =~# s:mapkeyregex . '\v\s*%(%('.s:c_ns_tag_property.
-                \                              '\v|'.s:c_ns_anchor_property.
-                \                              '\v|'.s:block_scalar_header.
+    elseif prevline =~# s:mapkeyregex .. '\v\s*%(%(' .. s:c_ns_tag_property ..
+                \                              '\v|' .. s:c_ns_anchor_property ..
+                \                              '\v|' .. s:block_scalar_header ..
                 \                             '\v)%(\s+|\s*%(\#.*)?$))*'
         " Mapping with: value
         "     that is multiline scalar

runtime/lang/README.txt

@@ -10,6 +10,9 @@ More information in the on-line help:
 	:help 'langmenu'
 	:help :language
 
+You can find a couple of helper tools for translating menus on github:
+https://github.com/adaext/vim-menutrans-helper
+
 The "$VIMRUNTIME/menu.vim" file will search for a menu translation file.  This
 depends on the value of the "v:lang" variable.
 

runtime/lang/menu_it_it.latin1.vim

@@ -2,7 +2,7 @@
 " Maintainer:		Antonio Colombo <azc100@gmail.com>
 "			Vlad Sandrini <vlad.gently@gmail.com>
 "			Luciano Montanaro <mikelima@cirulla.net>
-" Last Change:	2020 Apr 23
+" Last Change:	2022 Jun 17
 " Original translations
 
 " Quit when menu translations have already been done.
@@ -22,16 +22,14 @@ menut &Overview<Tab><F1>	&Panoramica<Tab><F1>
 menut &User\ Manual		Manuale\ &Utente
 menut &How-to\ links	Co&Me\.\.\.
 menut &Find\.\.\.	&Cerca\.\.\.
-" -SEP1-
 menut &Credits		Cr&Editi
 menut Co&pying		C&Opie
 menut &Sponsor/Register &Sponsor/Registrazione
 menut O&rphans		O&Rfani
-" -SEP2-
 menut &Version		&Versione
 menut &About		&Intro
 
-let g:menutrans_help_dialog = "Batti un comando o una parola per cercare aiuto:\n\nPremetti i_ per comandi in modo Input (ad.es.: i_CTRL-X)\nPremetti c_ per comandi che editano la linea-comandi (ad.es.: c_<Del>)\nPremetti ' per un nome di opzione (ad.es.: 'shiftwidth')"
+let g:menutrans_help_dialog = "Batti un comando o una parola per cercare aiuto:\n\nPremetti i_ per comandi in modo Input (p.es.: i_CTRL-X)\nPremetti c_ per comandi che editano la linea-comandi (p.es.: c_<Del>)\nPremetti ' per un nome di opzione (p.es.: 'shiftwidth')"
 
 " File / File
 menut &File				&File
@@ -41,15 +39,11 @@ menut Sp&lit-Open\.\.\.<Tab>:sp		A&Pri\ nuova\ finestra\.\.\.<Tab>:sp
 menut Open\ Tab\.\.\.<Tab>:tabnew	Apri\ nuova\ &Linguetta\.\.\.<Tab>:tabnew
 menut &New<Tab>:enew			&Nuovo<Tab>:enew
 menut &Close<Tab>:close			&Chiudi<Tab>:close
-" -SEP1-
 menut &Save<Tab>:w			&Salva<Tab>:w
 menut Save\ &As\.\.\.<Tab>:sav		Salva\ &Con\ nome\.\.\.<Tab>:sav
-" -SEP2-
 menut Split\ &Diff\ with\.\.\.		&Differenza\ con\.\.\.
 menut Split\ Patched\ &By\.\.\.		Patc&H\ da\.\.\.
-" -SEP3-
 menut &Print				S&tampa
-" -SEP4-
 menut Sa&ve-Exit<Tab>:wqa		Sa&Lva\ ed\ esci<Tab>:wqa
 menut E&xit<Tab>:qa			&Esci<Tab>:qa
 
@@ -59,7 +53,6 @@ menut &Edit				&Modifica
 menut &Undo<Tab>u			&Annulla<Tab>u
 menut &Redo<Tab>^R			&Ripristina<Tab>^R
 menut Rep&eat<Tab>\.			Ri&Peti<Tab>\.
-" -SEP1-
 menut Cu&t<Tab>"+x			&Taglia<Tab>"+x
 menut &Copy<Tab>"+y			&Copia<Tab>"+y
 menut &Paste<Tab>"+gP			&Incolla<Tab>"+gP
@@ -67,13 +60,11 @@ menut Put\ &Before<Tab>[p		&Metti\ davanti<Tab>[p
 menut Put\ &After<Tab>]p		M&Etti\ dietro<Tab>]p
 menut &Delete<Tab>x			Cance&Lla<Tab>x
 menut &Select\ all<Tab>ggVG		Seleziona\ &Tutto<Tab>ggVG
-" -SEP2-
 menut &Find\.\.\.			&Cerca\.\.\.
 menut &Find\.\.\.<Tab>/			&Cerca\.\.\.<Tab>/
 menut Find\ and\ Rep&lace\.\.\.		&Sostituisci\.\.\.
 menut Find\ and\ Rep&lace\.\.\.<Tab>:%s	&Sostituisci\.\.\.<Tab>:%s
 menut Find\ and\ Rep&lace\.\.\.<Tab>:s	&Sostituisci\.\.\.<Tab>:s
-" -SEP3-
 menut Settings\ &Window			&Finestra\ Impostazioni
 menut Startup\ &Settings		Impostazioni\ di\ &Avvio
 menut &Global\ Settings			Impostazioni\ &Globali
@@ -98,12 +89,50 @@ menut Toggle\ Insert\ &Mode<Tab>:set\ im!	&Modo\ Insert\ S
 menut Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!	C&Ompatibilità\ VI\ Sì/No<Tab>:set\ cp!
 menut Search\ &Path\.\.\.	&Percorso\ di\ ricerca\.\.\.
 menut Ta&g\ Files\.\.\.		File\ ta&G\.\.\.
-" -SEP1-
 menut Toggle\ &Toolbar			Barra\ s&Trumenti\ Sì/No
 menut Toggle\ &Bottom\ Scrollbar	Barra\ scorrimento\ in\ &Fondo\ Sì/No
 menut Toggle\ &Left\ Scrollbar		Barra\ scorrimento\ a\ &Sinistra\ Sì/No
 menut Toggle\ &Right\ Scrollbar		Barra\ scorrimento\ a\ &Destra\ Sì/No
 
+if has("toolbar")
+   if exists("*Do_toolbar_tmenu")
+      delfun Do_toolbar_tmenu
+   endif
+   fun Do_toolbar_tmenu()
+      tmenu ToolBar.Open		Apri file
+      tmenu ToolBar.Save		Salva file
+      tmenu ToolBar.SaveAll		Salva tutti i file
+      if has("printer") || has("unix")
+         tmenu ToolBar.Print		Stampa
+      endif
+      tmenu ToolBar.Undo		Annulla
+      tmenu ToolBar.Redo		Rifai
+      tmenu ToolBar.Cut			Taglia
+      tmenu ToolBar.Copy		Copia
+      tmenu ToolBar.Paste		Incolla
+      tmenu ToolBar.Find		Trova...
+      tmenu ToolBar.FindNext		Trova seguente
+      tmenu ToolBar.FindPrev		Trova precedente
+      tmenu ToolBar.Replace		Sostituisci
+      if 0	" disabled; These are in the Windows menu
+         tmenu ToolBar.New		Nuovo
+         tmenu ToolBar.WinSplit		Dividi
+         tmenu ToolBar.WinMax		Massimizza
+         tmenu ToolBar.WinMin		Minimizza
+         tmenu ToolBar.WinClose		Chiudi
+      endif
+      tmenu ToolBar.LoadSesn		Carica sessione
+      tmenu ToolBar.SaveSesn		Salva sessione
+      tmenu ToolBar.RunScript		Esegui script
+      tmenu ToolBar.Make		Esegui make
+      tmenu ToolBar.Shell		Esegui shell
+      tmenu ToolBar.RunCtags		Esegui ctags
+      tmenu ToolBar.TagJump		Salta alla tag
+      tmenu ToolBar.Help		Aiuto
+      tmenu ToolBar.FindHelp		Trova aiuto...
+   endfun
+endif
+
 let g:menutrans_path_dialog = "Batti percorso di ricerca per i file.\nSepara fra loro i nomi di directory con una virgola."
 let g:menutrans_tags_dialog = "Batti nome dei file di tag.\nSepara fra loro i nomi di directory con una virgola."
 
@@ -119,7 +148,6 @@ menut Toggle\ W&rapping\ at\ word<Tab>:set\ lbr!	A\ capo\ alla\ &Parola\ S
 menut Toggle\ Tab\ &expanding<Tab>:set\ et!		&Espandi\ Tabulazione\ Sì/No<Tab>:set\ et!
 menut Toggle\ &Auto\ Indenting<Tab>:set\ ai!		Indentazione\ &Automatica\ Sì/No<Tab>:set\ ai!
 menut Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	Indentazione\ stile\ &C\ Sì/No<Tab>:set\ cin!
-" -SEP2-
 menut &Shiftwidth					&Spazi\ rientranza
 "menut &Shiftwidth.2<Tab>:set\ sw=2\ sw?<CR>		&Spazi\ rientranza.2<Tab>:set\ sw=2\ sw?<CR>
 "menut &Shiftwidth.3<Tab>:set\ sw=3\ sw?<CR>		&Spazi\ rientranza.3<Tab>:set\ sw=3\ sw?<CR>
@@ -206,7 +234,6 @@ menut &Tools				&Strumenti
 menut &Jump\ to\ this\ tag<Tab>g^]	&Vai\ a\ questa\ tag<Tab>g^]
 menut Jump\ &back<Tab>^T		Torna\ &Indietro<Tab>^T
 menut Build\ &Tags\ File		Costruisci\ file\ &Tags\
-" -SEP1-
 " Menù ortografia / Spelling
 menut &Spelling			&Ortografia
 
@@ -234,7 +261,6 @@ menut C&lose\ more\ folds<Tab>zm			C&Hiudi\ pi
 menut &Close\ all\ folds<Tab>zM			&Chiudi\ tutte\ le\ piegature<Tab>zM
 menut O&pen\ more\ folds<Tab>zr			A&Pri\ più\ piegature<Tab>zr
 menut &Open\ all\ folds<Tab>zR			&Apri\ tutte\ le\ piegature<Tab>zR
-" -SEP1-
 " metodo piegatura
 menut Fold\ Met&hod				Meto&Do\ piegatura
 menut M&anual					&Manuale
@@ -248,7 +274,6 @@ menut Ma&rker					Mar&Catura
 menut Create\ &Fold<Tab>zf			Crea\ &Piegatura<Tab>zf
 menut &Delete\ Fold<Tab>zd			&Leva\ piegatura<Tab>zd
 menut Delete\ &All\ Folds<Tab>zD			Leva\ &Tutte\ le\ piegature<Tab>zD
-" -SEP2-
 " movimenti all'interno delle piegature
 menut Fold\ col&umn\ width			Larghezza\ piegat&Ure\ in\ colonne
 
@@ -258,7 +283,6 @@ menut &Update					&Aggiorna
 menut &Get\ Block				&Importa\ differenze
 menut &Put\ Block				&Esporta\ differenze
 
-" -SEP2-
 menut &Make<Tab>:make		Esegui\ &Make<Tab>:make
 
 menut &List\ Errors<Tab>:cl		Lista\ &Errori<Tab>:cl
@@ -274,7 +298,6 @@ menut &Update<Tab>:cwin		A&Ggiorna<Tab>:cwin
 menut &Open<Tab>:copen		&Apri<Tab>:copen
 menut &Close<Tab>:cclose	&Chiudi<Tab>:cclose
 
-" -SEP3-
 menut &Convert\ to\ HEX<Tab>:%!xxd	&Converti\ a\ esadecimale<Tab>:%!xxd
 menut Conve&rt\ back<Tab>:%!xxd\ -r	Conve&rti\ da\ esadecimale<Tab>:%!xxd\ -r
 
@@ -304,7 +327,11 @@ menut Co&lor\ test			Test\ &Colori
 menut &Highlight\ test			Test\ &Evidenziamento
 menut &Convert\ to\ HTML		Converti\ ad\ &HTML
 
+let g:menutrans_set_lang_to = "Cambia linguaggio a"
 let g:menutrans_no_file = "[Senza nome]"
+let g:menutrans_spell_change_ARG = 'Cambia\ da\ "%s"\ a'
+let g:menutrans_spell_add_ARG_to_word_list = 'Aggiungi\ "%s"\ alla\ Word\ List'
+let g:menutrans_spell_ignore_ARG = 'Ignora\ "%s"'
 
 " Window / Finestra
 menut &Window				&Finestra
@@ -314,10 +341,8 @@ menut S&plit<Tab>^Ws			&Dividi\ lo\ schermo<Tab>^Ws
 menut Sp&lit\ To\ #<Tab>^W^^		D&Ividi\ verso\ #<Tab>^W^^
 menut Split\ &Vertically<Tab>^Wv	Di&Vidi\ verticalmente<Tab>^Wv
 menut Split\ File\ E&xplorer		Aggiungi\ finestra\ e&Xplorer
-" -SEP1-
 menut &Close<Tab>^Wc			&Chiudi<Tab>^Wc
 menut Close\ &Other(s)<Tab>^Wo		C&Hiudi\ altra(e)<Tab>^Wo
-" -SEP2-
 menut Move\ &To				&Muovi\ verso
 
 menut &Top<Tab>^WK			&Cima<Tab>^WK
@@ -326,7 +351,6 @@ menut &Left\ side<Tab>^WH		Lato\ &Sinistro<Tab>^WH
 menut &Right\ side<Tab>^WL		Lato\ &Destro<Tab>^WL
 menut Rotate\ &Up<Tab>^WR		Ruota\ verso\ l'&Alto<Tab>^WR
 menut Rotate\ &Down<Tab>^Wr		Ruota\ verso\ il\ &Basso<Tab>^Wr
-" -SEP3-
 menut &Equal\ Size<Tab>^W=		&Uguale\ ampiezza<Tab>^W=
 menut &Max\ Height<Tab>^W_		&Altezza\ massima<Tab>^W_
 menut M&in\ Height<Tab>^W1_		A&Ltezza\ minima<Tab>^W1_
@@ -335,12 +359,10 @@ menut Min\ Widt&h<Tab>^W1\|		Larghezza\ minima<Tab>^W1\|
 
 " The popup menu
 menut &Undo		&Annulla
-" -SEP1-
 menut Cu&t		&Taglia
 menut &Copy		&Copia
 menut &Paste		&Incolla
 menut &Delete		&Elimina
-" -SEP2-
 menut Select\ Blockwise 	Seleziona\ in\ blocco
 menut Select\ &Word		Seleziona\ &Parola
 menut Select\ &Line		Seleziona\ &Linea
@@ -352,10 +374,8 @@ menut Open		Apri
 menut Save		Salva
 menut SaveAll		Salva\ Tutto
 menut Print		Stampa
-" -SEP1-
 menut Undo		Annulla
 menut Redo		Ripristina
-" -SEP2-
 menut Cut		Taglia
 menut Copy		Copia
 menut Paste		Incolla
@@ -373,16 +393,13 @@ menut WinVSplit		Dividi\ verticalmente
 menut WinMaxWidth	Massima\ larghezza
 menut WinMinWidth	Minima\ larghezza
 menut WinClose		Chiudi\ finestra
-" -SEP5-
 menut LoadSesn		Carica\ Sessione
 menut SaveSesn		Salva\ Sessione
 menut RunScript		Esegui\ Script
-" -SEP6-
 menut Make		Make
 menut Shell		Shell
 menut RunCtags		Esegui\ Ctags
 menut TagJump		Vai\ a\ Tag
-" -SEP7-
 menut Help		Aiuto
 menut FindHelp		Cerca\ in\ Aiuto
 

runtime/pack/dist/opt/editexisting/plugin/editexisting.vim

@@ -1,6 +1,6 @@
 " Vim Plugin:	Edit the file with an existing Vim if possible
 " Maintainer:	Bram Moolenaar
-" Last Change:	2016 Mar 28
+" Last Change:	2022 Jun 17
 
 " To use add ":packadd! editexisting" in your vimrc file.
 
@@ -35,32 +35,36 @@ func s:EditElsewhere(filename)
     endif
 
     " Check if this server is editing our file.
-    if remote_expr(servername, "bufloaded('" . fname_esc . "')")
-      " Yes, bring it to the foreground.
-      if has("win32")
-	call remote_foreground(servername)
-      endif
-      call remote_expr(servername, "foreground()")
-
-      if remote_expr(servername, "exists('*EditExisting')")
-	" Make sure the file is visible in a window (not hidden).
-	" If v:swapcommand exists and is set, send it to the server.
-	if exists("v:swapcommand")
-	  let c = substitute(v:swapcommand, "'", "''", "g")
-	  call remote_expr(servername, "EditExisting('" . fname_esc . "', '" . c . "')")
-	else
-	  call remote_expr(servername, "EditExisting('" . fname_esc . "', '')")
+    try
+      if remote_expr(servername, "bufloaded('" . fname_esc . "')")
+	" Yes, bring it to the foreground.
+	if has("win32")
+	  call remote_foreground(servername)
 	endif
-      endif
+	call remote_expr(servername, "foreground()")
 
-      if !(has('vim_starting') && has('gui_running') && has('gui_win32'))
-	" Tell the user what is happening.  Not when the GUI is starting
-	" though, it would result in a message box.
-	echomsg "File is being edited by " . servername
-	sleep 2
+	if remote_expr(servername, "exists('*EditExisting')")
+	  " Make sure the file is visible in a window (not hidden).
+	  " If v:swapcommand exists and is set, send it to the server.
+	  if exists("v:swapcommand")
+	    let c = substitute(v:swapcommand, "'", "''", "g")
+	    call remote_expr(servername, "EditExisting('" . fname_esc . "', '" . c . "')")
+	  else
+	    call remote_expr(servername, "EditExisting('" . fname_esc . "', '')")
+	  endif
+	endif
+
+	if !(has('vim_starting') && has('gui_running') && has('gui_win32'))
+	  " Tell the user what is happening.  Not when the GUI is starting
+	  " though, it would result in a message box.
+	  echomsg "File is being edited by " . servername
+	  sleep 2
+	endif
+	return 'q'
       endif
-      return 'q'
-    endif
+    catch /^Vim\%((\a\+)\)\=:E241:/
+      " Unable to send to this server, ignore it.
+    endtry
   endwhile
   return ''
 endfunc

runtime/pack/dist/opt/termdebug/plugin/termdebug.vim

@@ -2,7 +2,7 @@
 "
 " Author: Bram Moolenaar
 " Copyright: Vim license applies, see ":help license"
-" Last Change: 2022 May 09
+" Last Change: 2022 Jun 22
 "
 " WORK IN PROGRESS - The basics works stable, more to come
 " Note: In general you need at least GDB 7.12 because this provides the
@@ -65,11 +65,6 @@ set cpo&vim
 command -nargs=* -complete=file -bang Termdebug call s:StartDebug(<bang>0, <f-args>)
 command -nargs=+ -complete=file -bang TermdebugCommand call s:StartDebugCommand(<bang>0, <f-args>)
 
-" Name of the gdb command, defaults to "gdb".
-if !exists('g:termdebugger')
-  let g:termdebugger = 'gdb'
-endif
-
 let s:pc_id = 12
 let s:asm_id = 13
 let s:break_id = 14  " breakpoint number is added to this
@@ -99,8 +94,17 @@ call s:Highlight(1, '', &background)
 hi default debugBreakpoint term=reverse ctermbg=red guibg=red
 hi default debugBreakpointDisabled term=reverse ctermbg=gray guibg=gray
 
+" Get the command to execute the debugger as a list, defaults to ["gdb"].
 func s:GetCommand()
-  return type(g:termdebugger) == v:t_list ? copy(g:termdebugger) : [g:termdebugger]
+  if exists('g:termdebug_config')
+    let cmd = get(g:termdebug_config, 'command', 'gdb')
+  elseif exists('g:termdebugger')
+    let cmd = g:termdebugger
+  else
+    let cmd = 'gdb'
+  endif
+
+  return type(cmd) == v:t_list ? copy(cmd) : [cmd]
 endfunc
 
 func s:StartDebug(bang, ...)
@@ -144,10 +148,16 @@ func s:StartDebug_internal(dict)
 
   let s:save_columns = 0
   let s:allleft = 0
-  if exists('g:termdebug_wide')
-    if &columns < g:termdebug_wide
+  let wide = 0
+  if exists('g:termdebug_config')
+    let wide = get(g:termdebug_config, 'wide', 0)
+  elseif exists('g:termdebug_wide')
+    let wide = g:termdebug_wide
+  endif
+  if wide > 0
+    if &columns < wide
       let s:save_columns = &columns
-      let &columns = g:termdebug_wide
+      let &columns = wide
       " If we make the Vim window wider, use the whole left half for the debug
       " windows.
       let s:allleft = 1
@@ -158,7 +168,12 @@ func s:StartDebug_internal(dict)
   endif
 
   " Override using a terminal window by setting g:termdebug_use_prompt to 1.
-  let use_prompt = exists('g:termdebug_use_prompt') && g:termdebug_use_prompt
+  let use_prompt = 0
+  if exists('g:termdebug_config')
+    let use_prompt = get(g:termdebug_config, 'use_prompt', 0)
+  elseif exists('g:termdebug_use_prompt')
+    let use_prompt = g:termdebug_use_prompt
+  endif
   if has('terminal') && !has('win32') && !use_prompt
     let s:way = 'terminal'
   else
@@ -171,12 +186,10 @@ func s:StartDebug_internal(dict)
     call s:StartDebug_term(a:dict)
   endif
 
-  if exists('g:termdebug_disasm_window')
-    if g:termdebug_disasm_window
-      let curwinid = win_getid(winnr())
-      call s:GotoAsmwinOrCreateIt()
-      call win_gotoid(curwinid)
-    endif
+  if s:GetDisasmWindow()
+    let curwinid = win_getid(winnr())
+    call s:GotoAsmwinOrCreateIt()
+    call win_gotoid(curwinid)
   endif
 
   if exists('#User#TermdebugStartPost')
@@ -240,18 +253,28 @@ func s:StartDebug_term(dict)
   let proc_args = get(a:dict, 'proc_args', [])
 
   let gdb_cmd = s:GetCommand()
-  " Add -quiet to avoid the intro message causing a hit-enter prompt.
-  let gdb_cmd += ['-quiet']
-  " Disable pagination, it causes everything to stop at the gdb
-  let gdb_cmd += ['-iex', 'set pagination off']
-  " Interpret commands while the target is running.  This should usually only
-  " be exec-interrupt, since many commands don't work properly while the
-  " target is running (so execute during startup).
-  let gdb_cmd += ['-iex', 'set mi-async on']
-  " Open a terminal window to run the debugger.
-  let gdb_cmd += ['-tty', pty]
-  " Command executed _after_ startup is done, provides us with the necessary feedback
-  let gdb_cmd += ['-ex', 'echo startupdone\n']
+
+  if exists('g:termdebug_config') && has_key(g:termdebug_config, 'command_add_args')
+    let gdb_cmd = g:termdebug_config.command_add_args(gdb_cmd, pty)
+  else
+    " Add -quiet to avoid the intro message causing a hit-enter prompt.
+    let gdb_cmd += ['-quiet']
+    " Disable pagination, it causes everything to stop at the gdb
+    let gdb_cmd += ['-iex', 'set pagination off']
+    " Interpret commands while the target is running.  This should usually only
+    " be exec-interrupt, since many commands don't work properly while the
+    " target is running (so execute during startup).
+    let gdb_cmd += ['-iex', 'set mi-async on']
+    " Open a terminal window to run the debugger.
+    let gdb_cmd += ['-tty', pty]
+    " Command executed _after_ startup is done, provides us with the necessary
+    " feedback
+    let gdb_cmd += ['-ex', 'echo startupdone\n']
+  endif
+
+  if exists('g:termdebug_config') && has_key(g:termdebug_config, 'command_filter')
+    let gdb_cmd = g:termdebug_config.command_filter(gdb_cmd)
+  endif
 
   " Adding arguments requested by the user
   let gdb_cmd += gdb_args
@@ -855,7 +878,13 @@ func s:InstallCommands()
   command Asm call s:GotoAsmwinOrCreateIt()
   command Winbar call s:InstallWinbar()
 
-  if !exists('g:termdebug_map_K') || g:termdebug_map_K
+  let map = 1
+  if exists('g:termdebug_config')
+    let map = get(g:termdebug_config, 'map_K', 1)
+  elseif exists('g:termdebug_map_K')
+    let map = g:termdebug_map_K
+  endif
+  if map
     let s:k_map_saved = maparg('K', 'n', 0, 1)
     nnoremap K :Evaluate<CR>
   endif
@@ -863,7 +892,13 @@ func s:InstallCommands()
   if has('menu') && &mouse != ''
     call s:InstallWinbar()
 
-    if !exists('g:termdebug_popup') || g:termdebug_popup != 0
+    let popup = 1
+    if exists('g:termdebug_config')
+      let popup = get(g:termdebug_config, 'popup', 1)
+    elseif exists('g:termdebug_popup')
+      let popup = g:termdebug_popup
+    endif
+    if popup
       let s:saved_mousemodel = &mousemodel
       let &mousemodel = 'popup_setpos'
       an 1.200 PopUp.-SEP3-	<Nop>
@@ -1183,6 +1218,26 @@ func s:GotoSourcewinOrCreateIt()
   endif
 endfunc
 
+func s:GetDisasmWindow()
+  if exists('g:termdebug_config')
+    return get(g:termdebug_config, 'disasm_window', 0)
+  endif
+  if exists('g:termdebug_disasm_window')
+    return g:termdebug_disasm_window
+  endif
+  return 0
+endfunc
+
+func s:GetDisasmWindowHeight()
+  if exists('g:termdebug_config')
+    return get(g:termdebug_config, 'disasm_window_height', 0)
+  endif
+  if exists('g:termdebug_disasm_window') && g:termdebug_disasm_window > 1
+    return g:termdebug_disasm_window
+  endif
+  return 0
+endfunc
+
 func s:GotoAsmwinOrCreateIt()
   if !win_gotoid(s:asmwin)
     if win_gotoid(s:sourcewin)
@@ -1206,10 +1261,8 @@ func s:GotoAsmwinOrCreateIt()
       exe 'file Termdebug-asm-listing'
     endif
 
-    if exists('g:termdebug_disasm_window')
-      if g:termdebug_disasm_window > 1
-        exe 'resize ' . g:termdebug_disasm_window
-      endif
+    if s:GetDisasmWindowHeight() > 0
+      exe 'resize ' .. s:GetDisasmWindowHeight()
     endif
   endif
 
@@ -1273,12 +1326,12 @@ func s:HandleCursor(msg)
 echomsg 'different fname: "' .. expand('%:p') .. '" vs "' .. fnamemodify(fname, ':p') .. '"'
 	augroup Termdebug
 	  " Always open a file read-only instead of showing the ATTENTION
-	  " prompt, since we are unlikely to want to edit the file.
+	  " prompt, since it is unlikely we want to edit the file.
 	  " The file may be changed but not saved, warn for that.
 	  au SwapExists * echohl WarningMsg
 		\ | echo 'Warning: file is being edited elsewhere'
 		\ | echohl None
-		\ | let v:swapchoice = '0'
+		\ | let v:swapchoice = 'o'
         augroup END
         if &modified
           " TODO: find existing window

runtime/plugin/manpager.vim

@@ -1,19 +1,31 @@
 " Vim plugin for using Vim as manpager.
 " Maintainer: Enno Nagel <ennonagel+vim@gmail.com>
-" Last Change: 2020 Aug 05
+" Last Change: 2022 Jun 17
 
-command! -nargs=0 MANPAGER call s:ManPager() | delcommand MANPAGER
+" Set up the current buffer (likely read from stdin) as a manpage
+command MANPAGER call s:ManPager()
 
-function! s:ManPager()
-  set nocompatible
+function s:ManPager()
+  " global options, keep these to a minimum to avoid side effects
+  if &compatible
+    set nocompatible
+  endif
   if exists('+viminfofile')
     set viminfofile=NONE
   endif
-  set noswapfile 
+  syntax on
 
-  setlocal ft=man
-  runtime ftplugin/man.vim
-  setlocal buftype=nofile bufhidden=hide iskeyword+=: modifiable
+  " Make this an unlisted, readonly scratch buffer
+  setlocal buftype=nofile noswapfile bufhidden=hide nobuflisted readonly
+
+  " Is this useful?  Should allow for using K on word with a colon.
+  setlocal iskeyword+=:
+
+  " Ensure text width matches window width
+  setlocal foldcolumn& nofoldenable nonumber norelativenumber
+
+  " In case Vim was invoked with -M
+  setlocal modifiable
 
   " Emulate 'col -b'
   silent! keepj keepp %s/\v(.)\b\ze\1?//ge
@@ -27,7 +39,11 @@ function! s:ManPager()
   if n > 1
     exe "1," . n-1 . "d"
   endif
-  setlocal nomodified readonly
 
-  syntax on
+  " Finished preprocessing the buffer, prevent any further modifications
+  setlocal nomodified nomodifiable
+
+  " Set filetype to man even if ftplugin is disabled
+  setlocal iskeyword+=: filetype=man
+  runtime ftplugin/man.vim
 endfunction

runtime/spell/sr/README_sr.txt

@@ -0,0 +1,43 @@
+The location of source files for Serbian spelling dictionary were downloaded
+from 
+https://github.com/LibreOffice/dictionaries/tree/master/sr
+(Serbian Spelling and Hyphenation for LibreOffice).
+
+Here is the content of original README file from the repository:
+
+	"LibreOffice Spelling and Hyphenation
+	extension package for Serbian (Cyrillic and Latin)
+	
+	This extension package includes the Hunspell dictionary and Hyphen
+	hyphenation patterns for the Serbian language adapted for usage in
+	LibreOffice.
+	
+	Serbian spelling dictionary is developed by Milutin Smiljanic
+	<msmiljanic.gm@gmail.com> and is released under GNU LGPL version 3 or
+	later / MPL version 2 or later / GNU GPL version 3 or later, giving
+	you the choice of one of the three sets of free software licensing
+	terms.
+	
+	Serbian hyphenation patterns are derived from the official TeX
+	patterns for Serbocroatian language (Cyrillic and Latin) created by
+	Dejan Muhamedagić, version 2.02 from 22 June 2008 adopted for usage
+	with Hyphen hyphenation library and released under GNU LGPL version
+	2.1 or later."
+
+
+This dictionary used to create Vim spl file is the result of merging the two
+LibreOffice dictionaries, for cyrillic and latin script.
+
+The merge was accomplished by concatenating two .dic files, removing 1061
+duplicates using the fixdup Vim script and updating the word count.
+
+In both affix files each SFX (and two PFX) directive had to be appended with
+the . at the end of the line. KEY and WORDCHAR directives were removed, and
+MIDWORD was added.  Each SFX block is the union of corresponding blocks from
+sr.aff and sr-Latn.aff.  Header line of each block was updated to the new
+count (2 times the value from the corresponding block in the input affix
+file).
+
+
+Ivan Pešić
+23.06.2022. 

runtime/spell/sr/main.aap

@@ -1,4 +1,5 @@
 # Aap recipe for Serbian Vim spell files.
+# See README_sr.txt for instructions to get the .aff and .dic files.
 
 # Use a freshly compiled Vim if it exists.
 @if os.path.exists('../../../src/vim'):
@@ -7,136 +8,16 @@
     :progsearch VIM vim
 
 SPELLDIR = ..
-FILES    = sr_RS.aff sr_RS.dic
-           'sr_RS@latin.aff' 'sr_RS@latin.dic'
+FILES    = sr.aff sr.dic
 
-all: $SPELLDIR/sr.utf-8.spl $SPELLDIR/'sr@latin.utf-8.spl' ../README_sr.txt
-
-# Original files will be in the subfolder hunspell-sr after unpacking:
-#    sr.dic    original cyrillic dictionary
-#    sr.aff     original cyrillic affix file
-#    sr-Latn.dic     original latin dictionary file
-#    sr-Latn.aff    original latin affix file
-# Just before using the dictionary files, the right ones are copied to
-#    sr_RS.aff
-#    sr_RS.dic
-#    and
-#    sr_RS@latin.aff
-#    sr_RS@latin.dic
+all: $SPELLDIR/sr.utf-8.spl ../README_sr.txt
 
 $SPELLDIR/sr.utf-8.spl : $FILES
         :sys env LANG=sr_RS.UTF-8
-		$VIM -u NONE -e -c "set enc=utf-8" -c "mkspell! $SPELLDIR/sr sr_RS" -c q
+		$VIM -u NONE -e -c "set enc=utf-8" -c "mkspell! $SPELLDIR/sr sr" -c q
 
-$SPELLDIR/"sr@latin.utf-8.spl" : $FILES
-        :sys env LANG=sr_RS@latin.UTF-8
-		$VIM -u NONE -e -c "set enc=utf-8" -c "mkspell! $SPELLDIR/sr@latin sr_RS@latin" -c q
-
-../README_sr.txt : hunspell-sr/README_sr.txt README_sr_RS.txt
-        :cat README_sr_RS.txt >!$target
-        :print >>$target
-        :print ============================================================== >>$target
-        :print Следи оригинална README датотека: >>$target
-        :print >>$target
-        :cat hunspell-sr/README_sr.txt >>$target
-
-#
-# Used to fetch the files.
-#
-ZIPFILE = http://devbase.net/dict-sr/hunspell-sr-20130715.zip
-
-:attr {fetch = $ZIPFILE} sr_RS.zip
-
-# The files don't depend on the .zip file so that we can delete it.
-# Only download the zip file if the targets don't exist.
-sr_RS.aff sr_RS.dic: {buildcheck=}
-        :assertpkg unzip patch
-        :fetch sr_RS.zip
-        :sys $UNZIP sr_RS.zip
-        :delete sr_RS.zip
-        @if not os.path.exists('sr_RS.orig.aff'):
-            :copy hunspell-sr/sr.aff sr_RS.orig.aff
-        @if not os.path.exists('sr_RS.orig.dic'):
-            :copy hunspell-sr/sr.dic sr_RS.orig.dic
-        @if os.path.exists('sr_RS.diff'):
-            :sys patch <sr_RS.diff
-        :copy sr_RS.orig.aff sr_RS.aff
-        :copy sr_RS.orig.dic sr_RS.dic
-
-        # Remove the 3 misspelled words and update the word count
-#        :sys $VIM -u NONE -e -c "set enc=utf-8"
-#                    -c "e sr_RS.orig.dic"
-#                    -c "%g/ажуриранје/d"
-#                    -c "%g/вишнја/d"
-#                    -c "%g/вишнјевац/d"
-#                    -c "%s/263909/263906/e"
-#                    -c "w! sr_RS.dic"
-#                    -c q
-
-sr_RS@latin.aff sr_RS@latin.dic: {buildcheck=}
-        :assertpkg unzip patch
-        :fetch sr_RS.zip
-        :sys $UNZIP sr_RS.zip
-        :delete sr_RS.zip
-        @if not os.path.exists('sr_RS@latin.orig.aff'):
-            :copy hunspell-sr/sr-Latn.aff 'sr_RS@latin.orig.aff'
-        @if not os.path.exists('sr_RS@latin.orig.dic'):
-            :copy hunspell-sr/sr-Latn.dic 'sr_RS@latin.orig.dic'
-        @if os.path.exists('sr_RS@latin.diff'):
-            :sys patch <'sr_RS@latin.diff'
-        :copy 'sr_RS@latin.orig.aff' 'sr_RS@latin.aff'
-        :copy 'sr_RS@latin.orig.dic' 'sr_RS@latin.dic'
-
-
-        # Remove the 3 duplicated words and update the word count
-#        :sys $VIM -u NONE -e -c "set enc=utf-8"
-#                    -c "e sr_RS@latin.orig.dic"
-#                    -c "%g/\v(ažuriranje)(\_.*\1)@=/d"
-#                    -c "%g/\v(višnja)(\_.*\1)@=/d"
-#                    -c "%g/\v(višnjevac)(\_.*\1)@=/d"
-#                    -c "%s/263909/263906/e"
-#                    -c "w! sr_RS@latin.dic"
-#                    -c q
-
-# Generate diff files, so that others can get the files and apply
-# the diffs to get the Vim versions.
-diff:
-        :assertpkg diff
-        :sys {force} diff -a -C 1 sr_RS.orig.aff sr_RS.aff >sr_RS.diff
-        :sys {force} diff -a -C 1 sr_RS.orig.dic sr_RS.dic >>sr_RS.diff
-        :sys {force} diff -a -C 1 'sr_RS@latin.orig.aff' 'sr_RS@latin.aff' >'sr_RS@latin.diff'
-        :sys {force} diff -a -C 1 'sr_RS@latin.orig.dic' 'sr_RS@latin.dic' >>'sr_RS@latin.diff'
-
-# Delete all the unpacked and generated files, including the "orig" files.
-clean:
-        :delete {force} sr_RS.zip sr_RS.dic
-                        sr_RS.orig.aff sr_RS.orig.dic
-                        sr_RS.aff
-                        'sr_RS@latin.dic' 'sr_RS@latin.aff'
-                        'sr_RS@latin.orig.aff' 'sr_RS@latin.orig.dic'
-        :sys rm -f -r hunspell-sr/
-
-# Check for updated OpenOffice spell files.  When there are changes the
-# ".new.aff" and ".new.dic" files are left behind for manual inspection.
-#
-#check:
-#        :assertpkg unzip diff
-#        :fetch fr_FR.zip
-#        :mkdir tmp
-#        :cd tmp
-#        @try:
-#            @import stat
-#            :sys $UNZIP ../fr_FR.zip
-#            :sys {force} diff ../fr_FR.orig.aff fr_FR.aff >d
-#            @if os.stat('d')[stat.ST_SIZE] > 0:
-#                :copy fr_FR.aff ../fr_FR.new.aff
-#            :sys {force} diff ../fr_FR.orig.dic fr_FR.dic >d
-#            @if os.stat('d')[stat.ST_SIZE] > 0:
-#                :copy fr_FR.dic ../fr_FR.new.dic
-#        @finally:
-#            :cd ..
-#            :delete {r}{f}{q} tmp
-#            :delete fr_FR.zip
+../README_sr.txt : README_sr.txt
+        :copy README_sr.txt $target
 
 
 vim: set sts=4 sw=4 : 

runtime/spell/sr/sr_RS.diff

@@ -1,68 +0,0 @@
-*** sr_RS.orig.aff	Fri Feb 23 20:04:41 2018
---- sr_RS.aff	Fri Feb 23 18:18:48 2018
-***************
-*** 1,10 ****
-! SET UTF-8
-  
-! LANG sr
-! TRY аиоенртсвумклпјдгзбшчцхћњљжфђџАИОЕНРТСВУМКЛПЈДГЗБШЧЦХЋЊЉЖФЂЏ
-! KEY љњертжуиопшђж|асдфгхјклчћ|зџцвбнм|жшђ|ћшч|жчђ|ђћж|зж|љањседрфтгжхуј|јиколпч|азсџдцфвгбх|хнјмк
-! 
-! MAP 4
-! MAP цћ
-! MAP цч
-  MAP зж
---- 1,5 ----
-! SET utf-8
-  
-! MAP 3
-! MAP цћч
-  MAP зж
-***************
-*** 12,14 ****
-  
-! REP 8
-  REP дј ђ
---- 7,11 ----
-  
-! MIDWORD -’
-! 
-! REP 4
-  REP дј ђ
-***************
-*** 17,28 ****
-  REP дж џ
-- REP ц с # Ако хоћу да откуцам слово „С“ могу се залетети за ознаком на тастатури и уписати „Ц“ (C)
-- REP п р # Ако хоћу да откуцам слово „В“ могу се залетети за ознаком и уписати „Б“ (B)
-- REP џ х # Ако хоћу да откуцам слово „Р“ могу се залетети за ознаком и уписати „П“ (P)
-- REP х н # Ако хоћу да откуцам слово „Х“ могу се залетети за ознаком и уписати „Џ“ (X)
--         # Ако хоћу да откуцам слово „В“ могу се залетети за ознаком и уписати „Б“ (B) (покривено KEY паром „в - б“)
-- 
-- ICONV 3
-- ICONV ҵ тц
-- ICONV ҥ нг
-- ICONV ӕ ае
-  
---- 14,15 ----
-*** sr_RS.orig.dic	Fri Feb 23 20:04:42 2018
---- sr_RS.dic	Fri Feb 23 20:04:46 2018
-***************
-*** 1,2 ****
-! 263909
-  а
---- 1,2 ----
-! 263906
-  а
-***************
-*** 882,884 ****
-  ажурираних
-- ажуриранје
-  ажурирано
---- 882,883 ----
-***************
-*** 22177,22180 ****
-  вишку
-- вишнја
-- вишнјевац
-  Вишну
---- 22176,22177 ----

runtime/spell/sr/sr_RS@latin.diff

@@ -1,66 +0,0 @@
-*** sr_RS@latin.orig.aff	Fri Feb 23 20:08:28 2018
---- sr_RS@latin.aff	Fri Feb 23 18:18:48 2018
-***************
-*** 1,10 ****
-! SET UTF-8
-  
-! LANG sr-Latn
-! TRY aioenrtsvumklpjdgzbščchćnjljžfđdžAIOENRTSVUMKLPJDGZBŠČCHĆNJLJŽFĐDŽ
-! KEY qwertyuiopšđž|asdfghjklčć|zxcvbnm|žšđ|ćšč|žčđ|đćž|zy|qawsedrftgyhuj|jikolpč|azsxdcfvgbh|hnjmk
-! 
-! MAP 4
-! MAP cć
-! MAP cč
-  MAP zž
---- 1,5 ----
-! SET utf-8
-  
-! MAP 3
-! MAP cćč
-  MAP zž
-***************
-*** 12,20 ****
-  
-! REP 1
-! REP dj đ
-  
-! ICONV fi fi
-! ICONV fl fl
-! ICONV st st
-! ICONV ij ij
-! ICONV œ oe
---- 7,14 ----
-  
-! MIDWORD -’
-  
-! REP 4
-! REP dj đ
-! REP fl fl
-! REP ff ff
-! REP fi fi
-*** sr_RS@latin.orig.dic	Fri Feb 23 20:08:28 2018
---- sr_RS@latin.dic	Fri Feb 23 20:08:53 2018
-***************
-*** 1,2 ****
-! 263909
-  a
---- 1,2 ----
-! 263906
-  a
-***************
-*** 882,884 ****
-  ažuriranih
-- ažuriranje
-  ažurirano
---- 882,883 ----
-***************
-*** 22177,22184 ****
-  višku
-- višnja
-- višnjevac
-  Višnu
-  višnja
-  višnjama
-  višnjare
-  višnje
---- 22176,22181 ----

runtime/syntax/coco.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     Coco/R
 " Maintainer:   Ashish Shukla <wahjava@gmail.com>
-" Last Change:  2007 Aug 10
+" Last Change:  2022 Jun 14
 " Remark:       Coco/R syntax partially implemented.
 " License:      Vim license
 
@@ -30,3 +30,4 @@ hi def link cocoOperator         Operator
 hi def link cocoProductionCode   Statement
 hi def link cocoPragma           Special
 
+let b:current_syntax = 'coco'

runtime/syntax/confini.vim

@@ -0,0 +1,12 @@
+" Vim syntax file
+" Language: confini
+
+" Quit if a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Use the cfg syntax for now, it's similar.
+runtime! syntax/cfg.vim
+
+let b:current_syntax = 'confini'

runtime/syntax/cs.vim

@@ -3,13 +3,16 @@
 " Maintainer:          Nick Jensen <nickspoon@gmail.com>
 " Former Maintainers:  Anduin Withers <awithers@anduin.com>
 "                      Johannes Zellner <johannes@zellner.org>
-" Last Change:         2020-11-23
+" Last Change:         2022-03-01
 " Filenames:           *.cs
 " License:             Vim (see :h license)
 " Repository:          https://github.com/nickspoons/vim-cs
 "
-" REFERENCES:
-" [1] ECMA TC39: C# Language Specification (WD13Oct01.doc)
+" References:
+"   -   ECMA-334 5th Edition: C# Language Specification
+"       https://www.ecma-international.org/publications-and-standards/standards/ecma-334/
+"   -   C# Language Design: Draft 6th Edition and later proposals
+"       https://github.com/dotnet/csharplang
 
 if exists('b:current_syntax')
   finish
@@ -19,37 +22,72 @@ let s:save_cpo = &cpoptions
 set cpoptions&vim
 
 syn keyword	csType	bool byte char decimal double float int long object sbyte short string T uint ulong ushort var void dynamic
-syn keyword	csStorage	delegate enum interface namespace struct
+syn keyword	csType	nint nuint " contextual
+
+syn keyword	csStorage	enum interface namespace struct
+syn match	csStorage	"\<delegate\>"
 syn keyword	csRepeat	break continue do for foreach goto return while
 syn keyword	csConditional	else if switch
 syn keyword	csLabel	case default
-syn match	csOperatorError	display +::+
-syn match	csGlobal	display +global::+
-" user labels (see [1] 8.6 Statements)
-syn match	csLabel	display +^\s*\I\i*\s*:\%([^:]\)\@=+
-syn keyword	csModifier	abstract const extern internal override private protected public readonly sealed static virtual volatile
-syn keyword	csConstant	false null true
-syn keyword	csException	try catch finally throw when
-syn keyword	csLinq	ascending by descending equals from group in into join let on orderby select where
-syn keyword	csAsync	async await
 
-syn keyword	csUnspecifiedStatement	as base checked event fixed in is lock nameof operator out params ref sizeof stackalloc this unchecked unsafe using
-syn keyword	csUnsupportedStatement	add remove value
+syn match	csNamespaceAlias	"@\=\h\w*\ze\_s*::" display
+syn match	csGlobalNamespaceAlias	"global\ze\_s*::" display
+syn cluster	csNamespaceAlias	contains=csGlobalNamespaceAlias,csNamespaceAlias,csNamespaceAliasQualifier
+
+" user labels
+syn match	csLabel	display +^\s*\I\i*\s*:\%([^:]\)\@=+
+
+" Function pointers
+syn match	csType	"\<delegate\s*\*" contains=csOpSymbols nextgroup=csManagedModifier skipwhite skipempty
+syn keyword	csManagedModifier	managed unmanaged contained
+
+" Modifiers
+syn match	csUsingModifier	"\<global\ze\_s\+using\>"
+syn keyword	csAccessModifier	internal private protected public
+" TODO: in new out
+syn keyword	csModifier	abstract const event override readonly sealed static virtual volatile
+syn match	csModifier	"\<\%(extern\|fixed\|unsafe\)\>"
+syn match	csModifier	"\<partial\ze\_s\+\%(class\|struct\|interface\|record\|void\)\>"
+
+syn keyword	csException	try catch finally throw when
+syn keyword	csLinq	ascending by descending equals from group in into join let on orderby select
+syn match	csLinq	"\<where\>"
+
+" Type parameter constraint clause
+syn match	csStorage	"\<where\>\ze\_s\+@\=\h\w*\_s*:"
+
+" Async
+syn keyword	csAsyncModifier	async
+syn keyword	csAsyncOperator	await
+
+syn match	csStorage	"\<extern\ze\s\+alias\>"
+syn match	csStorage	"\%(\<extern\s\+\)\@16<=alias\>"
+
+syn match	csStatement	"\<\%(checked\|unchecked\|unsafe\)\ze\_s*{"
+syn match	csStatement	"\<fixed\ze\_s*("
+syn keyword	csStatement	lock
+syn match	csStatement	"\<yield\ze\_s\+\%(return\|break\)\>"
+
+syn match	csAccessor	"\<\%(get\|set\|init\|add\|remove\)\ze\_s*\%([;{]\|=>\)"
+
+syn keyword	csAccess	base
+syn match	csAccess	"\<this\>"
+
+" Extension method parameter modifier
+syn match	csModifier	"\<this\ze\_s\+@\=\h"
+
+syn keyword	csUnspecifiedStatement	as in is nameof operator out params ref sizeof stackalloc using
+syn keyword	csUnsupportedStatement	value
 syn keyword	csUnspecifiedKeyword	explicit implicit
 
-" Contextual Keywords
-syn match	csContextualStatement	/\<yield[[:space:]\n]\+\%(return\|break\)/me=s+5
-syn match	csContextualStatement	/\<partial[[:space:]\n]\+\%(class\|struct\|interface\)/me=s+7
-syn match	csContextualStatement	/\<\%(get\|set\)\%(;\|[[:space:]\n]*{\)/me=s+3
-syn match	csContextualStatement	/\<\%(get\|set\)\s*=>/me=s+3
-syn match	csContextualStatement	/\<where\>[^:]\+:/me=s+5
-
 " Operators
-syn keyword	csTypeOf	typeof contained
-syn region	csTypeOfStatement	start="typeof(" end=")" contains=csType, csTypeOf
+syn keyword	csTypeOf	typeof nextgroup=csTypeOfOperand,csTypeOfError skipwhite skipempty
+syn region	csTypeOfOperand	matchgroup=csParens start="(" end=")" contained contains=csType
+syn match       csTypeOfError               "[^([:space:]]" contained
+syn match	csKeywordOperator	"\<\%(checked\|unchecked\)\ze\_s*("
 
 " Punctuation
-syn match	csBraces	"[{}\[\]]" display
+syn match	csBraces	"[{}[\]]" display
 syn match	csParens	"[()]" display
 syn match	csOpSymbols	"+\{1,2}" display
 syn match	csOpSymbols	"-\{1,2}" display
@@ -64,128 +102,173 @@ syn match	csLogicSymbols	"&&" display
 syn match	csLogicSymbols	"||" display
 syn match	csLogicSymbols	"?" display
 syn match	csLogicSymbols	":" display
+syn match	csNamespaceAliasQualifier	"::" display
 
 " Generics
-syn region	csGeneric	matchgroup=csGenericBraces start="<" end=">" oneline contains=csType,csGeneric,csUserType,csUserIdentifier,csUserInterface,csUserMethod
+syn region	csGeneric	matchgroup=csGenericBraces start="<" end=">" oneline contains=csType,csGeneric,@csNamespaceAlias,csUserType,csUserIdentifier,csUserInterface,csUserMethod
 
 " Comments
 "
 " PROVIDES: @csCommentHook
 syn keyword	csTodo	contained TODO FIXME XXX NOTE HACK TBD
-syn region	csComment	start="/\*"  end="\*/" contains=@csCommentHook,csTodo,@Spell
-syn match	csComment	"//.*$" contains=@csCommentHook,csTodo,@Spell
+syn region	csBlockComment	start="/\*"  end="\*/" contains=@csCommentHook,csTodo,@Spell
+syn match	csLineComment	"//.*$" contains=@csCommentHook,csTodo,@Spell
+syn cluster	csComment	contains=csLineComment,csBlockComment
 
-" xml markup inside '///' comments
-syn cluster	xmlRegionHook	add=csXmlCommentLeader
-syn cluster	xmlCdataHook	add=csXmlCommentLeader
-syn cluster	xmlStartTagHook	add=csXmlCommentLeader
-syn keyword	csXmlTag	contained Libraries Packages Types Excluded ExcludedTypeName ExcludedLibraryName
-syn keyword	csXmlTag	contained ExcludedBucketName TypeExcluded Type TypeKind TypeSignature AssemblyInfo
-syn keyword	csXmlTag	contained AssemblyName AssemblyPublicKey AssemblyVersion AssemblyCulture Base
-syn keyword	csXmlTag	contained BaseTypeName Interfaces Interface InterfaceName Attributes Attribute
-syn keyword	csXmlTag	contained AttributeName Members Member MemberSignature MemberType MemberValue
-syn keyword	csXmlTag	contained ReturnValue ReturnType Parameters Parameter MemberOfPackage
-syn keyword	csXmlTag	contained ThreadingSafetyStatement Docs devdoc example overload remarks returns summary
-syn keyword	csXmlTag	contained threadsafe value internalonly nodoc exception param permission platnote
-syn keyword	csXmlTag	contained seealso b c i pre sub sup block code note paramref see subscript superscript
-syn keyword	csXmlTag	contained list listheader item term description altcompliant altmember
+syn region	csSummary	start="^\s*/// <summary" end="^\%\(\s*///\)\@!" transparent fold keepend
 
-syn cluster xmlTagHook add=csXmlTag
+" xml markup inside '///' and /**...*/ comments
+syn cluster	xmlRegionHook	add=csXmlLineCommentLeader,csXmlBlockCommentMiddle
+syn cluster	xmlCdataHook	add=csXmlLineCommentLeader,csXmlBlockCommentMiddle
+syn cluster	xmlStartTagHook	add=csXmlLineCommentLeader,csXmlBlockCommentMiddle
+syn cluster	xmlTagHook	add=csXmlTag
+syn cluster	xmlAttribHook	add=csXmlAttrib
 
-syn match	csXmlCommentLeader	"///" contained
-syn match	csXmlComment	"///.*$" contains=csXmlCommentLeader,@csXml,@Spell keepend
+" https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/xmldoc/recommended-tags
+syn keyword	csXmlTag	contained summary remarks
+syn keyword	csXmlTag	contained returns param paramref exception value
+syn keyword	csXmlTag	contained para list c code example
+syn keyword	csXmlTag	contained inheritdoc include
+syn keyword	csXmlTag	contained see seealso
+syn keyword	csXmlTag	contained typeparam typeparamref
+syn keyword	csXmlTag	contained b i u br a
+syn keyword	csXmlAttrib	contained cref href
+
+syn match	csXmlLineCommentLeader	"///" contained
+syn match	csXmlLineComment	"///.*$" contains=csXmlLineCommentLeader,@csXml,@Spell keepend
+syn match	csXmlBlockCommentMiddle	"^\s*\zs\*" contained
+syn region	csXmlBlockComment	start="/\*\*" end="\*/" contains=@csXml,@Spell,csXmlBlockCommentMiddle keepend
 syn include	@csXml syntax/xml.vim
 hi def link	xmlRegion Comment
 
 " Since syntax/xml.vim contains `syn spell toplevel`, we need to set it back to `default` here.
 syn spell default
 
-" [1] 9.5 Pre-processing directives
-syn region	csPreCondit	start="^\s*#\s*\%(define\|undef\|if\|elif\|else\|endif\|line\|error\|warning\|pragma\)\>" skip="\\$" end="$" contains=csComment keepend
-syn region	csRegion	matchgroup=csPreCondit start="^\s*#\s*region.*$" end="^\s*#\s*endregion" transparent fold contains=TOP
-syn region	csSummary	start="^\s*/// <summary" end="^\%\(\s*///\)\@!" transparent fold keepend
+" Pre-processing directives
+syn region	csPreProcDeclaration	start="^\s*\zs#\s*\%(define\|undef\)\>" end="$" contains=csLineComment keepend
+syn region	csPreProcConditional	start="^\s*\zs#\s*\%(if\|elif\)\>" end="$" contains=csLineComment keepend
+syn region	csPreProcConditional	start="^\s*\zs#\s*\%(else\|endif\)\>" end="$" contains=csLineComment keepend
+syn region	csPreProcLine	start="^\s*\zs#\s*line\>" end="$" contains=csLineComment keepend
+syn region	csPreProcDiagnostic	start="^\s*\zs#\s*\%(error\|warning\)\>" end="$"
+syn region	csPreProcConditionalSection	matchgroup=csPreProcRegion start="^\s*#\s*region\>.*" end="^\s*#\s*endregion\>.*" transparent fold contains=TOP
+syn region	csPreProcPragma	start="^\s*\zs#\s*pragma\>" end="$" contains=csLineComment keepend
+syn region	csPreProcNullable	start="^\s*\zs#\s*nullable\>" end="$" contains=csLineComment keepend
 
+if expand('%:e') == 'csx' || getline('1') =~ '^#!.*\<dotnet-script\>'
+  syn region	csPreProcInclude	start="^\s*\zs#\s*\%(load\|r\)\>" end="$" contains=csLineComment keepend
+  syn match	csShebang	"\%^#!.*" display
+endif
 
-syn region	csClassType	start="@\@1<!\<class\>"hs=s+6 end="[:\n{]"me=e-1 contains=csClass
+syn cluster	csPreProcessor	contains=csPreProc.*
+
+syn region	csClassType	start="\<class\>"hs=s+6 end=">" end="[:{]"me=e-1 contains=csClass
 " csUserType may be defined by user scripts/plugins - it should be contained in csNewType
-syn region	csNewType	start="@\@1<!\<new\>"hs=s+4 end="[;\n{(<\[]"me=e-1 contains=csNew,csUserType
+syn region	csNewType	start="\<new\>"hs=s+4 end="[;\n{(<\[]"me=e-1 contains=csNew,@csNamespaceAlias,csUserType
 syn region	csIsType	start=" is "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
 syn region	csIsType	start=" as "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
 syn keyword	csNew	new contained
 syn keyword	csClass	class contained
 syn keyword	csIsAs	is as
 
+syn keyword	csBoolean	false true
+syn keyword	csNull	null
+
 " Strings and constants
 syn match	csSpecialError	"\\." contained
 syn match	csSpecialCharError	"[^']" contained
-" [1] 9.4.4.4 Character literals
-syn match	csSpecialChar	+\\["\\'0abfnrtvx]+ contained display
-syn match	csUnicodeNumber	+\\x\x\{2,4}+ contained contains=csUnicodeSpecifier display
+" Character literals
+syn match	csSpecialChar	+\\["\\'0abfnrtv]+ contained display
+syn match	csUnicodeNumber	+\\x\x\{1,4}+ contained contains=csUnicodeSpecifier display
 syn match	csUnicodeNumber	+\\u\x\{4}+ contained contains=csUnicodeSpecifier display
-syn match	csUnicodeNumber	+\\U\x\{8}+ contained contains=csUnicodeSpecifier display
-syn match	csUnicodeSpecifier	+\\[uU]+ contained display
+syn match	csUnicodeNumber	+\\U00\x\{6}+ contained contains=csUnicodeSpecifier display
+syn match	csUnicodeSpecifier	+\\[uUx]+ contained display
 
 syn region	csString	matchgroup=csQuote start=+"+  end=+"+ end=+$+ extend contains=csSpecialChar,csSpecialError,csUnicodeNumber,@Spell
 syn match	csCharacter	"'[^']*'" contains=csSpecialChar,csSpecialCharError,csUnicodeNumber display
 syn match	csCharacter	"'\\''" contains=csSpecialChar display
 syn match	csCharacter	"'[^\\]'" display
-syn match	csNumber	"\<0[0-7]*[lL]\=\>" display
-syn match	csNumber	"\<0[xX][[:xdigit:]_]\+[lL]\=\>" display
-syn match	csNumber	"\<0[bB][01_]\+[lL]\=\>" display
-syn match	csNumber	"\<[[:digit:]_]\+[lL]\=\>" display
-syn match	csNumber	"\<[[:digit:]_]\+\.[[:digit:]_]*\%\([eE][-+]\=[[:digit:]_]\+\)\=[fFdDmM]\=" display
-syn match	csNumber	"\.[[:digit:]_]\+\%\([eE][-+]\=[[:digit:]_]\+\)\=[fFdDmM]\=" display
-syn match	csNumber	"\<[[:digit:]_]\+[eE][-+]\=[[:digit:]_]\+[fFdDmM]\=\>" display
-syn match	csNumber	"\<[[:digit:]_]\+\%\([eE][-+]\=[[:digit:]_]\+\)\=[fFdDmM]\>" display
+
+" Numbers
+syn case	ignore
+syn match	csInteger	"\<0b[01_]*[01]\%([lu]\|lu\|ul\)\=\>" display
+syn match	csInteger	"\<\d\+\%(_\+\d\+\)*\%([lu]\|lu\|ul\)\=\>" display
+syn match	csInteger	"\<0x[[:xdigit:]_]*\x\%([lu]\|lu\|ul\)\=\>" display
+syn match	csReal	"\<\d\+\%(_\+\d\+\)*\.\d\+\%(_\+\d\+\)*\%\(e[-+]\=\d\+\%(_\+\d\+\)*\)\=[fdm]\=" display
+syn match	csReal	"\.\d\+\%(_\+\d\+\)*\%(e[-+]\=\d\+\%(_\+\d\+\)*\)\=[fdm]\=\>" display
+syn match	csReal	"\<\d\+\%(_\+\d\+\)*e[-+]\=\d\+\%(_\+\d\+\)*[fdm]\=\>" display
+syn match	csReal	"\<\d\+\%(_\+\d\+\)*[fdm]\>" display
+syn case	match
+syn cluster     csNumber	contains=csInteger,csReal
 
 syn region	csInterpolatedString	matchgroup=csQuote start=+\$"+ end=+"+ extend contains=csInterpolation,csEscapedInterpolation,csSpecialChar,csSpecialError,csUnicodeNumber,@Spell
 
 syn region	csInterpolation	matchgroup=csInterpolationDelimiter start=+{+ end=+}+ keepend contained contains=@csAll,csBraced,csBracketed,csInterpolationAlign,csInterpolationFormat
 syn match	csEscapedInterpolation	"{{" transparent contains=NONE display
 syn match	csEscapedInterpolation	"}}" transparent contains=NONE display
-syn region	csInterpolationAlign	matchgroup=csInterpolationAlignDel start=+,+ end=+}+ end=+:+me=e-1 contained contains=csNumber,csConstant,csCharacter,csParens,csOpSymbols,csString,csBracketed display
+syn region	csInterpolationAlign	matchgroup=csInterpolationAlignDel start=+,+ end=+}+ end=+:+me=e-1 contained contains=@csNumber,csBoolean,csConstant,csCharacter,csParens,csOpSymbols,csString,csBracketed display
 syn match	csInterpolationFormat	+:[^}]\+}+ contained contains=csInterpolationFormatDel display
 syn match	csInterpolationAlignDel	+,+ contained display
 syn match	csInterpolationFormatDel	+:+ contained display
 
 syn region	csVerbatimString	matchgroup=csQuote start=+@"+ end=+"+ skip=+""+ extend contains=csVerbatimQuote,@Spell
 syn match	csVerbatimQuote	+""+ contained
-syn match	csQuoteError	+@$"+he=s+2,me=s+2
 
-syn region	csInterVerbString	matchgroup=csQuote start=+\$@"+ end=+"+ skip=+""+ extend contains=csInterpolation,csEscapedInterpolation,csSpecialChar,csSpecialError,csUnicodeNumber,csVerbatimQuote,@Spell
+syn region	csInterVerbString	matchgroup=csQuote start=+$@"+ start=+@$"+ end=+"+ skip=+""+ extend contains=csInterpolation,csEscapedInterpolation,csSpecialChar,csSpecialError,csUnicodeNumber,csVerbatimQuote,@Spell
+
+syn cluster	csString	contains=csString,csInterpolatedString,csVerbatimString,csInterVerbString
+
+syn cluster	csLiteral	contains=csBoolean,@csNumber,csCharacter,@csString,csNull
 
 syn region	csBracketed	matchgroup=csParens start=+(+ end=+)+ extend contained transparent contains=@csAll,csBraced,csBracketed
 syn region	csBraced	matchgroup=csParens start=+{+ end=+}+ extend contained transparent contains=@csAll,csBraced,csBracketed
 
-syn cluster	csAll	contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csType,csUnicodeNumber,csUnicodeSpecifier,csInterpolatedString,csVerbatimString,csInterVerbString,csUserType,csUserIdentifier,csUserInterface,csUserMethod
+syn cluster	csAll	contains=@csLiteral,csClassType,@csComment,csEndColon,csIsType,csLabel,csLogicSymbols,csNewType,csOpSymbols,csParens,@csPreProcessor,csSummary,@csNamespaceAlias,csType,csUnicodeNumber,csUserType,csUserIdentifier,csUserInterface,csUserMethod
+
+" Keyword identifiers
+syn match csIdentifier "@\h\w*"
 
 " The default highlighting.
-hi def link	csType	Type
-hi def link	csClassType	Type
-hi def link	csIsType	Type
-hi def link	csStorage	Structure
-hi def link	csClass	Structure
-hi def link	csRepeat	Repeat
-hi def link	csConditional	Conditional
-hi def link	csLabel	Label
-hi def link	csModifier	StorageClass
-hi def link	csConstant	Constant
-hi def link	csException	Exception
-hi def link	csTypeOf	Keyword
-hi def link	csTypeOfStatement	Typedef
 hi def link	csUnspecifiedStatement	Statement
 hi def link	csUnsupportedStatement	Statement
 hi def link	csUnspecifiedKeyword	Keyword
+
+hi def link	csGlobalNamespaceAlias	Include
+
+hi def link	csType	Type
+hi def link	csClassType	Type
+hi def link	csIsType	Type
+
+hi def link	csStorage	Structure
+hi def link	csClass	Structure
 hi def link	csNew	Statement
-hi def link	csLinq	Statement
 hi def link	csIsAs 	Keyword
-hi def link	csAsync	Keyword
-hi def link	csContextualStatement	Statement
-hi def link	csOperatorError	Error
+hi def link	csAccessor	Keyword
+hi def link	csAccess	Keyword
+
+hi def link	csLinq	Statement
+
+hi def link	csStatement	Statement
+hi def link	csRepeat	Repeat
+hi def link	csConditional	Conditional
+hi def link	csLabel	Label
+hi def link	csException	Exception
+
+hi def link	csModifier	StorageClass
+hi def link	csAccessModifier	csModifier
+hi def link	csAsyncModifier	csModifier
+hi def link	csManagedModifier	csModifier
+hi def link	csUsingModifier	csModifier
 
 hi def link	csTodo	Todo
 hi def link	csComment	Comment
+hi def link	csLineComment	csComment
+hi def link	csBlockComment	csComment
 
+hi def link	csKeywordOperator	Keyword
+hi def link	csAsyncOperator	csKeywordOperator
+hi def link	csTypeOf	csKeywordOperator
+hi def link	csTypeOfOperand	Typedef
+hi def link	csTypeOfError	Error
 hi def link	csOpSymbols	Operator
 hi def link	csLogicSymbols	Operator
 
@@ -193,15 +276,29 @@ hi def link	csSpecialError	Error
 hi def link	csSpecialCharError	Error
 hi def link	csString	String
 hi def link	csQuote	String
-hi def link	csQuoteError	Error
 hi def link	csInterpolatedString	String
 hi def link	csVerbatimString	String
 hi def link	csInterVerbString	String
 hi def link	csVerbatimQuote	SpecialChar
-hi def link	csPreCondit	PreCondit
+
+hi def link     csPreProc	PreProc
+hi def link	csPreProcDeclaration	Define
+hi def link	csPreProcConditional	PreCondit
+hi def link	csPreProcLine	csPreProc
+hi def link	csPreProcDiagnostic	csPreProc
+hi def link	csPreProcRegion	csPreProc
+hi def link	csPreProcPragma	csPreProc
+hi def link	csPreProcNullable	csPreProc
+hi def link	csPreProcInclude	csPreProc
+hi def link	csShebang	csPreProc
+
+hi def link	csConstant	Constant
+hi def link	csNull	Constant
+hi def link	csBoolean	Boolean
 hi def link	csCharacter	Character
 hi def link	csSpecialChar	SpecialChar
-hi def link	csNumber	Number
+hi def link	csInteger	Number
+hi def link	csReal	Float
 hi def link	csUnicodeNumber	SpecialChar
 hi def link	csUnicodeSpecifier	SpecialChar
 hi def link	csInterpolationDelimiter	Delimiter
@@ -212,9 +309,12 @@ hi def link	csInterpolationFormatDel	csInterpolationDelimiter
 hi def link	csGenericBraces	csBraces
 
 " xml markup
-hi def link	csXmlCommentLeader	Comment
-hi def link	csXmlComment	Comment
+hi def link	csXmlLineCommentLeader	Comment
+hi def link	csXmlLineComment	Comment
+hi def link	csXmlBlockComment	Comment
+hi def link	csXmlBlockCommentMiddle	csXmlBlockComment
 hi def link	csXmlTag	Statement
+hi def link	csXmlAttrib	Statement
 
 let b:current_syntax = 'cs'
 

runtime/syntax/dirpager.vim

@@ -6,7 +6,7 @@
 " Description:	  display directory content inside Vim with syntax
 "		  highlighting
 " File:		  runtime/syntax/dirpager.vim
-" Last Change:	  2012 May 19
+" Last Change:	  2022 Jun 14
 " Modeline:	  vim: ts=8:sw=2:sts=2:
 "
 " Credits:	  dirpager.vim is derived from Nikolai Weibulls dircolors.vim

runtime/syntax/doxygen.vim

@@ -498,12 +498,16 @@ endif
 
     syn match doxygenLeadingWhite +\(^\s*\*\)\@<=\s*+ contained
 
-    " This is still a proposal, but won't do any harm.
-    aug doxygengroup
-    au!
-    au Syntax UserColor_reset nested call s:Doxygen_Hilights_Base()
-    au Syntax UserColor_{on,reset,enable} nested call s:Doxygen_Hilights()
-    aug END
+    " This is still a proposal, but it is probably fine.  However, it doesn't
+    " work when 'syntax' is set in a modeline, catch the security error.
+    try
+      aug doxygengroup
+        au!
+        au Syntax UserColor_reset nested call s:Doxygen_Hilights_Base()
+        au Syntax UserColor_{on,reset,enable} nested call s:Doxygen_Hilights()
+      aug END
+    catch /E12:/
+    endtry
 
 
     SynLink doxygenBody                   Comment

runtime/syntax/dts.vim

@@ -1,11 +1,12 @@
 " Vim syntax file
 " Language:	dts/dtsi (device tree files)
 " Maintainer:	Daniel Mack <vim@zonque.org>
-" Last Change:	2021 May 15
+" Last Change:	2022 Jun 14
 
 if exists("b:current_syntax")
   finish
 endif
+let b:current_syntax = 'dts'
 
 syntax region dtsComment        start="/\*"  end="\*/"
 syntax match  dtsReference      "&[[:alpha:][:digit:]_]\+"

runtime/syntax/i3config.vim

@@ -3,7 +3,7 @@
 " Original Author: Mohamed Boughaba <mohamed dot bgb at gmail dot com>
 " Maintainer: Quentin Hibon (github user hiqua)
 " Version: 0.4
-" Last Change: 2022 May 05
+" Last Change: 2022 Jun 05
 
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
@@ -17,9 +17,6 @@ endif
 
 scriptencoding utf-8
 
-" Error
-syn match i3ConfigError /.*/
-
 " Todo
 syn keyword i3ConfigTodo TODO FIXME XXX contained
 
@@ -180,13 +177,12 @@ syn match i3ConfigDrawingMarks /^\s*show_marks\s\+\(yes\|no\)\s\?$/ contains=i3C
 
 " Group mode/bar
 syn keyword i3ConfigBlockKeyword mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_min_width workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained
-syn region i3ConfigBlock start=+.*s\?{$+ end=+^}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend
+syn region i3ConfigBlock start=+^\s*[^#]*s\?{$+ end=+^\s*[^#]*}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend
 
 " Line continuation
 syn region i3ConfigLineCont start=/^.*\\$/ end=/^.*$/ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend
 
 " Define the highlighting.
-hi def link i3ConfigError                           Error
 hi def link i3ConfigTodo                            Todo
 hi def link i3ConfigComment                         Comment
 hi def link i3ConfigFontContent                     Type

runtime/syntax/icon.vim

@@ -1,199 +1,211 @@
 " Vim syntax file
-" Language:	Icon
-" Maintainer:	Wendell Turner <wendell@adsi-m4.com>
-" URL:		ftp://ftp.halcyon.com/pub/users/wturner/icon.vim
-" Last Change:	2003 May 11
+" Language:		Icon
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Wendell Turner <wendell@adsi-m4.com> (invalid last known address)
+" Last Change:		2022 Jun 16
+" Contributor:		eschen@alumni.princeton.edu 2002.09.18
 
-" quit when a syntax file was already loaded
+" Prelude {{{1
 if exists("b:current_syntax")
   finish
 endif
 
-syn keyword  iconFunction   abs acos any args asin atan bal
-syn keyword  iconFunction   callout center char chdir close collect copy
-syn keyword  iconFunction   cos cset delay delete detab display dtor
-syn keyword  iconFunction   entab errorclear exit exp find flush function
-syn keyword  iconFunction   get getch getche getenv iand icom image
-syn keyword  iconFunction   insert integer ior ishift ixor kbhit key
-syn keyword  iconFunction   left list loadfunc log many map match
-syn keyword  iconFunction   member move name numeric open ord pop
-syn keyword  iconFunction   pos proc pull push put read reads
-syn keyword  iconFunction   real remove rename repl reverse right rtod
-syn keyword  iconFunction   runerr save seek seq set sin sort
-syn keyword  iconFunction   sortf sqrt stop string system tab table
-syn keyword  iconFunction   tan trim type upto variable where write writes
+syn iskeyword @,48-57,_,192-255,&
 
-" Keywords
-syn match iconKeyword "&allocated"
-syn match iconKeyword "&ascii"
-syn match iconKeyword "&clock"
-syn match iconKeyword "&collections"
-syn match iconKeyword "&cset"
-syn match iconKeyword "&current"
-syn match iconKeyword "&date"
-syn match iconKeyword "&dateline"
-syn match iconKeyword "&digits"
-syn match iconKeyword "&dump"
-syn match iconKeyword "&e"
-syn match iconKeyword "&error"
-syn match iconKeyword "&errornumber"
-syn match iconKeyword "&errortext"
-syn match iconKeyword "&errorvalue"
-syn match iconKeyword "&errout"
-syn match iconKeyword "&fail"
-syn match iconKeyword "&features"
-syn match iconKeyword "&file"
-syn match iconKeyword "&host"
-syn match iconKeyword "&input"
-syn match iconKeyword "&lcase"
-syn match iconKeyword "&letters"
-syn match iconKeyword "&level"
-syn match iconKeyword "&line"
-syn match iconKeyword "&main"
-syn match iconKeyword "&null"
-syn match iconKeyword "&output"
-syn match iconKeyword "&phi"
-syn match iconKeyword "&pi"
-syn match iconKeyword "&pos"
-syn match iconKeyword "&progname"
-syn match iconKeyword "&random"
-syn match iconKeyword "&regions"
-syn match iconKeyword "&source"
-syn match iconKeyword "&storage"
-syn match iconKeyword "&subject"
-syn match iconKeyword "&time"
-syn match iconKeyword "&trace"
-syn match iconKeyword "&ucase"
-syn match iconKeyword "&version"
+" Not Top {{{1
+syn cluster iconNotTop contains=iconDocField,iconIncluded,iconStringSpecial,iconTodo,@Spell
 
-" Reserved words
-syn keyword iconReserved break by case create default do
-syn keyword iconReserved else end every fail if
-syn keyword iconReserved initial link next not of
-syn keyword iconReserved procedure repeat return suspend
-syn keyword iconReserved then to until while
-
-" Storage class reserved words
-syn keyword	iconStorageClass	global static local record
-
-syn keyword	iconTodo	contained TODO FIXME XXX BUG
-
-" String and Character constants
-" Highlight special characters (those which have a backslash) differently
-syn match iconSpecial contained "\\x\x\{2}\|\\\o\{3\}\|\\[bdeflnrtv\"\'\\]\|\\^c[a-zA-Z0-9]\|\\$"
-syn region	iconString	start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=iconSpecial
-syn region	iconCset	start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=iconSpecial
-syn match	iconCharacter	"'[^\\]'"
-
-" not sure about these
-"syn match	iconSpecialCharacter "'\\[bdeflnrtv]'"
-"syn match	iconSpecialCharacter "'\\\o\{3\}'"
-"syn match	iconSpecialCharacter "'\\x\x\{2}'"
-"syn match	iconSpecialCharacter "'\\^c\[a-zA-Z0-9]'"
-
-"when wanted, highlight trailing white space
+" Whitespace errors {{{1
 if exists("icon_space_errors")
-  syn match	iconSpaceError	"\s*$"
-  syn match	iconSpaceError	" \+\t"me=e-1
+  if !exists("icon_no_trail_space_error")
+    syn match iconSpaceError "\s\+$"       display excludenl
+  endif
+  if !exists("icon_no_tab_space_error")
+    syn match iconSpaceError " \+\t"me=e-1 display
+  endif
 endif
 
-"catch errors caused by wrong parenthesis
-syn cluster	iconParenGroup contains=iconParenError,iconIncluded,iconSpecial,iconTodo,iconUserCont,iconUserLabel,iconBitField
+" Reserved words {{{1
+syn keyword iconReserved break by case create default do else every fail if
+syn keyword iconReserved initial next not of repeat return suspend then to
+syn keyword iconReserved until while
 
-syn region	iconParen	transparent start='(' end=')' contains=ALLBUT,@iconParenGroup
-syn match	iconParenError	")"
-syn match	iconInParen	contained "[{}]"
+syn keyword iconStorageClass global static local record invocable
 
+syn keyword iconLink link
 
+" Procedure definitions {{{1
+if exists("icon_no_procedure_fold")
+  syn region iconProcedure matchgroup=iconReserved start="\<procedure\>" end="\<end\>" contains=ALLBUT,@iconNotTop
+else
+  syn region iconProcedure matchgroup=iconReserved start="\<procedure\>" end="\<end\>" contains=ALLBUT,@iconNotTop fold
+endif
+
+" Keywords {{{1
+syn keyword iconKeyword &allocated &ascii &clock &collections &cset &current
+syn keyword iconKeyword &date &dateline &digits &dump &e &error &errornumber
+syn keyword iconKeyword &errortext &errorvalue &errout &fail &features &file
+syn keyword iconKeyword &host &input &lcase &letters &level &line &main &null
+syn keyword iconKeyword &output &phi &pi &pos &progname &random &regions
+syn keyword iconKeyword &source &storage &subject &time &trace &ucase &version
+
+" Graphics keywords
+syn keyword iconKeyword &col &control &interval &ldrag &lpress &lrelease
+syn keyword iconKeyword &mdrag &meta &mpress &mrelease &rdrag &resize &row
+syn keyword iconKeyword &rpress &rrelease &shift &window &x &y
+
+" Functions {{{1
+syn keyword iconFunction abs acos any args asin atan bal callout center char
+syn keyword iconFunction chdir close collect copy cos cset delay delete detab
+syn keyword iconFunction display dtor entab errorclear exit exp find flush
+syn keyword iconFunction function get getch getche getenv iand icom image
+syn keyword iconFunction insert integer ior ishift ixor kbhit key left list
+syn keyword iconFunction loadfunc log many map match member move name numeric
+syn keyword iconFunction open ord pop pos proc pull push put read reads real
+syn keyword iconFunction remove rename repl reverse right rtod runerr save
+syn keyword iconFunction seek self seq serial set sin sort sortf sqrt stop
+syn keyword iconFunction string system tab table tan trim type upto variable
+syn keyword iconFunction where write writes
+
+" Graphics functions
+syn keyword iconFunction Active Alert Bg CenterString Clip Clone Color
+syn keyword iconFunction ColorDialog ColorValue CopyArea Couple DrawArc
+syn keyword iconFunction DrawCircle DrawCurve DrawImage DrawLine DrawPoint
+syn keyword iconFunction DrawPolygon DrawRectangle DrawSegment DrawString
+syn keyword iconFunction Enqueue EraseArea Event Fg FillArc FillCircle
+syn keyword iconFunction FillPolygon FillRectangle Font FreeColor GotoRC
+syn keyword iconFunction GotoXY LeftString Lower NewColor Notice OpenDialog
+syn keyword iconFunction PaletteChars PaletteColor PaletteGrays PaletteKey
+syn keyword iconFunction Pattern Pending Pixel Raise ReadImage RightString
+syn keyword iconFunction SaveDialog SelectDialog Shade TextDialog TextWidth
+syn keyword iconFunction ToggleDialog Uncouple WAttrib WClose WDefault WDelay
+syn keyword iconFunction WDone WFlush WOpen WQuit WRead WReads WriteImage
+syn keyword iconFunction WSync WWrite WWrites
+
+" String and character constants {{{1
+syn match  iconStringSpecial "\\x\x\{2}\|\\\o\{3\}\|\\[bdeflnrtv\"\'\\]\|\\^[a-zA-Z0-9]" contained 
+syn match  iconStringSpecial "\\$"							 contained
+syn match  iconStringSpecial "_\ze\s*$"						         contained
+
+syn region iconString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=iconStringSpecial
+syn region iconCset   start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=iconStringSpecial
+
+" Bracket errors {{{1
+
+if !exists("icon_no_bracket_errors")
+  " catch errors caused by wrong brackets (ACE 2002.09.18)
+  syn cluster iconBracketGroup contains=iconBracketError,iconIncluded
+  syn region  iconBracket      start='\[' end='\]' contains=ALLBUT,@iconBracketGroup,@iconNotTop transparent 
+  syn match   iconBracketError "]"
+  
+  "catch errors caused by wrong braces (ACE 2002.09.18)
+  syn cluster iconBraceGroup contains=iconBraceError,iconIncluded
+  syn region  iconBrace	     start='{' end='}' contains=ALLBUT,@iconBraceGroup,@iconNotTop transparent 
+  syn match   iconBraceError "}"
+  
+  "catch errors caused by wrong parenthesis
+  syn cluster iconParenGroup contains=iconParenError,iconIncluded
+  syn region  iconParen	     start='(' end=')' contains=ALLBUT,@iconParenGroup,@iconNotTop transparent 
+  syn match   iconParenError ")"
+end
+
+" Numbers {{{1
 syn case ignore
 
-"integer number, or floating point number without a dot
-syn match	iconNumber		"\<\d\+\>"
+" integer
+syn match iconInteger "\<\d\+\>"
+syn match iconInteger "\<\d\{1,2}[rR][a-zA-Z0-9]\+\>"
 
-"floating point number, with dot, optional exponent
-syn match	iconFloat		"\<\d\+\.\d*\(e[-+]\=\d\+\)\=\>"
+" real with trailing dot
+syn match iconReal    "\<\d\+\."
 
-"floating point number, starting with a dot, optional exponent
-syn match	iconFloat		"\.\d\+\(e[-+]\=\d\+\)\=\>"
+" real, with dot, optional exponent
+syn match iconReal    "\<\d\+\.\d*\%(e[-+]\=\d\+\)\=\>"
 
-"floating point number, without dot, with exponent
-syn match	iconFloat		"\<\d\+e[-+]\=\d\+\>"
+" real, with leading dot, optional exponent
+syn match iconReal    "\.\d\+\%(e[-+]\=\d\+\)\=\>"
 
-"radix number
-syn match	iconRadix		"\<\d\{1,2}[rR][a-zA-Z0-9]\+\>"
+" real, without dot, with exponent
+syn match iconReal    "\<\d\+e[-+]\=\d\+\>"
 
-
-" syn match iconIdentifier	"\<[a-z_][a-z0-9_]*\>"
+syn cluster iconNumber contains=iconInteger,iconReal
 
 syn case match
 
-" Comment
-syn match	iconComment	"#.*" contains=iconTodo,iconSpaceError
+" Comments {{{1
+syn keyword iconTodo	 TODO FIXME XXX BUG contained
+syn match   iconComment	 "#.*" contains=iconTodo,iconSpaceError,@Spell
+syn match   iconDocField "^#\s\+\zs\%(File\|Subject\|Authors\=\|Date\|Version\|Links\|Requires\|See also\):" contained
 
-syn region	iconPreCondit start="^\s*$\s*\(if\>\|ifdef\>\|ifndef\>\|elif\>\|else\>\|endif\>\)" skip="\\$" end="$" contains=iconComment,iconString,iconCharacter,iconNumber,iconCommentError,iconSpaceError
+if exists("icon_no_comment_fold")
+  syn region iconDocumentation	  start="\%^#\{2,}\%(\n#\+\%(\s\+.*\)\=\)\+"   end="^#\+\n\s*$"		  contains=iconDocField keepend
+else
+  syn region iconMultilineComment start="^\s*#.*\n\%(^\s*#\)\@=" end="^\s*#.*\n\%(^\s*#\)\@!" contains=iconComment  keepend fold transparent 
+  syn region iconDocumentation	  start="\%^#\{2,}\%(\n#\)\+"	 end="^#\+\n\%([^#]\|$\)"     contains=iconDocField keepend fold
+endif
 
-syn region	iconIncluded	contained start=+"+ skip=+\\\\\|\\"+ end=+"+
-syn match	iconIncluded	contained "<[^>]*>"
-syn match	iconInclude	"^\s*$\s*include\>\s*["<]" contains=iconIncluded
-"syn match iconLineSkip	"\\$"
+" Preprocessor {{{1
+syn match iconPreInclude  '^\s*\zs$\s*include\>\ze\s*"' nextgroup=iconIncluded skipwhite
+syn match iconIncluded '"[^"]\+"' contained
 
-syn cluster	iconPreProcGroup contains=iconPreCondit,iconIncluded,iconInclude,iconDefine,iconInParen,iconUserLabel
+syn region iconPreDefine      start="^\s*\zs$\s*\%(define\|undef\)\>"			     end="$" oneline contains=ALLBUT,@iconPreGroup
+syn region iconPreProc	      start="^\s*\zs$\s*\%(error\|line\)\>"			     end="$" oneline contains=ALLBUT,@iconPreGroup
+syn region iconPreConditional start="^\s*\zs$\s*\%(if\|ifdef\|ifndef\|elif\|else\|endif\)\>" end="$" oneline contains=iconComment,iconString,iconCset,iconNumber,iconSpaceError
 
-syn region	iconDefine	start="^\s*$\s*\(define\>\|undef\>\)" skip="\\$" end="$" contains=ALLBUT,@iconPreProcGroup
+syn cluster iconPreGroup contains=iconPreCondit,iconPreInclude,iconIncluded,iconPreDefine
 
-"wt:syn region	iconPreProc "start="^\s*#\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" "end="$" contains=ALLBUT,@iconPreProcGroup
-
-" Highlight User Labels
-
-" syn cluster	iconMultiGroup contains=iconIncluded,iconSpecial,iconTodo,iconUserCont,iconUserLabel,iconBitField
+syn match   iconPreSymbol "_V\d\+"
+syn keyword iconPreSymbol _ACORN _AMIGA _ARM_FUNCTIONS _ASCII _CALLING
+syn keyword iconPreSymbol _CO_EXPRESSIONS _COMPILED _DIRECT_EXECUTION
+syn keyword iconPreSymbol _DOS_FUNCTIONS _EBCDIC _EVENT_MONITOR
+syn keyword iconPreSymbol _EXECUTABLE_IMAGES _EXTERNAL_FUNCTIONS
+syn keyword iconPreSymbol _EXTERNAL_VALUES _INTERPRETED _KEYBOARD_FUNCTIONS
+syn keyword iconPreSymbol _LARGE_INTEGERS _MACINTOSH _MEMORY_MONITOR _MSDOS
+syn keyword iconPreSymbol _MSDOS_386 _MULTIREGION _MULTITASKING _OS2 _PIPES
+syn keyword iconPreSymbol _PORT _PRESENTATION_MGR _RECORD_IO _STRING_INVOKE
+syn keyword iconPreSymbol _SYSTEM_FUNCTION _UNIX _VISUALIZATION _VMS
+syn keyword iconPreSymbol _WINDOW_FUNCTIONS _X_WINDOW_SYSTEM 
 
+" Syncing {{{1
 if !exists("icon_minlines")
-  let icon_minlines = 15
+  let icon_minlines = 250
 endif
 exec "syn sync ccomment iconComment minlines=" . icon_minlines
 
-" Define the default highlighting.
+" Default Highlighting  {{{1
 
-" Only when an item doesn't have highlighting
+hi def link iconParenError	iconError
+hi def link iconBracketError	iconError
+hi def link iconBraceError	iconError
+hi def link iconSpaceError	iconError
+hi def link iconError		Error
 
-" The default methods for highlighting.  Can be overridden later
+hi def link iconInteger		Number
+hi def link iconReal		Float
+hi def link iconString		String
+hi def link iconCset		String
+hi def link iconStringSpecial	SpecialChar
 
-" hi def link iconSpecialCharacter	iconSpecial
-
-hi def link iconOctalError		iconError
-hi def link iconParenError		iconError
-hi def link iconInParen		iconError
-hi def link iconCommentError	iconError
-hi def link iconSpaceError		iconError
-hi def link iconCommentError	iconError
-hi def link iconIncluded		iconString
-hi def link iconCommentString	iconString
-hi def link iconComment2String	iconString
-hi def link iconCommentSkip	iconComment
-
-hi def link iconUserLabel		Label
-hi def link iconCharacter		Character
-hi def link iconNumber			Number
-hi def link iconRadix			Number
-hi def link iconFloat			Float
-hi def link iconInclude		Include
 hi def link iconPreProc		PreProc
-hi def link iconDefine			Macro
-hi def link iconError			Error
-hi def link iconStatement		Statement
-hi def link iconPreCondit		PreCondit
-hi def link iconString			String
-hi def link iconCset			String
-hi def link iconComment		Comment
-hi def link iconSpecial		SpecialChar
-hi def link iconTodo			Todo
+hi def link iconIncluded	iconString
+hi def link iconPreInclude	Include
+hi def link iconPreSymbol	iconPreProc
+hi def link iconPreDefine	Define
+hi def link iconPreConditional	PreCondit
+
+hi def link iconStatement	Statement
 hi def link iconStorageClass	StorageClass
-hi def link iconFunction		Statement
-hi def link iconReserved		Label
-hi def link iconKeyword		Operator
-
-"hi def link iconIdentifier	Identifier
+hi def link iconFunction	Function
+hi def link iconReserved	Label
+hi def link iconLink		Include
+hi def link iconKeyword		Keyword
 
+hi def link iconComment		Comment
+hi def link iconTodo		Todo
+hi def link iconDocField	SpecialComment
+hi def link iconDocumentation	Comment
 
+" Postscript  {{{1
 let b:current_syntax = "icon"
 
+" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:

runtime/syntax/initng.vim

@@ -20,7 +20,6 @@ endif
 syn case match
 
 let is_bash = 1
-unlet! b:current_syntax
 syn include @shTop syntax/sh.vim
 
 syn region	initngService			matchgroup=initngServiceHeader start="^\s*\(service\|virtual\|daemon\|class\|cron\)\s\+\(\(\w\|[-/*]\)\+\(\s\+:\s\+\(\w\|[-/*]\)\+\)\?\)\s\+{" end="}" contains=@initngServiceCluster