patch 9.0.0347: MS-Windows: cannot set cursor shape in Windows Terminal

Problem:    MS-Windows: cannot set cursor shape in Windows Terminal.
Solution:   Make cursor shape work with Windows Terminal. (Ken Takata,
            closes #11028, closes #6576)

.github/CODEOWNERS

@@ -120,6 +120,8 @@ runtime/ftplugin/fpcmake.vim		@dkearns
 runtime/ftplugin/freebasic.vim		@dkearns
 runtime/ftplugin/fstab.vim		@rid9
 runtime/ftplugin/gdb.vim		@xeyownt
+runtime/ftplugin/gdscript.vim		@habamax
+runtime/ftplugin/gdshader.vim		@habamax
 runtime/ftplugin/git.vim		@tpope
 runtime/ftplugin/gitcommit.vim		@tpope
 runtime/ftplugin/gitconfig.vim		@tpope
@@ -211,6 +213,7 @@ runtime/indent/eterm.vim		@dkearns
 runtime/indent/falcon.vim		@steveno
 runtime/indent/framescript.vim		@dkearns
 runtime/indent/freebasic.vim		@dkearns
+runtime/indent/gdscript.vim		@habamax
 runtime/indent/gitconfig.vim		@tpope
 runtime/indent/gitolite.vim		@sitaramc
 runtime/indent/go.vim			@dbarnett
@@ -314,6 +317,9 @@ runtime/syntax/forth.vim		@jkotlinski
 runtime/syntax/fpcmake.vim		@dkearns
 runtime/syntax/freebasic.vim		@dkearns
 runtime/syntax/fstab.vim		@rid9
+runtime/syntax/gdresource.vim		@habamax
+runtime/syntax/gdscript.vim		@habamax
+runtime/syntax/gdshader.vim		@habamax
 runtime/syntax/git.vim			@tpope
 runtime/syntax/gitcommit.vim		@tpope
 runtime/syntax/gitconfig.vim		@tpope
@@ -326,7 +332,7 @@ runtime/syntax/groff.vim		@jmarshall
 runtime/syntax/haml.vim			@tpope
 runtime/syntax/haskell.vim		@coot
 runtime/syntax/hgcommit.vim		@k-takata
-runtime/syntax/html.vim		@dkearns
+runtime/syntax/html.vim			@dkearns
 runtime/syntax/i3config.vim		@hiqua
 runtime/syntax/icon.vim			@dkearns
 runtime/syntax/indent.vim		@dkearns

.github/workflows/ci.yml

@@ -14,14 +14,14 @@ concurrency:
 
 jobs:
   linux:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     env:
       CC: ${{ matrix.compiler }}
       TEST: test
       SRCDIR: ./src
       LEAK_CFLAGS: -DEXITFREE
-      CFLAGS: -Wno-error=deprecated-declarations
+      CFLAGS: -Wno-deprecated-declarations
       LOG_DIR: ${{ github.workspace }}/logs
       TERM: xterm
       DISPLAY: ':99'
@@ -167,11 +167,6 @@ jobs:
             # Use llvm-cov instead of gcov when compiler is clang.
             ln -fs /usr/bin/llvm-cov ${HOME}/bin/gcov
           fi
-          # Setup lua5.3 manually since its package doesn't provide alternative.
-          # https://bugs.launchpad.net/ubuntu/+source/lua5.3/+bug/1707212
-          if [[ ${CONFOPT} =~ luainterp ]]; then
-            sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3 10
-          fi
           sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
           sudo usermod -a -G audio "${USER}"
           sudo bash ci/setup-xvfb.sh
@@ -268,7 +263,7 @@ jobs:
           done
 
   # coveralls:
-  #   runs-on: ubuntu-18.04
+  #   runs-on: ubuntu-20.04
   #
   #   needs: linux
   #   if: always() && github.event_name != 'pull_request'

.github/workflows/coverity.yml

@@ -6,10 +6,11 @@ on:
 
 jobs:
   scan:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     env:
       CC: gcc
+      CFLAGS: -Wno-deprecated-declarations
       DEBIAN_FRONTEND: noninteractive
 
     steps:
@@ -50,12 +51,6 @@ jobs:
           echo "CONFOPT=--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
           ) >> $GITHUB_ENV
 
-      - name: Set up system
-        run: |
-          # Setup lua5.3 manually since its package doesn't provide alternative.
-          # https://bugs.launchpad.net/ubuntu/+source/lua5.3/+bug/1707212
-          sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3 10
-
       - name: Configure
         run: |
           ./configure --with-features=huge ${CONFOPT} --enable-fail-if-missing

.gitignore

@@ -82,6 +82,7 @@ src/testdir/dostmp/*
 src/testdir/messages
 src/testdir/viminfo
 src/testdir/opt_test.vim
+src/testdir/failed
 runtime/indent/testdir/*.out
 runtime/indent/testdir/*.fail
 src/memfile_test

Filelist

@@ -814,6 +814,8 @@ RT_SCRIPTS =	\
 		runtime/plugin/README.txt \
 		runtime/syntax/*.vim \
 		runtime/syntax/README.txt \
+		runtime/syntax/shared/*.vim \
+		runtime/syntax/shared/README.txt \
 
 # Unix runtime
 RT_UNIX =	\

nsis/gvim.nsi

@@ -366,11 +366,7 @@ Section "$(str_section_exe)" id_section_exe
 	File ${VIMTOOLS}\winpty-agent.exe
 
 	SetOutPath $0\colors
-	File ${VIMRT}\colors\*.*
-	SetOutPath $0\colors\tools
-	File ${VIMRT}\colors\tools\*.*
-	SetOutPath $0\colors\lists
-	File ${VIMRT}\colors\lists\*.*
+	File /r ${VIMRT}\colors\*.*
 
 	SetOutPath $0\compiler
 	File ${VIMRT}\compiler\*.*
@@ -395,13 +391,7 @@ Section "$(str_section_exe)" id_section_exe
 	File ${VIMRT}\plugin\*.*
 
 	SetOutPath $0\autoload
-	File ${VIMRT}\autoload\*.*
-
-	SetOutPath $0\autoload\dist
-	File ${VIMRT}\autoload\dist\*.*
-
-	SetOutPath $0\autoload\xml
-	File ${VIMRT}\autoload\xml\*.*
+	File /r ${VIMRT}\autoload\*.*
 
 	SetOutPath $0\import\dist
 	File ${VIMRT}\import\dist\*.*
@@ -410,7 +400,7 @@ Section "$(str_section_exe)" id_section_exe
 	File ${VIMSRC}\vim.ico
 
 	SetOutPath $0\syntax
-	File ${VIMRT}\syntax\*.*
+	File /r ${VIMRT}\syntax\*.*
 
 	SetOutPath $0\spell
 	File ${VIMRT}\spell\*.txt

runtime/autoload/context.vim

@@ -1,184 +1,95 @@
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2016 Oct 21
+vim9script
 
-let s:keepcpo= &cpo
-set cpo&vim
+# Language:           ConTeXt typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision:    2022 Aug 12
 
-" Helper functions {{{
-function! s:context_echo(message, mode)
-  redraw
-  echo "\r"
-  execute 'echohl' a:mode
-  echomsg '[ConTeXt]' a:message
-  echohl None
-endf
+# Typesetting {{{
+import autoload './typeset.vim'
 
-function! s:sh()
-  return has('win32') || has('win64') || has('win16') || has('win95')
-        \ ? ['cmd.exe', '/C']
-        \ : ['/bin/sh', '-c']
-endfunction
+export def ConTeXtCmd(path: string): list<string>
+  return ['mtxrun', '--script', 'context', '--nonstopmode', '--autogenerate', path]
+enddef
 
-" For backward compatibility
-if exists('*win_getid')
+export def Typeset(bufname: string, env = {}, Cmd = ConTeXtCmd): bool
+  return typeset.TypesetBuffer(bufname, Cmd, env, 'ConTeXt')
+enddef
 
-  function! s:win_getid()
-    return win_getid()
-  endf
+export def JobStatus()
+  typeset.JobStatus('ConTeXt')
+enddef
 
-  function! s:win_id2win(winid)
-    return win_id2win(a:winid)
-  endf
+export def StopJobs()
+  typeset.StopJobs('ConTeXt')
+enddef
 
-else
+export def Log(bufname: string)
+  execute 'edit' typeset.LogPath(bufname)
+enddef
+# }}}
 
-  function! s:win_getid()
-    return winnr()
-  endf
+# Completion {{{
+def BinarySearch(base: string, keywords: list<string>): list<string>
+  const pat = '^' .. base
+  const len = len(keywords)
+  var res = []
+  var lft = 0
+  var rgt = len
 
-  function! s:win_id2win(winnr)
-    return a:winnr
-  endf
-
-endif
-" }}}
-
-" ConTeXt jobs {{{
-if has('job')
-
-  let g:context_jobs = []
-
-  " Print the status of ConTeXt jobs
-  function! context#job_status()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    let l:n = len(l:jobs)
-    call s:context_echo(
-          \ 'There '.(l:n == 1 ? 'is' : 'are').' '.(l:n == 0 ? 'no' : l:n)
-          \ .' job'.(l:n == 1 ? '' : 's').' running'
-          \ .(l:n == 0 ? '.' : ' (' . join(l:jobs, ', ').').'),
-          \ 'ModeMsg')
-  endfunction
-
-  " Stop all ConTeXt jobs
-  function! context#stop_jobs()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    for job in l:jobs
-      call job_stop(job)
-    endfor
-    sleep 1
-    let l:tmp = []
-    for job in l:jobs
-      if job_status(job) == "run"
-        call add(l:tmp, job)
-      endif
-    endfor
-    let g:context_jobs = l:tmp
-    if empty(g:context_jobs)
-      call s:context_echo('Done. No jobs running.', 'ModeMsg')
+  # Find the leftmost index matching base
+  while lft < rgt
+    var i = (lft + rgt) / 2
+    if keywords[i] < base
+      lft = i + 1
     else
-      call s:context_echo('There are still some jobs running. Please try again.', 'WarningMsg')
+      rgt = i
     endif
-  endfunction
+  endwhile
 
-  function! context#callback(path, job, status)
-    if index(g:context_jobs, a:job) != -1 && job_status(a:job) != 'run' " just in case
-      call remove(g:context_jobs, index(g:context_jobs, a:job))
+  while lft < len && keywords[lft] =~ pat
+    add(res, keywords[lft])
+    lft += 1
+  endwhile
+
+  return res
+enddef
+
+var isMetaPostBlock = false
+
+var MP_KEYWORDS:  list<string> = []
+var CTX_KEYWORDS: list<string> = []
+
+# Complete only MetaPost keywords in MetaPost blocks, and complete only
+# ConTeXt keywords otherwise.
+export def Complete(findstart: number, base: string): any
+  if findstart == 1
+    if len(synstack(line("."), 1)) > 0 && synIDattr(synstack(line("."), 1)[0], "name") ==# 'contextMPGraphic'
+      isMetaPostBlock = true
+      return match(getline('.'), '\S\+\%' .. col('.') .. 'c')
     endif
-    call s:callback(a:path, a:job, a:status)
-  endfunction
 
-  function! context#close_cb(channel)
-    call job_status(ch_getjob(a:channel)) " Trigger exit_cb's callback for faster feedback
-  endfunction
-
-  function! s:typeset(path)
-    call add(g:context_jobs,
-          \ job_start(add(s:sh(), context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))), {
-          \   'close_cb' : 'context#close_cb',
-          \   'exit_cb'  : function(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \                         [a:path]),
-          \   'in_io'    : 'null'
-          \ }))
-  endfunction
-
-else " No jobs
-
-  function! context#job_status()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction!
-
-  function! context#stop_jobs()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction
-
-  function! context#callback(path, job, status)
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! s:typeset(path)
-    execute '!' . context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))
-    call call(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \ [a:path, 0, v:shell_error])
-  endfunction
-
-endif " has('job')
-
-function! s:callback(path, job, status) abort
-  if a:status < 0 " Assume the job was terminated
-    return
+    # Complete only \commands starting with a backslash
+    isMetaPostBlock = false
+    var pos = match(getline('.'), '\\\zs\S\+\%' .. col('.') .. 'c')
+    return (pos == -1) ? -3 : pos
   endif
-  " Get info about the current window
-  let l:winid = s:win_getid()             " Save window id
-  let l:efm = &l:errorformat              " Save local errorformat
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  " Set errorformat to parse ConTeXt errors
-  execute 'setl efm=' . escape(b:context_errorformat, ' ')
-  try " Set cwd to expand error file correctly
-    execute 'lcd' fnameescape(fnamemodify(a:path, ':h'))
-  catch /.*/
-    execute 'setl efm=' . escape(l:efm, ' ')
-    throw v:exception
-  endtry
-  try
-    execute 'cgetfile' fnameescape(fnamemodify(a:path, ':r') . '.log')
-    botright cwindow
-  finally " Restore cwd and errorformat
-    execute s:win_id2win(l:winid) . 'wincmd w'
-    execute 'lcd ' . fnameescape(l:cwd)
-    execute 'setl efm=' . escape(l:efm, ' ')
-  endtry
-  if a:status == 0
-    call s:context_echo('Success!', 'ModeMsg')
-  else
-    call s:context_echo('There are errors. ', 'ErrorMsg')
+
+  if isMetaPostBlock
+    if empty(MP_KEYWORDS)
+      MP_KEYWORDS = sort(syntaxcomplete#OmniSyntaxList(['mf\w\+', 'mp\w\+']))
+    endif
+    return BinarySearch(base, MP_KEYWORDS)
   endif
-endfunction
 
-function! context#command()
-  return get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode'
-        \ . ' --synctex=' . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-endfunction
+  if empty(CTX_KEYWORDS)
+    CTX_KEYWORDS = sort(syntaxcomplete#OmniSyntaxList([
+      'context\w\+', 'texAleph', 'texEtex', 'texLuatex', 'texOmega',
+      'texPdftex', 'texTex', 'texXeTeX'
+    ]))
+  endif
+  return BinarySearch(base, CTX_KEYWORDS)
+enddef
+# }}}
 
-" Accepts an optional path (useful for big projects, when the file you are
-" editing is not the project's root document). If no argument is given, uses
-" the path of the current buffer.
-function! context#typeset(...) abort
-  let l:path = fnamemodify(strlen(a:000[0]) > 0 ? a:1 : expand("%"), ":p")
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  call s:context_echo('Typesetting...',  'ModeMsg')
-  execute 'lcd' fnameescape(fnamemodify(l:path, ":h"))
-  try
-    call s:typeset(l:path)
-  finally " Restore local working directory
-    execute 'lcd ' . fnameescape(l:cwd)
-  endtry
-endfunction!
-"}}}
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim: sw=2 fdm=marker
+# vim: sw=2 fdm=marker

runtime/autoload/python.vim

@@ -3,21 +3,28 @@
 let s:keepcpo= &cpo
 set cpo&vim
 
-" searchpair() can be slow, limit the time to 150 msec or what is put in
-" g:pyindent_searchpair_timeout
-let s:searchpair_timeout = get(g:, 'pyindent_searchpair_timeout', 150)
-
-" Identing inside parentheses can be very slow, regardless of the searchpair()
-" timeout, so let the user disable this feature if he doesn't need it
-let s:disable_parentheses_indenting = get(g:, 'pyindent_disable_parentheses_indenting', v:false)
+" need to inspect some old g:pyindent_* variables to be backward compatible
+let g:python_indent = extend(get(g:, 'python_indent', {}), #{
+  \ closed_paren_align_last_line: v:true,
+  \ open_paren: get(g:, 'pyindent_open_paren', 'shiftwidth() * 2'),
+  \ nested_paren: get(g:, 'pyindent_nested_paren', 'shiftwidth()'),
+  \ continue: get(g:, 'pyindent_continue', 'shiftwidth() * 2'),
+  "\ searchpair() can be slow, limit the time to 150 msec or what is put in
+  "\ g:python_indent.searchpair_timeout
+  \ searchpair_timeout: get(g:, 'pyindent_searchpair_timeout', 150),
+  "\ Identing inside parentheses can be very slow, regardless of the searchpair()
+  "\ timeout, so let the user disable this feature if he doesn't need it
+  \ disable_parentheses_indenting: get(g:, 'pyindent_disable_parentheses_indenting', v:false),
+  \ }, 'keep')
 
 let s:maxoff = 50       " maximum number of lines to look backwards for ()
 
 function s:SearchBracket(fromlnum, flags)
   return searchpairpos('[[({]', '', '[])}]', a:flags,
-          \ {-> synID('.', col('.'), v:true)->synIDattr('name')
-          \ =~ '\%(Comment\|Todo\|String\)$'},
-          \ [0, a:fromlnum - s:maxoff]->max(), s:searchpair_timeout)
+          \ {-> synstack('.', col('.'))
+          \   ->map({_, id -> id->synIDattr('name')})
+          \   ->match('\%(Comment\|Todo\|String\)$') >= 0},
+          \ [0, a:fromlnum - s:maxoff]->max(), g:python_indent.searchpair_timeout)
 endfunction
 
 " See if the specified line is already user-dedented from the expected value.
@@ -37,7 +44,7 @@ function python#GetIndent(lnum, ...)
     if a:lnum > 1 && getline(a:lnum - 2) =~ '\\$'
       return indent(a:lnum - 1)
     endif
-    return indent(a:lnum - 1) + (exists("g:pyindent_continue") ? eval(g:pyindent_continue) : (shiftwidth() * 2))
+    return indent(a:lnum - 1) + get(g:, 'pyindent_continue', g:python_indent.continue)->eval()
   endif
 
   " If the start of the line is in a string don't change the indent.
@@ -54,7 +61,7 @@ function python#GetIndent(lnum, ...)
     return 0
   endif
 
-  if s:disable_parentheses_indenting == 1
+  if g:python_indent.disable_parentheses_indenting == 1
     let plindent = indent(plnum)
     let plnumstart = plnum
   else
@@ -69,8 +76,12 @@ function python#GetIndent(lnum, ...)
     "         100, 200, 300, 400)
     call cursor(a:lnum, 1)
     let [parlnum, parcol] = s:SearchBracket(a:lnum, 'nbW')
-    if parlnum > 0 && parcol != col([parlnum, '$']) - 1
-      return parcol
+    if parlnum > 0
+      if parcol != col([parlnum, '$']) - 1
+        return parcol
+      elseif getline(a:lnum) =~ '^\s*[])}]' && !g:python_indent.closed_paren_align_last_line
+        return indent(parlnum)
+      endif
     endif
 
     call cursor(plnum, 1)
@@ -122,9 +133,11 @@ function python#GetIndent(lnum, ...)
           " When the start is inside parenthesis, only indent one 'shiftwidth'.
           let [pp, _] = s:SearchBracket(a:lnum, 'bW')
           if pp > 0
-            return indent(plnum) + (exists("g:pyindent_nested_paren") ? eval(g:pyindent_nested_paren) : shiftwidth())
+            return indent(plnum)
+              \ + get(g:, 'pyindent_nested_paren', g:python_indent.nested_paren)->eval()
           endif
-          return indent(plnum) + (exists("g:pyindent_open_paren") ? eval(g:pyindent_open_paren) : (shiftwidth() * 2))
+          return indent(plnum)
+            \ + get(g:, 'pyindent_open_paren', g:python_indent.open_paren)->eval()
         endif
         if plnumstart == p
           return indent(plnum)
@@ -143,12 +156,16 @@ function python#GetIndent(lnum, ...)
     " If the last character in the line is a comment, do a binary search for
     " the start of the comment.  synID() is slow, a linear search would take
     " too long on a long line.
-    if synIDattr(synID(plnum, pline_len, 1), "name") =~ "\\(Comment\\|Todo\\)"
+    if synstack(plnum, pline_len)
+    \ ->map({_, id -> id->synIDattr('name')})
+    \ ->match('\%(Comment\|Todo\)$') >= 0
       let min = 1
       let max = pline_len
       while min < max
 	let col = (min + max) / 2
-	if synIDattr(synID(plnum, col, 1), "name") =~ "\\(Comment\\|Todo\\)"
+        if synstack(plnum, col)
+        \ ->map({_, id -> id->synIDattr('name')})
+        \ ->match('\%(Comment\|Todo\)$') >= 0
 	  let max = col
 	else
 	  let min = col + 1

runtime/autoload/typeset.vim

@@ -0,0 +1,233 @@
+vim9script
+
+# Language:           Generic TeX typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Latest Revision:    2022 Aug 12
+
+# Constants and helpers {{{
+const SLASH = !exists("+shellslash") || &shellslash ? '/' : '\'
+
+def Echo(msg: string, mode: string, label: string)
+  redraw
+  echo "\r"
+  execute 'echohl' mode
+  echomsg printf('[%s] %s', label, msg)
+  echohl None
+enddef
+
+def EchoMsg(msg: string, label = 'Notice')
+  Echo(msg, 'ModeMsg', label)
+enddef
+
+def EchoWarn(msg: string, label = 'Warning')
+  Echo(msg, 'WarningMsg', label)
+enddef
+
+def EchoErr(msg: string, label = 'Error')
+  Echo(msg, 'ErrorMsg', label)
+enddef
+# }}}
+
+# Track jobs {{{
+var running_jobs = {} # Dictionary of job IDs of jobs currently executing
+
+def AddJob(label: string, j: job)
+  if !has_key(running_jobs, label)
+    running_jobs[label] = []
+  endif
+
+  add(running_jobs[label], j)
+enddef
+
+def RemoveJob(label: string, j: job)
+  if has_key(running_jobs, label) && index(running_jobs[label], j) != -1
+    remove(running_jobs[label], index(running_jobs[label], j))
+  endif
+enddef
+
+def GetRunningJobs(label: string): list<job>
+  return has_key(running_jobs, label) ? running_jobs[label] : []
+enddef
+# }}}
+
+# Callbacks {{{
+def ProcessOutput(qfid: number, wd: string, efm: string, ch: channel, msg: string)
+  # Make sure the quickfix list still exists
+  if getqflist({'id': qfid}).id != qfid
+    EchoErr("Quickfix list not found, stopping the job")
+    call job_stop(ch_getjob(ch))
+    return
+  endif
+
+  # Make sure the working directory is correct
+  silent execute "lcd" wd
+  setqflist([], 'a', {'id': qfid, 'lines': [msg], 'efm': efm})
+  silent lcd -
+enddef
+
+def CloseCb(ch: channel)
+  job_status(ch_getjob(ch)) # Trigger exit_cb's callback
+enddef
+
+def ExitCb(label: string, jobid: job, exitStatus: number)
+  RemoveJob(label, jobid)
+
+  if exitStatus == 0
+    botright cwindow
+    EchoMsg('Success!', label)
+  elseif exitStatus < 0
+    EchoWarn('Job terminated', label)
+  else
+    botright copen
+    wincmd p
+    EchoWarn('There are errors.', label)
+  endif
+enddef
+# }}}
+
+# Create a new empty quickfix list at the end of the stack and return its id {{{
+def NewQuickfixList(path: string): number
+  if setqflist([], ' ', {'nr': '$', 'title': path}) == -1
+    return -1
+  endif
+
+  return getqflist({'nr': '$', 'id': 0}).id
+enddef
+# }}}
+
+# Public interface {{{
+# When a TeX document is split into several source files, each source file
+# may contain a "magic line" specifiying the "root" file, e.g.:
+#
+#   % !TEX root = main.tex
+#
+# Using this line, Vim can know which file to typeset even if the current
+# buffer is different from main.tex.
+#
+# This function searches for the magic line in the first ten lines of the
+# given buffer, and returns the full path of the root document.
+#
+# NOTE: the value of "% !TEX root" *must* be a relative path.
+export def FindRootDocument(bufname: string = bufname("%")): string
+  const bufnr = bufnr(bufname)
+
+  if !bufexists(bufnr)
+    return bufname
+  endif
+
+  var rootpath = fnamemodify(bufname(bufnr), ':p')
+
+  # Search for magic line `% !TEX root = ...` in the first ten lines
+  const header = getbufline(bufnr, 1, 10)
+  const idx = match(header, '^\s*%\s\+!TEX\s\+root\s*=\s*\S')
+  if idx > -1
+    const main = matchstr(header[idx], '!TEX\s\+root\s*=\s*\zs.*$')
+    rootpath = simplify(fnamemodify(rootpath, ":h") .. SLASH .. main)
+  endif
+
+  return rootpath
+enddef
+
+export def LogPath(bufname: string): string
+  const logfile = FindRootDocument(bufname)
+  return fnamemodify(logfile, ":r") .. ".log"
+enddef
+
+# Typeset the specified path
+#
+# Parameters:
+#   label: a descriptive string used in messages to identify the kind of job
+#   Cmd:   a function that takes the path of a document and returns the typesetting command
+#   path:  the path of the document to be typeset. To avoid ambiguities, pass a *full* path.
+#   efm:   the error format string to parse the output of the command.
+#   env:   environment variables for the process (passed to job_start())
+#
+# Returns:
+#   true if the job is started successfully;
+#   false otherwise.
+export def Typeset(
+  label: string,
+  Cmd:   func(string): list<string>,
+  path:  string,
+  efm:   string,
+  env:   dict<string> = {}
+): bool
+  var fp   = fnamemodify(path, ":p")
+  var wd   = fnamemodify(fp, ":h")
+  var qfid = NewQuickfixList(fp)
+
+  if qfid == -1
+    EchoErr('Could not create quickfix list', label)
+    return false
+  endif
+
+  if !filereadable(fp)
+    EchoErr(printf('File not readable: %s', fp), label)
+    return false
+  endif
+
+  var jobid = job_start(Cmd(path), {
+    env: env,
+    cwd: wd,
+    in_io: "null",
+    callback: (c, m) => ProcessOutput(qfid, wd, efm, c, m),
+    close_cb: CloseCb,
+    exit_cb: (j, e) => ExitCb(label, j, e),
+    })
+
+  if job_status(jobid) ==# "fail"
+    EchoErr("Failed to start job", label)
+    return false
+  endif
+
+  AddJob(label, jobid)
+
+  EchoMsg('Typesetting...', label)
+
+  return true
+enddef
+
+export def JobStatus(label: string)
+  EchoMsg('Jobs still running: ' .. string(len(GetRunningJobs(label))), label)
+enddef
+
+export def StopJobs(label: string)
+  for job in GetRunningJobs(label)
+    job_stop(job)
+  endfor
+
+  EchoMsg('Done.', label)
+enddef
+
+# Typeset the specified buffer
+#
+# Parameters:
+#   name:    a buffer's name. this may be empty to indicate the current buffer.
+#   cmd:     a function that takes the path of a document and returns the typesetting command
+#   label:   a descriptive string used in messages to identify the kind of job
+#   env:     environment variables for the process (passed to job_start())
+#
+# Returns:
+#   true if the job is started successfully;
+#   false otherwise.
+export def TypesetBuffer(
+  name: string,
+  Cmd: func(string): list<string>,
+  env = {},
+  label = 'Typeset'
+): bool
+  const bufname = bufname(name)
+
+  if empty(bufname)
+    EchoErr('Please save the buffer first.', label)
+    return false
+  endif
+
+  const efm = getbufvar(bufnr(bufname), "&efm")
+  const rootpath = FindRootDocument(bufname)
+
+  return Typeset('ConTeXt', Cmd, rootpath, efm, env)
+enddef
+# }}}
+
+# vim: sw=2 fdm=marker

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: 2022-07-26 15:49:58
+" Last Updated: Tue 23 Aug 2022 16:50:34 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,12 +13,12 @@ set background=dark
 hi clear
 let g:colors_name = 'blue'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
 
 if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#870000', '#006400', '#878700', '#000087', '#870087', '#008787', '#bcbcbc', '#878787', '#d70000', '#00ff00', '#ffdf00', '#5fafff', '#d787d7', '#5fffff', '#ffffff']
+  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=#ffdf00 guibg=#000087 gui=NONE cterm=NONE
+hi Normal guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#005faf gui=NONE cterm=NONE
 hi Pmenu guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
 hi PmenuSel guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE
@@ -27,9 +27,9 @@ 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=#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 CursorIM guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE
+hi CursorLineNr guifg=#ffd700 guibg=#005faf gui=bold cterm=NONE
+hi EndOfBuffer guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE
 hi Error guifg=#ff7f50 guibg=#000087 gui=reverse cterm=reverse
 hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
 hi FoldColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE
@@ -43,7 +43,7 @@ hi NonText guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
 hi Question guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Search guifg=#ffdf00 guibg=#000000 gui=reverse cterm=reverse
+hi Search guifg=#ffd700 guibg=#000000 gui=reverse cterm=reverse
 hi SignColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
 hi SpellBad guifg=#d70000 guibg=NONE guisp=#d70000 gui=undercurl cterm=underline
@@ -58,7 +58,7 @@ hi VertSplit guifg=#008787 guibg=NONE gui=NONE cterm=NONE
 hi Visual guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
 hi VisualNOS guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE
 hi WarningMsg guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000087 guibg=#ffdf00 gui=NONE cterm=NONE
+hi WildMenu guifg=#000087 guibg=#ffd700 gui=NONE cterm=NONE
 hi debugBreakpoint guifg=#00ff00 guibg=#000087 gui=reverse cterm=reverse
 hi debugPC guifg=#5fffff guibg=#000087 gui=reverse cterm=reverse
 hi Directory guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
@@ -73,7 +73,7 @@ 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 Label guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE
 hi! link Terminal Normal
 hi! link Debug Special
 hi! link diffAdded String
@@ -526,6 +526,22 @@ if s:t_Co >= 0
 endif
 
 " Background: dark
+" Color: x_black       #000000           16                black
+" Color: x_darkred     #cd0000           160               darkred
+" Color: x_darkgreen   #00cd00           40                darkgreen
+" Color: x_darkyellow  #cdcd00           184               darkyellow
+" Color: x_darkblue    #0000ee           21                darkblue
+" Color: x_darkmagenta #cd00cd           164               darkmagenta
+" Color: x_darkcyan    #00cdcd           44                darkcyan
+" Color: x_gray        #e5e5e5           254               gray
+" Color: x_darkgray    #7f7f7f           244               darkgray
+" Color: x_red         #ff0000           196               red
+" Color: x_green       #00ff00           46                green
+" Color: x_yellow      #ffff00           226               yellow
+" Color: x_blue        #5c5cff           63                blue
+" Color: x_magenta     #ff00ff           201               magenta
+" Color: x_cyan        #00ffff           51                cyan
+" Color: x_white       #ffffff           231               white
 " Color: black         #000000           16                black
 " Color: darkred       #870000           88                darkred
 " Color: darkyellow    #878700           100               darkyellow
@@ -537,7 +553,7 @@ endif
 " Color: darkgray      #878787           102               darkgray
 " Color: red           #d70000           160               red
 " Color: green         #00ff00           46                green
-" Color: yellow        #ffdf00           220               yellow
+" Color: yellow        #ffd700           220               yellow
 " Color: blue          #005faf           25                blue
 " Color: magenta       #d787d7           176               magenta
 " Color: cyan          #5fffff           87                cyan
@@ -549,8 +565,8 @@ endif
 " Color: coral         #ff7f50           209               red
 " Color: olivedrab     #6b8e23           64                green
 " Color: slateblue     #6a5acd           62                darkmagenta
-" Term colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan gray
-" Term colors: darkgray red green yellow xtermblue magenta cyan white
+" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray
+" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white
 " Color: bgDiffA     #5F875F        65             darkgreen
 " Color: bgDiffC     #5F87AF        67             blue
 " Color: bgDiffD     #AF5FAF        133            magenta

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: 2022-07-26 15:49:59
+" Last Updated: Tue 23 Aug 2022 16:50:35 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'darkblue'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']

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: 2022-07-26 15:50:00
+" Last Updated: Tue 23 Aug 2022 16:50:36 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'delek'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']

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: 2022-07-26 15:50:01
+" Last Updated: Tue 23 Aug 2022 16:50:37 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'desert'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']

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: 2022-07-26 15:50:02
+" Last Updated: Tue 23 Aug 2022 16:50:37 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -12,7 +12,7 @@ set background=dark
 hi clear
 let g:colors_name = 'elflord'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
 
 hi! link Terminal Normal
 hi! link Boolean Constant

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: 2022-07-26 15:50:03
+" Last Updated: Tue 23 Aug 2022 16:50:38 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'evening'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']

runtime/colors/habamax.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: 2022-07-26 15:50:04
+" Last Updated: Tue 23 Aug 2022 16:50:38 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,10 +13,10 @@ set background=dark
 hi clear
 let g:colors_name = 'habamax'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
 
 if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#df875f', '#afd7af', '#dfdf87', '#87afd7', '#dfafdf', '#87afaf', '#bcbcbc']
+  let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d7875f', '#afd7af', '#d7d787', '#87afd7', '#d7afd7', '#87afaf', '#bcbcbc']
 endif
 hi! link Terminal Normal
 hi! link StatuslineTerm Statusline
@@ -58,14 +58,14 @@ hi! link elixirInclude Statement
 hi! link elixirAtom PreProc
 hi! link elixirDocTest String
 hi ALEErrorSign guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
-hi ALEInfoSign guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE
+hi ALEInfoSign guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE
 hi ALEWarningSign guifg=#af87af guibg=NONE gui=NONE cterm=NONE
 hi ALEError guifg=#1c1c1c guibg=#d75f5f gui=NONE cterm=NONE
 hi ALEVirtualTextError guifg=#1c1c1c guibg=#d75f5f gui=NONE cterm=NONE
 hi ALEWarning guifg=#1c1c1c guibg=#af87af gui=NONE cterm=NONE
 hi ALEVirtualTextWarning guifg=#1c1c1c guibg=#af87af gui=NONE cterm=NONE
-hi ALEInfo guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE
-hi ALEVirtualTextInfo guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE
+hi ALEInfo guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE
+hi ALEVirtualTextInfo guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE
 hi Normal guifg=#bcbcbc guibg=#1c1c1c gui=NONE cterm=NONE
 hi Statusline guifg=#1c1c1c guibg=#9e9e9e gui=NONE cterm=NONE
 hi StatuslineNC guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
@@ -93,18 +93,18 @@ hi PmenuSel guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE
 hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Error guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse
 hi ErrorMsg guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse
-hi ModeMsg guifg=#1c1c1c guibg=#dfdf87 gui=NONE cterm=NONE
+hi ModeMsg guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE
 hi MoreMsg guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
 hi Question guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE
-hi WarningMsg guifg=#df875f guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#dfdf87 guibg=#1c1c1c gui=reverse cterm=reverse
+hi WarningMsg guifg=#d7875f guibg=NONE gui=NONE cterm=NONE
+hi Todo guifg=#d7d787 guibg=#1c1c1c gui=reverse cterm=reverse
 hi MatchParen guifg=#5f8787 guibg=#1c1c1c gui=reverse cterm=reverse
 hi Search guifg=#1c1c1c guibg=#87af87 gui=NONE cterm=NONE
 hi IncSearch guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE
 hi CurSearch guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE
-hi WildMenu guifg=#1c1c1c guibg=#dfdf87 gui=NONE cterm=NONE
+hi WildMenu guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE
 hi debugPC guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#1c1c1c guibg=#df875f gui=NONE cterm=NONE
+hi debugBreakpoint guifg=#1c1c1c guibg=#d7875f gui=NONE cterm=NONE
 hi Cursor guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE
 hi lCursor guifg=#1c1c1c guibg=#5fff00 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
@@ -114,9 +114,9 @@ hi ColorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
 hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
 hi SpellCap guifg=NONE guibg=NONE guisp=#5f87af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
 hi SpellLocal guifg=NONE guibg=NONE guisp=#87af87 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi SpellRare guifg=NONE guibg=NONE guisp=#dfafdf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi SpellRare guifg=NONE guibg=NONE guisp=#d7afd7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
 hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#df875f guibg=NONE gui=NONE cterm=NONE
+hi Constant guifg=#d7875f guibg=NONE gui=NONE cterm=NONE
 hi String guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
 hi Character guifg=#afd7af guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#87afaf guibg=NONE gui=NONE cterm=NONE
@@ -125,7 +125,7 @@ hi PreProc guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE
 hi Type guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
 hi Special guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
 hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi Title guifg=#dfdf87 guibg=NONE gui=bold cterm=bold
+hi Title guifg=#d7d787 guibg=NONE gui=bold cterm=bold
 hi Directory guifg=#87afaf guibg=NONE gui=bold cterm=bold
 hi Conceal guifg=#767676 guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -135,7 +135,7 @@ hi DiffDelete guifg=#af875f guibg=NONE gui=NONE cterm=NONE
 hi diffAdded guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
 hi diffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
 hi diffSubname guifg=#af87af guibg=NONE gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#dfdfdf gui=NONE cterm=NONE
+hi DiffText guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE
 hi DiffChange guifg=#000000 guibg=#afafaf gui=NONE cterm=NONE
 
 if s:t_Co >= 256
@@ -254,7 +254,7 @@ if s:t_Co >= 256
   hi diffAdded ctermfg=108 ctermbg=NONE cterm=NONE
   hi diffRemoved ctermfg=167 ctermbg=NONE cterm=NONE
   hi diffSubname ctermfg=139 ctermbg=NONE cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=254 cterm=NONE
+  hi DiffText ctermfg=16 ctermbg=188 cterm=NONE
   hi DiffChange ctermfg=16 ctermbg=145 cterm=NONE
   unlet s:t_Co
   finish
@@ -489,15 +489,15 @@ endif
 " Color: color00          #1C1C1C        234            black
 " Color: color08          #767676        243            darkgray
 " Color: color01          #D75F5F        167            darkred
-" Color: color09          #DF875F        173            red
+" Color: color09          #D7875F        173            red
 " Color: color02          #87AF87        108            darkgreen
 " Color: color10          #AFD7AF        151            green
 " Color: color03          #AFAF87        144            darkyellow
-" Color: color11          #DFDF87        186            yellow
+" Color: color11          #D7D787        186            yellow
 " Color: color04          #5F87AF        67             blue
 " Color: color12          #87AFD7        110            blue
 " Color: color05          #AF87AF        139            darkmagenta
-" Color: color13          #DFAFDF        182            magenta
+" Color: color13          #D7AFD7        182            magenta
 " Color: color06          #5F8787        66             darkcyan
 " Color: color14          #87AFAF        109            cyan
 " Color: color07          #9E9E9E        247            gray
@@ -506,12 +506,12 @@ endif
 " Color: colorB           #262626        235            darkgrey
 " Color: colorNonT        #585858        240            darkgrey
 " Color: colorC           #FFAF5F        215            red
-" Color: colorlC          #5FFF00        ~
+" Color: colorlC          #5FFF00        82             green
 " Color: colorV           #1F3F5F        109            cyan
 " Color: diffAdd          #87AF87        108            darkgreen
 " Color: diffDelete       #af875f        137            darkyellow
 " Color: diffChange       #AFAFAF        145            darkgray
-" Color: diffText         #DFDFDF        254            lightgrey
+" Color: diffText         #D7D7D7        188            lightgrey
 " Color: black            #000000        16             black
 " Color: white            #FFFFFF        231            white
 " Term colors: color00 color01 color02 color03 color04 color05 color06 color07

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: 2022-07-26 15:50:05
+" Last Updated: Tue 23 Aug 2022 16:50:39 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'industry'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
 
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   let g:terminal_ansi_colors = ['#303030', '#870000', '#5fd75f', '#afaf00', '#87afff', '#af00af', '#00afaf', '#6c6c6c', '#444444', '#ff0000', '#00ff00', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']

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: 2022-07-26 15:50:06
+" Last Updated: Tue 23 Aug 2022 16:50:39 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -12,7 +12,7 @@ set background=dark
 hi clear
 let g:colors_name = 'koehler'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
 
 hi! link Terminal Normal
 hi! link Boolean Constant

runtime/colors/lunaperche.vim

@@ -0,0 +1,911 @@
+" Name:         Perchè il sole a Milano? Portofino? Dimmi la luna perchè?
+" Description:  White(perchè il sole)/Black(la luna perchè?) background colorscheme.
+" Author:       Maxim Kim <habamax@gmail.com>
+" Maintainer:   Maxim Kim <habamax@gmail.com>
+" Website:      https://www.github.com/vim/colorschemes
+" License:      Vim License (see `:help license`)
+" Last Updated: Tue 23 Aug 2022 16:50:40 MSK
+
+" Generated by Colortemplate v2.2.0
+
+hi clear
+let g:colors_name = 'lunaperche'
+
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
+
+hi! link helpVim Title
+hi! link helpHeader Title
+hi! link helpHyperTextJump Underlined
+hi! link fugitiveSymbolicRef PreProc
+hi! link fugitiveHeading Statement
+hi! link fugitiveStagedHeading Statement
+hi! link fugitiveUnstagedHeading Statement
+hi! link fugitiveUntrackedHeading Statement
+hi! link fugitiveStagedModifier PreProc
+hi! link fugitiveUnstagedModifier PreProc
+hi! link fugitiveHash Constant
+hi! link diffFile PreProc
+hi! link markdownHeadingDelimiter Special
+hi! link rstSectionDelimiter PreProc
+hi! link rstDirective Special
+hi! link rstHyperlinkReference Special
+hi! link rstFieldName Special
+hi! link rstDelimiter Special
+hi! link rstInterpretedText Special
+hi! link colortemplateKey Statement
+hi! link xmlTagName Statement
+hi! link javaScriptFunction Statement
+hi! link javaScriptIdentifier Statement
+hi! link sqlKeyword Statement
+hi! link yamlBlockMappingKey Statement
+hi! link rubyMacro Statement
+hi! link rubyDefine Statement
+hi! link vimGroup Normal
+hi! link vimVar Normal
+hi! link vimOper Normal
+hi! link vimSep Normal
+hi! link vimParenSep Normal
+hi! link vimOption Normal
+hi! link vimCommentString Comment
+hi! link pythonInclude Statement
+hi! link elixirOperator Statement
+hi! link elixirKeyword Statement
+hi! link elixirBlockDefinition Statement
+hi! link elixirDefine Statement
+hi! link elixirPrivateDefine Statement
+hi! link elixirGuard Statement
+hi! link elixirPrivateGuard Statement
+hi! link elixirModuleDefine Statement
+hi! link elixirProtocolDefine Statement
+hi! link elixirImplDefine Statement
+hi! link elixirRecordDefine Statement
+hi! link elixirPrivateRecordDefine Statement
+hi! link elixirMacroDefine Statement
+hi! link elixirPrivateMacroDefine Statement
+hi! link elixirDelegateDefine Statement
+hi! link elixirOverridableDefine Statement
+hi! link elixirExceptionDefine Statement
+hi! link elixirCallbackDefine Statement
+hi! link elixirStructDefine Statement
+hi! link elixirExUnitMacro Statement
+hi! link elixirInclude Statement
+hi! link elixirVariable Special
+hi! link elixirAtom Constant
+hi! link elixirDocTest String
+hi! link shQuote Constant
+hi! link shNoQuote Normal
+hi! link shTestOpr Normal
+hi! link shOperator Normal
+hi! link shSetOption Normal
+hi! link shOption Normal
+hi! link shCommandSub Normal
+hi! link shDerefPattern shQuote
+hi! link shDerefOp Special
+hi! link Terminal Normal
+hi! link StatuslineTerm Statusline
+hi! link StatuslineTermNC StatuslineNC
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+if &background ==# 'dark'
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#000000', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#d787af', '#5fafaf', '#c6c6c6', '#767676', '#ff5f5f', '#5fd75f', '#ffd787', '#87afd7', '#ffafd7', '#5fd7d7', '#ffffff']
+  endif
+  hi Normal guifg=#c6c6c6 guibg=#000000 gui=NONE cterm=NONE
+  hi Statusline guifg=#000000 guibg=#c6c6c6 gui=bold cterm=bold
+  hi StatuslineNC guifg=#000000 guibg=#767676 gui=NONE cterm=NONE
+  hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
+  hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#000000 guibg=#87afd7 gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#ffffff guibg=NONE gui=bold cterm=bold
+  hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
+  hi PmenuSel guifg=NONE guibg=#005f00 gui=NONE cterm=NONE
+  hi PmenuThumb guifg=NONE guibg=#c6c6c6 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE
+  hi ModeMsg guifg=#ffd787 guibg=NONE gui=reverse cterm=reverse
+  hi MoreMsg guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
+  hi Question guifg=#ffafd7 guibg=NONE gui=NONE cterm=NONE
+  hi WarningMsg guifg=#ff5f5f guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#5fd7d7 guibg=#000000 gui=reverse cterm=reverse
+  hi Search guifg=#000000 guibg=#ffd787 gui=NONE cterm=NONE
+  hi IncSearch guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE
+  hi CurSearch guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE
+  hi WildMenu guifg=#000000 guibg=#ffd787 gui=bold cterm=bold
+  hi debugPC guifg=#5f87af guibg=NONE gui=reverse cterm=reverse
+  hi debugBreakpoint guifg=#5fafaf guibg=NONE gui=reverse cterm=reverse
+  hi Cursor guifg=#ffffff guibg=#000000 gui=reverse cterm=reverse
+  hi lCursor guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Visual guifg=#ffffff guibg=#005f87 gui=NONE cterm=NONE
+  hi MatchParen guifg=#c5e7c5 guibg=#000000 gui=reverse cterm=reverse
+  hi VisualNOS guifg=#000000 guibg=#5fafaf gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+  hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#1c1c1c gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
+  hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellCap guifg=NONE guibg=NONE guisp=#5fafaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellLocal guifg=NONE guibg=NONE guisp=#5faf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellRare guifg=NONE guibg=NONE guisp=#ffafd7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE
+  hi Identifier guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Statement guifg=#eeeeee guibg=NONE gui=bold cterm=bold
+  hi Type guifg=#5fd75f guibg=NONE gui=bold cterm=bold
+  hi PreProc guifg=#af875f guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Directory guifg=#5fd7d7 guibg=NONE gui=bold cterm=bold
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi DiffAdd guifg=#000000 guibg=#af87af gui=NONE cterm=NONE
+  hi DiffChange guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi DiffText guifg=#000000 guibg=#5fd7d7 gui=NONE cterm=NONE
+  hi DiffDelete guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
+  hi diffAdded guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
+  hi diffRemoved guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
+  hi diffSubname guifg=#ffafd7 guibg=NONE gui=NONE cterm=NONE
+  hi dirType guifg=#d787af guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionUser guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionGroup guifg=#af875f guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionOther guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE
+  hi dirOwner guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+  hi dirGroup guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+  hi dirTime guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+  hi dirSize guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE
+  hi dirSizeMod guifg=#d787af guibg=NONE gui=NONE cterm=NONE
+  hi FilterMenuDirectorySubtle guifg=#878787 guibg=NONE gui=NONE cterm=NONE
+  hi dirFilterMenuBookmarkPath guifg=#878787 guibg=NONE gui=NONE cterm=NONE
+  hi dirFilterMenuHistoryPath guifg=#878787 guibg=NONE gui=NONE cterm=NONE
+  hi FilterMenuLineNr guifg=#878787 guibg=NONE gui=NONE cterm=NONE
+  hi CocMenuSel guifg=NONE guibg=#005f00 gui=NONE cterm=NONE
+  hi CocSearch guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE
+else
+  " Light background
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#000000', '#870000', '#008700', '#875f00', '#005faf', '#870087', '#005f5f', '#808080', '#767676', '#d70000', '#87d787', '#d7d787', '#0087d7', '#af00af', '#00afaf', '#ffffff']
+  endif
+  hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
+  hi Statusline guifg=#ffffff guibg=#000000 gui=bold cterm=bold
+  hi StatuslineNC guifg=#ffffff guibg=#767676 gui=NONE cterm=NONE
+  hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#bcbcbc gui=NONE cterm=NONE
+  hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold,reverse cterm=bold,reverse
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#ffffff guibg=#0087d7 gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi LineNr guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
+  hi NonText guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
+  hi FoldColumn guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi PmenuSel guifg=NONE guibg=#afd7af gui=NONE cterm=NONE
+  hi PmenuThumb guifg=NONE guibg=#767676 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
+  hi ModeMsg guifg=#d7d787 guibg=#000000 gui=reverse cterm=reverse
+  hi MoreMsg guifg=#008700 guibg=NONE gui=bold cterm=bold
+  hi Question guifg=#870087 guibg=NONE gui=bold cterm=bold
+  hi WarningMsg guifg=#d70000 guibg=NONE gui=bold cterm=bold
+  hi Todo guifg=#005f5f guibg=#ffffff gui=reverse cterm=reverse
+  hi Search guifg=#000000 guibg=#d7d787 gui=NONE cterm=NONE
+  hi IncSearch guifg=#000000 guibg=#87d787 gui=NONE cterm=NONE
+  hi CurSearch guifg=#000000 guibg=#87d787 gui=NONE cterm=NONE
+  hi WildMenu guifg=#000000 guibg=#d7d787 gui=bold cterm=bold
+  hi debugPC guifg=#005faf guibg=NONE gui=reverse cterm=reverse
+  hi debugBreakpoint guifg=#005f5f guibg=NONE gui=reverse cterm=reverse
+  hi Cursor guifg=#000000 guibg=#ffffff gui=reverse cterm=reverse
+  hi lCursor guifg=#ff00ff guibg=#000000 gui=reverse cterm=reverse
+  hi Visual guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
+  hi MatchParen guifg=NONE guibg=#c5e7c5 gui=NONE cterm=NONE
+  hi VisualNOS guifg=#ffffff guibg=#00afaf gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi CursorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#eeeeee gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi SpellBad guifg=NONE guibg=NONE guisp=#870000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellCap guifg=NONE guibg=NONE guisp=#005f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellRare guifg=NONE guibg=NONE guisp=#af00af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment guifg=#005faf guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#870000 guibg=NONE gui=NONE cterm=NONE
+  hi Identifier guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Statement guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi Type guifg=#008700 guibg=NONE gui=bold cterm=bold
+  hi PreProc guifg=#875f00 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#005f5f guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Directory guifg=#005faf guibg=NONE gui=bold cterm=bold
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi DiffAdd guifg=#000000 guibg=#d7afd7 gui=NONE cterm=NONE
+  hi DiffChange guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi DiffText guifg=#000000 guibg=#5fd7d7 gui=NONE cterm=NONE
+  hi DiffDelete guifg=#870000 guibg=NONE gui=NONE cterm=NONE
+  hi diffAdded guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi diffRemoved guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
+  hi diffSubname guifg=#870087 guibg=NONE gui=NONE cterm=NONE
+  hi dirType guifg=#005f5f guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionUser guifg=#875f00 guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionGroup guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionOther guifg=#870087 guibg=NONE gui=NONE cterm=NONE
+  hi dirOwner guifg=#808080 guibg=NONE gui=NONE cterm=NONE
+  hi dirGroup guifg=#808080 guibg=NONE gui=NONE cterm=NONE
+  hi dirTime guifg=#808080 guibg=NONE gui=NONE cterm=NONE
+  hi dirSize guifg=#870000 guibg=NONE gui=NONE cterm=NONE
+  hi dirSizeMod guifg=#005f5f guibg=NONE gui=NONE cterm=NONE
+  hi dirLink guifg=#008700 guibg=NONE gui=bold cterm=bold
+  hi dirFilterMenuBookmarkPath guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi dirFilterMenuHistoryPath guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi FilterMenuDirectorySubtle guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi FilterMenuLineNr guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi CocMenuSel guifg=NONE guibg=#afd7af gui=NONE cterm=NONE
+  hi CocSearch guifg=#870000 guibg=NONE gui=NONE cterm=NONE
+endif
+
+if s:t_Co >= 256
+  hi! link helpVim Title
+  hi! link helpHeader Title
+  hi! link helpHyperTextJump Underlined
+  hi! link fugitiveSymbolicRef PreProc
+  hi! link fugitiveHeading Statement
+  hi! link fugitiveStagedHeading Statement
+  hi! link fugitiveUnstagedHeading Statement
+  hi! link fugitiveUntrackedHeading Statement
+  hi! link fugitiveStagedModifier PreProc
+  hi! link fugitiveUnstagedModifier PreProc
+  hi! link fugitiveHash Constant
+  hi! link diffFile PreProc
+  hi! link markdownHeadingDelimiter Special
+  hi! link rstSectionDelimiter PreProc
+  hi! link rstDirective Special
+  hi! link rstHyperlinkReference Special
+  hi! link rstFieldName Special
+  hi! link rstDelimiter Special
+  hi! link rstInterpretedText Special
+  hi! link colortemplateKey Statement
+  hi! link xmlTagName Statement
+  hi! link javaScriptFunction Statement
+  hi! link javaScriptIdentifier Statement
+  hi! link sqlKeyword Statement
+  hi! link yamlBlockMappingKey Statement
+  hi! link rubyMacro Statement
+  hi! link rubyDefine Statement
+  hi! link vimGroup Normal
+  hi! link vimVar Normal
+  hi! link vimOper Normal
+  hi! link vimSep Normal
+  hi! link vimParenSep Normal
+  hi! link vimOption Normal
+  hi! link vimCommentString Comment
+  hi! link pythonInclude Statement
+  hi! link elixirOperator Statement
+  hi! link elixirKeyword Statement
+  hi! link elixirBlockDefinition Statement
+  hi! link elixirDefine Statement
+  hi! link elixirPrivateDefine Statement
+  hi! link elixirGuard Statement
+  hi! link elixirPrivateGuard Statement
+  hi! link elixirModuleDefine Statement
+  hi! link elixirProtocolDefine Statement
+  hi! link elixirImplDefine Statement
+  hi! link elixirRecordDefine Statement
+  hi! link elixirPrivateRecordDefine Statement
+  hi! link elixirMacroDefine Statement
+  hi! link elixirPrivateMacroDefine Statement
+  hi! link elixirDelegateDefine Statement
+  hi! link elixirOverridableDefine Statement
+  hi! link elixirExceptionDefine Statement
+  hi! link elixirCallbackDefine Statement
+  hi! link elixirStructDefine Statement
+  hi! link elixirExUnitMacro Statement
+  hi! link elixirInclude Statement
+  hi! link elixirVariable Special
+  hi! link elixirAtom Constant
+  hi! link elixirDocTest String
+  hi! link shQuote Constant
+  hi! link shNoQuote Normal
+  hi! link shTestOpr Normal
+  hi! link shOperator Normal
+  hi! link shSetOption Normal
+  hi! link shOption Normal
+  hi! link shCommandSub Normal
+  hi! link shDerefPattern shQuote
+  hi! link shDerefOp Special
+  hi! link Terminal Normal
+  hi! link StatuslineTerm Statusline
+  hi! link StatuslineTermNC StatuslineNC
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  if &background ==# 'dark'
+    hi Normal ctermfg=251 ctermbg=16 cterm=NONE
+    hi Statusline ctermfg=16 ctermbg=251 cterm=bold
+    hi StatuslineNC ctermfg=16 ctermbg=243 cterm=NONE
+    hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=251 cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE
+    hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=16 ctermbg=231 cterm=NONE
+    hi QuickFixLine ctermfg=16 ctermbg=110 cterm=NONE
+    hi CursorLineNr ctermfg=231 ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=234 cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=22 cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=251 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=231 ctermbg=203 cterm=NONE
+    hi ErrorMsg ctermfg=231 ctermbg=203 cterm=NONE
+    hi ModeMsg ctermfg=222 ctermbg=NONE cterm=reverse
+    hi MoreMsg ctermfg=77 ctermbg=NONE cterm=NONE
+    hi Question ctermfg=218 ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=116 ctermbg=16 cterm=reverse
+    hi Search ctermfg=16 ctermbg=222 cterm=NONE
+    hi IncSearch ctermfg=16 ctermbg=77 cterm=NONE
+    hi CurSearch ctermfg=16 ctermbg=77 cterm=NONE
+    hi WildMenu ctermfg=16 ctermbg=222 cterm=bold
+    hi debugPC ctermfg=67 ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=73 ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=231 ctermbg=24 cterm=NONE
+    hi MatchParen ctermfg=30 ctermbg=16 cterm=reverse
+    hi VisualNOS ctermfg=16 ctermbg=73 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=235 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=235 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=234 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE
+    hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=73 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=218 ctermbg=NONE cterm=underline
+    hi Comment ctermfg=110 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=222 ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=255 ctermbg=NONE cterm=bold
+    hi Type ctermfg=77 ctermbg=NONE cterm=bold
+    hi PreProc ctermfg=137 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=73 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=116 ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=16 ctermbg=139 cterm=NONE
+    hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE
+    hi DiffText ctermfg=16 ctermbg=80 cterm=NONE
+    hi DiffDelete ctermfg=174 ctermbg=NONE cterm=NONE
+    hi diffAdded ctermfg=77 ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=174 ctermbg=NONE cterm=NONE
+    hi diffSubname ctermfg=218 ctermbg=NONE cterm=NONE
+    hi dirType ctermfg=175 ctermbg=NONE cterm=NONE
+    hi dirPermissionUser ctermfg=71 ctermbg=NONE cterm=NONE
+    hi dirPermissionGroup ctermfg=137 ctermbg=NONE cterm=NONE
+    hi dirPermissionOther ctermfg=73 ctermbg=NONE cterm=NONE
+    hi dirOwner ctermfg=243 ctermbg=NONE cterm=NONE
+    hi dirGroup ctermfg=243 ctermbg=NONE cterm=NONE
+    hi dirTime ctermfg=243 ctermbg=NONE cterm=NONE
+    hi dirSize ctermfg=222 ctermbg=NONE cterm=NONE
+    hi dirSizeMod ctermfg=175 ctermbg=NONE cterm=NONE
+    hi FilterMenuDirectorySubtle ctermfg=102 ctermbg=NONE cterm=NONE
+    hi dirFilterMenuBookmarkPath ctermfg=102 ctermbg=NONE cterm=NONE
+    hi dirFilterMenuHistoryPath ctermfg=102 ctermbg=NONE cterm=NONE
+    hi FilterMenuLineNr ctermfg=102 ctermbg=NONE cterm=NONE
+    hi CocMenuSel ctermfg=NONE ctermbg=22 cterm=NONE
+    hi CocSearch ctermfg=222 ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=16 ctermbg=231 cterm=NONE
+    hi Statusline ctermfg=231 ctermbg=16 cterm=bold
+    hi StatuslineNC ctermfg=231 ctermbg=243 cterm=NONE
+    hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=250 cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE
+    hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold,reverse
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=231 ctermbg=16 cterm=NONE
+    hi QuickFixLine ctermfg=231 ctermbg=32 cterm=NONE
+    hi CursorLineNr ctermfg=16 ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=247 ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=247 ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=247 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=247 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=247 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=255 cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=151 cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=231 ctermbg=160 cterm=NONE
+    hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
+    hi ModeMsg ctermfg=186 ctermbg=16 cterm=reverse
+    hi MoreMsg ctermfg=28 ctermbg=NONE cterm=bold
+    hi Question ctermfg=90 ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=160 ctermbg=NONE cterm=bold
+    hi Todo ctermfg=23 ctermbg=231 cterm=reverse
+    hi Search ctermfg=16 ctermbg=186 cterm=NONE
+    hi IncSearch ctermfg=16 ctermbg=114 cterm=NONE
+    hi CurSearch ctermfg=16 ctermbg=114 cterm=NONE
+    hi WildMenu ctermfg=16 ctermbg=186 cterm=bold
+    hi debugPC ctermfg=25 ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=23 ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=231 ctermbg=67 cterm=NONE
+    hi MatchParen ctermfg=30 ctermbg=231 cterm=reverse
+    hi VisualNOS ctermfg=231 ctermbg=37 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=255 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=255 cterm=NONE
+    hi SpellBad ctermfg=88 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=28 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=133 ctermbg=NONE cterm=underline
+    hi Comment ctermfg=25 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=88 ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=16 ctermbg=NONE cterm=bold
+    hi Type ctermfg=28 ctermbg=NONE cterm=bold
+    hi PreProc ctermfg=94 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=23 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=25 ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=16 ctermbg=182 cterm=NONE
+    hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE
+    hi DiffText ctermfg=16 ctermbg=80 cterm=NONE
+    hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE
+    hi diffAdded ctermfg=28 ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=160 ctermbg=NONE cterm=NONE
+    hi diffSubname ctermfg=90 ctermbg=NONE cterm=NONE
+    hi dirType ctermfg=23 ctermbg=NONE cterm=NONE
+    hi dirPermissionUser ctermfg=94 ctermbg=NONE cterm=NONE
+    hi dirPermissionGroup ctermfg=28 ctermbg=NONE cterm=NONE
+    hi dirPermissionOther ctermfg=90 ctermbg=NONE cterm=NONE
+    hi dirOwner ctermfg=244 ctermbg=NONE cterm=NONE
+    hi dirGroup ctermfg=244 ctermbg=NONE cterm=NONE
+    hi dirTime ctermfg=244 ctermbg=NONE cterm=NONE
+    hi dirSize ctermfg=88 ctermbg=NONE cterm=NONE
+    hi dirSizeMod ctermfg=23 ctermbg=NONE cterm=NONE
+    hi dirLink ctermfg=28 ctermbg=NONE cterm=bold
+    hi dirFilterMenuBookmarkPath ctermfg=241 ctermbg=NONE cterm=NONE
+    hi dirFilterMenuHistoryPath ctermfg=241 ctermbg=NONE cterm=NONE
+    hi FilterMenuDirectorySubtle ctermfg=241 ctermbg=NONE cterm=NONE
+    hi FilterMenuLineNr ctermfg=241 ctermbg=NONE cterm=NONE
+    hi CocMenuSel ctermfg=NONE ctermbg=151 cterm=NONE
+    hi CocSearch ctermfg=88 ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  if &background ==# 'dark'
+    hi Normal ctermfg=grey ctermbg=black cterm=NONE
+    hi Statusline ctermfg=black ctermbg=grey cterm=bold
+    hi StatuslineNC ctermfg=black ctermbg=darkgrey cterm=NONE
+    hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
+    hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=white ctermbg=black cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=black ctermbg=white cterm=NONE
+    hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE
+    hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=darkgrey cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=white ctermbg=red cterm=NONE
+    hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
+    hi ModeMsg ctermfg=yellow ctermbg=NONE cterm=reverse
+    hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE
+    hi Question ctermfg=magenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=cyan ctermbg=black cterm=reverse
+    hi Search ctermfg=black ctermbg=yellow cterm=NONE
+    hi IncSearch ctermfg=black ctermbg=green cterm=NONE
+    hi CurSearch ctermfg=black ctermbg=green cterm=NONE
+    hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=white ctermbg=darkblue cterm=NONE
+    hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=green ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+    hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=grey ctermbg=NONE cterm=bold
+    hi Type ctermfg=green ctermbg=NONE cterm=bold
+    hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=cyan ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
+    hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi diffAdded ctermfg=green ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi diffSubname ctermfg=magenta ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=black ctermbg=white cterm=NONE
+    hi Statusline ctermfg=white ctermbg=black cterm=bold
+    hi StatuslineNC ctermfg=white ctermbg=darkgrey cterm=NONE
+    hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
+    hi TabLine ctermfg=black ctermbg=lightgrey cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=white ctermbg=black cterm=bold,reverse
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=white ctermbg=black cterm=NONE
+    hi QuickFixLine ctermfg=white ctermbg=blue cterm=NONE
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=white ctermbg=red cterm=NONE
+    hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
+    hi ModeMsg ctermfg=yellow ctermbg=black cterm=reverse
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold
+    hi Todo ctermfg=darkcyan ctermbg=white cterm=reverse
+    hi Search ctermfg=black ctermbg=yellow cterm=NONE
+    hi IncSearch ctermfg=black ctermbg=green cterm=NONE
+    hi CurSearch ctermfg=black ctermbg=green cterm=NONE
+    hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=white ctermbg=darkblue cterm=NONE
+    hi MatchParen ctermfg=darkcyan ctermbg=white cterm=reverse
+    hi VisualNOS ctermfg=black ctermbg=cyan cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+    hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=black ctermbg=NONE cterm=bold
+    hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+    hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
+    hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=red ctermbg=NONE cterm=NONE
+    hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  if &background ==# 'dark'
+    hi Normal ctermfg=grey ctermbg=black cterm=NONE
+    hi Statusline ctermfg=grey ctermbg=black cterm=bold,reverse
+    hi StatuslineNC ctermfg=black ctermbg=grey cterm=NONE
+    hi VertSplit ctermfg=grey ctermbg=grey cterm=NONE
+    hi TabLine ctermfg=grey ctermbg=black cterm=reverse
+    hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+    hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+    hi QuickFixLine ctermfg=grey ctermbg=darkblue cterm=bold
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ModeMsg ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi Search ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi CurSearch ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=black ctermbg=darkblue cterm=NONE
+    hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse,underline
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse,underline
+    hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse,underline
+    hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse,underline
+    hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=black ctermbg=NONE cterm=bold
+    hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+    hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=black ctermbg=grey cterm=NONE
+    hi Statusline ctermfg=grey ctermbg=black cterm=bold
+    hi StatuslineNC ctermfg=grey ctermbg=darkgrey cterm=NONE
+    hi VertSplit ctermfg=black ctermbg=black cterm=NONE
+    hi TabLine ctermfg=black ctermbg=grey cterm=reverse
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=black ctermbg=grey cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold
+    hi QuickFixLine ctermfg=grey ctermbg=darkblue cterm=bold
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=grey ctermbg=black cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ModeMsg ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi CurSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=grey ctermbg=darkblue cterm=NONE
+    hi MatchParen ctermfg=darkcyan ctermbg=grey cterm=reverse
+    hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse,underline
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse,underline
+    hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse,underline
+    hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse,underline
+    hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=black ctermbg=NONE cterm=bold
+    hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+    hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=black ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi DiffText ctermfg=grey ctermbg=black cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: any
+" Background: dark
+" Color: color00                 #000000        16             black
+" Color: color08                 #767676        243            darkgrey
+" Color: color01                 #AF5F5F        131            darkred
+" Color: color09                 #FF5F5F        203            red
+" Color: color02                 #5FAF5F        71             darkgreen
+" Color: color10                 #5FD75F        77             green
+" Color: color03                 #AF875F        137            darkyellow
+" Color: color11                 #FFD787        222            yellow
+" Color: color04                 #5F87AF        67             darkblue
+" Color: color12                 #87AFD7        110            blue
+" Color: color05                 #D787AF        175            darkmagenta
+" Color: color13                 #FFAFD7        218            magenta
+" Color: color06                 #5FAFAF        73             darkcyan
+" Color: color14                 #5FD7D7        116            cyan
+" Color: color07                 #C6C6C6        251            grey
+" Color: color15                 #FFFFFF        231            white
+" Color: colorDimWhite           #EEEEEE        255            grey
+" Color: colorLine               #262626        235            darkgrey
+" Color: colorB                  #1C1C1C        234            darkgrey
+" Color: colorNonT               #585858        240            grey
+" Color: colorTab                #585858        240            grey
+" Color: colorC                  #FFFFFF        231            white
+" Color: colorlC                 #FF5FFF        207            magenta
+" Color: colorV                  #005F87        24             darkblue
+" Color: colorMP                 #C5E7C5        30             darkcyan
+" Color: colorPMenuSel           #005F00        22             darkgreen
+" Color: colorDim                #878787        102            grey
+" Color: diffAdd                 #AF87AF        139            darkmagenta
+" Color: diffDelete              #D78787        174            darkred
+" Color: diffChange              #D0D0D0        252            lightgray
+" Color: diffText                #5FD7D7        80             cyan
+" Color: fgDiff                  #000000        16             black
+" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
+" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" Background: light
+" Color: color00                 #000000        16             black
+" Color: color08                 #767676        243            darkgrey
+" Color: color01                 #870000        88             darkred
+" Color: color09                 #D70000        160            red
+" Color: color02                 #008700        28             darkgreen
+" Color: color10                 #87D787        114            green
+" Color: color03                 #875F00        94             darkyellow
+" Color: color11                 #D7D787        186            yellow
+" Color: color04                 #005FAF        25             darkblue
+" Color: color12                 #0087D7        32             blue
+" Color: color05                 #870087        90             darkmagenta
+" Color: color13                 #AF00AF        133            magenta
+" Color: color06                 #005F5F        23             darkcyan
+" Color: color14                 #00AFAF        37             cyan
+" Color: color07                 #808080        244            grey
+" Color: color15                 #FFFFFF        231            white
+" Color: colorLine               #E4E4E4        254            grey
+" Color: colorB                  #EEEEEE        255            grey
+" Color: colorNonT               #9E9E9E        247            darkgrey
+" Color: colorTab                #BCBCBC        250            lightgrey
+" Color: colorC                  #000000        16             black
+" Color: colorlC                 #FF00FF        201            magenta
+" Color: colorV                  #5F87AF        67             darkblue
+" Color: colorMP                 #C5E7C5        30             darkcyan
+" Color: colorPMenuSel           #AFD7AF        151            darkgreen
+" Color: colorDim                #626262        241            darkgrey
+" Color: diffAdd                 #D7AFD7        182            darkmagenta
+" Color: diffDelete              #870000        88             darkred
+" Color: diffChange              #D0D0D0        252            lightgray
+" Color: diffText                #5FD7D7        80             cyan
+" Color: fgDiff                  #000000        16             black
+" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
+" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" Background: any
+" vim: et ts=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: 2022-07-26 15:50:07
+" Last Updated: Tue 23 Aug 2022 16:50:41 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'morning'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']

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: 2022-07-26 15:50:08
+" Last Updated: Tue 23 Aug 2022 16:50:41 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'murphy'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']

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: 2022-07-26 15:50:09
+" Last Updated: Tue 23 Aug 2022 16:50:42 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -12,7 +12,7 @@ set background=dark
 hi clear
 let g:colors_name = 'pablo'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']

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: 2022-07-26 15:50:10
+" Last Updated: Tue 23 Aug 2022 16:50:42 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'peachpuff'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']

runtime/colors/quiet.vim

@@ -4,15 +4,16 @@
 " Maintainer:   neutaaaaan <neutaaaaan-gh@protonmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Vim License (see `:help license`)`
-" Last Updated: 2022-08-01 15:13:21
+" Last Updated: Tue 23 Aug 2022 16:50:43 MSK
 
 " Generated by Colortemplate v2.2.0
 
 hi clear
 let g:colors_name = 'quiet'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
 
+hi! link Terminal Normal
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
 hi! link Boolean Constant
@@ -48,7 +49,6 @@ if &background ==# 'dark'
     let g:terminal_ansi_colors = ['#080808', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff']
   endif
   hi Normal guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
-  hi Terminal guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
   hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
   hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
@@ -62,39 +62,39 @@ if &background ==# 'dark'
   hi Directory guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
   hi EndOfBuffer guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
   hi ErrorMsg guifg=#dadada guibg=#080808 gui=reverse cterm=reverse
-  hi FoldColumn guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
+  hi FoldColumn guifg=#707070 guibg=NONE gui=NONE cterm=NONE
   hi Folded guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
   hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
-  hi LineNr guifg=#444444 guibg=#080808 gui=NONE cterm=NONE
-  hi MatchParen guifg=#ff00af guibg=#080808 gui=bold cterm=bold
-  hi ModeMsg guifg=#dadada guibg=#080808 gui=bold cterm=bold
-  hi MoreMsg guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi LineNr guifg=#444444 guibg=NONE gui=NONE cterm=NONE
+  hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
+  hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE
   hi Pmenu guifg=#080808 guibg=#87afd7 gui=NONE cterm=NONE
   hi PmenuSbar guifg=#dadada guibg=#707070 gui=NONE cterm=NONE
   hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
   hi PmenuThumb guifg=#dadada guibg=#d787d7 gui=NONE cterm=NONE
-  hi Question guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
   hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse
-  hi SignColumn guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
-  hi SpecialKey guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
-  hi SpellBad guifg=#d7005f guibg=#080808 guisp=#d7005f gui=undercurl cterm=underline
-  hi SpellCap guifg=#0087d7 guibg=#080808 guisp=#0087d7 gui=undercurl cterm=underline
-  hi SpellLocal guifg=#d787d7 guibg=#080808 guisp=#d787d7 gui=undercurl cterm=underline
-  hi SpellRare guifg=#00afaf guibg=#080808 guisp=#00afaf gui=undercurl cterm=underline
+  hi SignColumn guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi SpellBad guifg=#d7005f guibg=NONE guisp=#d7005f gui=undercurl cterm=underline
+  hi SpellCap guifg=#0087d7 guibg=NONE guisp=#0087d7 gui=undercurl cterm=underline
+  hi SpellLocal guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline
+  hi SpellRare guifg=#00afaf guibg=NONE guisp=#00afaf gui=undercurl cterm=underline
   hi StatusLine guifg=#080808 guibg=#dadada gui=bold cterm=bold
   hi StatusLineNC guifg=#707070 guibg=#080808 gui=underline cterm=underline
   hi TabLine guifg=#707070 guibg=#080808 gui=underline cterm=underline
   hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi TabLineSel guifg=#080808 guibg=#dadada gui=bold cterm=bold
-  hi Title guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi Title guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi VertSplit guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
   hi Visual guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
   hi VisualNOS guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-  hi WarningMsg guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi WildMenu guifg=#00afff guibg=#080808 gui=bold cterm=bold
-  hi Comment guifg=#707070 guibg=#080808 gui=bold cterm=bold
+  hi Comment guifg=#707070 guibg=NONE gui=bold cterm=bold
   hi Constant guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse
   hi Identifier guifg=#dadada guibg=NONE gui=NONE cterm=NONE
@@ -114,7 +114,6 @@ else
     let g:terminal_ansi_colors = ['#080808', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
   endif
   hi Normal guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi Terminal guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
   hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
   hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
@@ -125,26 +124,26 @@ else
   hi DiffChange guifg=#afafd7 guibg=#080808 gui=reverse cterm=reverse
   hi DiffDelete guifg=#d78787 guibg=#080808 gui=reverse cterm=reverse
   hi DiffText guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
-  hi Directory guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi Directory guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#080808 guibg=NONE gui=NONE cterm=NONE
   hi ErrorMsg guifg=#080808 guibg=#d7d7d7 gui=reverse cterm=reverse
-  hi FoldColumn guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi FoldColumn guifg=#626262 guibg=NONE gui=NONE cterm=NONE
   hi Folded guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
   hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
-  hi LineNr guifg=#a8a8a8 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi LineNr guifg=#a8a8a8 guibg=NONE gui=NONE cterm=NONE
   hi MatchParen guifg=#ff00af guibg=#d7d7d7 gui=bold cterm=bold
-  hi ModeMsg guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold
-  hi MoreMsg guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi ModeMsg guifg=#080808 guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#626262 guibg=NONE gui=NONE cterm=NONE
   hi Pmenu guifg=#080808 guibg=#afafd7 gui=NONE cterm=NONE
   hi PmenuSbar guifg=#080808 guibg=#626262 gui=NONE cterm=NONE
   hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
   hi PmenuThumb guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
-  hi Question guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi Question guifg=#080808 guibg=NONE gui=NONE cterm=NONE
   hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
   hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse
-  hi SignColumn guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi SpecialKey guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi SignColumn guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#080808 guibg=NONE gui=NONE cterm=NONE
   hi SpellBad guifg=#af0000 guibg=#d7d7d7 guisp=#af0000 gui=undercurl cterm=underline
   hi SpellCap guifg=#005faf guibg=#d7d7d7 guisp=#005faf gui=undercurl cterm=underline
   hi SpellLocal guifg=#870087 guibg=#d7d7d7 guisp=#870087 gui=undercurl cterm=underline
@@ -154,13 +153,13 @@ else
   hi TabLine guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE
   hi TabLineFill guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
   hi TabLineSel guifg=#eeeeee guibg=#080808 gui=bold cterm=bold
-  hi Title guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi Title guifg=#080808 guibg=NONE gui=NONE cterm=NONE
   hi VertSplit guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
   hi Visual guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
   hi VisualNOS guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi WarningMsg guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi WarningMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE
   hi WildMenu guifg=#080808 guibg=#eeeeee gui=bold cterm=bold
-  hi Comment guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold
+  hi Comment guifg=#080808 guibg=NONE gui=bold cterm=bold
   hi Constant guifg=#080808 guibg=NONE gui=NONE cterm=NONE
   hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse
   hi Identifier guifg=#080808 guibg=NONE gui=NONE cterm=NONE
@@ -179,7 +178,6 @@ endif
 if s:t_Co >= 256
   if &background ==# 'dark'
     hi Normal ctermfg=253 ctermbg=232 cterm=NONE
-    hi Terminal ctermfg=253 ctermbg=232 cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
@@ -193,39 +191,39 @@ if s:t_Co >= 256
     hi Directory ctermfg=253 ctermbg=232 cterm=NONE
     hi EndOfBuffer ctermfg=253 ctermbg=232 cterm=NONE
     hi ErrorMsg ctermfg=253 ctermbg=232 cterm=reverse
-    hi FoldColumn ctermfg=242 ctermbg=232 cterm=NONE
+    hi FoldColumn ctermfg=242 ctermbg=NONE cterm=NONE
     hi Folded ctermfg=242 ctermbg=232 cterm=NONE
     hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
-    hi LineNr ctermfg=238 ctermbg=232 cterm=NONE
-    hi MatchParen ctermfg=199 ctermbg=232 cterm=bold
-    hi ModeMsg ctermfg=253 ctermbg=232 cterm=bold
-    hi MoreMsg ctermfg=253 ctermbg=232 cterm=NONE
+    hi LineNr ctermfg=238 ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
+    hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=253 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=242 ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=232 ctermbg=110 cterm=NONE
     hi PmenuSbar ctermfg=253 ctermbg=242 cterm=NONE
     hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE
     hi PmenuThumb ctermfg=253 ctermbg=176 cterm=NONE
-    hi Question ctermfg=253 ctermbg=232 cterm=NONE
+    hi Question ctermfg=253 ctermbg=NONE cterm=NONE
     hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
     hi Search ctermfg=39 ctermbg=232 cterm=reverse
-    hi SignColumn ctermfg=253 ctermbg=232 cterm=NONE
-    hi SpecialKey ctermfg=253 ctermbg=232 cterm=NONE
-    hi SpellBad ctermfg=161 ctermbg=232 cterm=underline
-    hi SpellCap ctermfg=32 ctermbg=232 cterm=underline
-    hi SpellLocal ctermfg=176 ctermbg=232 cterm=underline
-    hi SpellRare ctermfg=37 ctermbg=232 cterm=underline
+    hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=253 ctermbg=NONE cterm=NONE
+    hi SpellBad ctermfg=161 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=32 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=176 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=232 ctermbg=253 cterm=bold
     hi StatusLineNC ctermfg=242 ctermbg=232 cterm=underline
     hi TabLine ctermfg=242 ctermbg=232 cterm=underline
     hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=232 ctermbg=253 cterm=bold
-    hi Title ctermfg=253 ctermbg=232 cterm=NONE
+    hi Title ctermfg=253 ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=242 ctermbg=232 cterm=NONE
     hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=236 cterm=NONE
-    hi WarningMsg ctermfg=253 ctermbg=232 cterm=NONE
+    hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=39 ctermbg=232 cterm=bold
-    hi Comment ctermfg=242 ctermbg=232 cterm=bold
+    hi Comment ctermfg=242 ctermbg=NONE cterm=bold
     hi Constant ctermfg=253 ctermbg=NONE cterm=NONE
     hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse
     hi Identifier ctermfg=253 ctermbg=NONE cterm=NONE
@@ -242,7 +240,6 @@ if s:t_Co >= 256
   else
     " Light background
     hi Normal ctermfg=232 ctermbg=188 cterm=NONE
-    hi Terminal ctermfg=232 ctermbg=188 cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
@@ -253,26 +250,26 @@ if s:t_Co >= 256
     hi DiffChange ctermfg=146 ctermbg=232 cterm=reverse
     hi DiffDelete ctermfg=174 ctermbg=232 cterm=reverse
     hi DiffText ctermfg=176 ctermbg=232 cterm=reverse
-    hi Directory ctermfg=232 ctermbg=188 cterm=NONE
-    hi EndOfBuffer ctermfg=232 ctermbg=188 cterm=NONE
+    hi Directory ctermfg=232 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=232 ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=232 ctermbg=188 cterm=reverse
-    hi FoldColumn ctermfg=241 ctermbg=188 cterm=NONE
+    hi FoldColumn ctermfg=241 ctermbg=NONE cterm=NONE
     hi Folded ctermfg=241 ctermbg=188 cterm=NONE
     hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
-    hi LineNr ctermfg=248 ctermbg=188 cterm=NONE
+    hi LineNr ctermfg=248 ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=199 ctermbg=188 cterm=bold
-    hi ModeMsg ctermfg=232 ctermbg=188 cterm=bold
-    hi MoreMsg ctermfg=232 ctermbg=188 cterm=NONE
+    hi ModeMsg ctermfg=232 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=232 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=241 ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=232 ctermbg=146 cterm=NONE
     hi PmenuSbar ctermfg=232 ctermbg=241 cterm=NONE
     hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE
     hi PmenuThumb ctermfg=232 ctermbg=176 cterm=NONE
-    hi Question ctermfg=232 ctermbg=188 cterm=NONE
+    hi Question ctermfg=232 ctermbg=NONE cterm=NONE
     hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
     hi Search ctermfg=39 ctermbg=232 cterm=reverse
-    hi SignColumn ctermfg=232 ctermbg=188 cterm=NONE
-    hi SpecialKey ctermfg=232 ctermbg=188 cterm=NONE
+    hi SignColumn ctermfg=232 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=232 ctermbg=NONE cterm=NONE
     hi SpellBad ctermfg=124 ctermbg=188 cterm=underline
     hi SpellCap ctermfg=25 ctermbg=188 cterm=underline
     hi SpellLocal ctermfg=90 ctermbg=188 cterm=underline
@@ -282,13 +279,13 @@ if s:t_Co >= 256
     hi TabLine ctermfg=232 ctermbg=248 cterm=NONE
     hi TabLineFill ctermfg=232 ctermbg=188 cterm=NONE
     hi TabLineSel ctermfg=255 ctermbg=232 cterm=bold
-    hi Title ctermfg=232 ctermbg=188 cterm=NONE
+    hi Title ctermfg=232 ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=241 ctermbg=188 cterm=NONE
     hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=255 cterm=NONE
-    hi WarningMsg ctermfg=232 ctermbg=188 cterm=NONE
+    hi WarningMsg ctermfg=232 ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=232 ctermbg=255 cterm=bold
-    hi Comment ctermfg=232 ctermbg=188 cterm=bold
+    hi Comment ctermfg=232 ctermbg=NONE cterm=bold
     hi Constant ctermfg=232 ctermbg=NONE cterm=NONE
     hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse
     hi Identifier ctermfg=232 ctermbg=NONE cterm=NONE
@@ -310,23 +307,22 @@ endif
 if s:t_Co >= 16
   if &background ==# 'dark'
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
     hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
     hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
-    hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse
-    hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse
-    hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse
-    hi DiffText ctermfg=5 ctermbg=0 cterm=reverse
+    hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
     hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
     hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
@@ -337,14 +333,14 @@ if s:t_Co >= 16
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
-    hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse
-    hi Search ctermfg=6 ctermbg=0 cterm=reverse
+    hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
-    hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline
-    hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline
-    hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
@@ -373,23 +369,22 @@ if s:t_Co >= 16
   else
     " Light background
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
     hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
     hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
-    hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse
-    hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse
-    hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse
-    hi DiffText ctermfg=5 ctermbg=0 cterm=reverse
+    hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
     hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
     hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
@@ -400,14 +395,14 @@ if s:t_Co >= 16
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
-    hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse
-    hi Search ctermfg=6 ctermbg=0 cterm=reverse
+    hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
-    hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline
-    hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline
-    hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
@@ -441,23 +436,22 @@ endif
 if s:t_Co >= 8
   if &background ==# 'dark'
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
     hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
     hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
-    hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse
-    hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse
-    hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse
-    hi DiffText ctermfg=5 ctermbg=0 cterm=reverse
+    hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
     hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
     hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
@@ -468,14 +462,14 @@ if s:t_Co >= 8
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
-    hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse
-    hi Search ctermfg=6 ctermbg=0 cterm=reverse
+    hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
-    hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline
-    hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline
-    hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
@@ -504,23 +498,22 @@ if s:t_Co >= 8
   else
     " Light background
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
     hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
     hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
-    hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse
-    hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse
-    hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse
-    hi DiffText ctermfg=5 ctermbg=0 cterm=reverse
+    hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
     hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
     hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
@@ -531,14 +524,14 @@ if s:t_Co >= 8
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
-    hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse
-    hi Search ctermfg=6 ctermbg=0 cterm=reverse
+    hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
-    hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline
-    hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline
-    hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
@@ -638,69 +631,69 @@ if s:t_Co >= 0
 endif
 
 " Background: dark
-" Color: dark0         #080808                       ~     0
-" Color: dark1         #d7005f                       ~     1
-" Color: dark2         #00af5f                       ~     2
-" Color: dark3         #d78700                       ~     3
-" Color: dark4         #0087d7                       ~     4
-" Color: dark5         #d787d7                       ~     5
-" Color: dark6         #00afaf                       ~     6
-" Color: dark7         #dadada                       ~     7
-" Color: dark8         #707070                       ~     8
-" Color: dark9         #ff005f                       ~     9
-" Color: dark10        #00d75f                       ~    10
-" Color: dark11        #ffaf00                       ~    11
-" Color: dark12        #5fafff                       ~    12
-" Color: dark13        #ff87ff                       ~    13
-" Color: dark14        #00d7d7                       ~    14
-" Color: dark15        #ffffff                       ~    15
-" Color: diffred              #d75f5f                ~          
-" Color: diffgreen            #00af00                ~          
-" Color: diffblue             #87afd7                ~          
-" Color: diffpink 	          #d787d7                ~
-" Color: uipink               #ff00af                ~          
-" Color: uilime               #afff00                ~          
-" Color: uiteal               #00ffaf                ~                                      
-" Color: uiblue               #00afff                ~          
-" Color: uipurple             #af00ff                ~          
-" Color: uiamber              #ffaf00                ~          
-" Color: uiblack              #303030                ~          
-" Color: yasogrey             #1c1c1c                ~
-" Color: linenrblack          #444444                ~
-" Color: errorred             #ff005f                ~
+" Color: dark0         #080808           232               black
+" Color: dark1         #d7005f           161               darkred
+" Color: dark2         #00af5f           35                darkgreen
+" Color: dark3         #d78700           172               darkyellow
+" Color: dark4         #0087d7           32                darkblue
+" Color: dark5         #d787d7           176               darkmagenta
+" Color: dark6         #00afaf           37                darkcyan
+" Color: dark7         #dadada           253               grey
+" Color: dark8         #707070           242               darkgrey
+" Color: dark9         #ff005f           197               red
+" Color: dark10        #00d75f           41                green
+" Color: dark11        #ffaf00           214               yellow
+" Color: dark12        #5fafff           75                blue
+" Color: dark13        #ff87ff           213               magenta
+" Color: dark14        #00d7d7           44                cyan
+" Color: dark15        #ffffff           231               white
+" Color: diffred       #d75f5f           167               darkred
+" Color: diffgreen     #00af00           34                darkgreen
+" Color: diffblue      #87afd7           110               darkblue
+" Color: diffpink 	   #d787d7           176               darkmagenta
+" Color: uipink        #ff00af           199               magenta
+" Color: uilime        #afff00           154               green
+" Color: uiteal        #00ffaf           49                green
+" Color: uiblue        #00afff           39                blue
+" Color: uipurple      #af00ff           129               darkmagenta
+" Color: uiamber       #ffaf00           214               darkyellow
+" Color: uiblack       #303030           236               darkgrey
+" Color: yasogrey      #1c1c1c           234               black
+" Color: linenrblack   #444444           238               darkgrey
+" Color: errorred      #ff005f           197               red
 " Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7
 " Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15
 " Background: light
-" Color: brightwhite          #eeeeee                ~   
-" Color: light0        #080808                       ~     0
-" Color: light1        #af0000                       ~     1
-" Color: light2        #005f00                       ~     2
-" Color: light3        #af5f00                       ~     3
-" Color: light4        #005faf                       ~     4
-" Color: light5        #870087                       ~     5
-" Color: light6        #008787                       ~     6
-" Color: light7        #d7d7d7                       ~     7
-" Color: light8        #626262                       ~     8
-" Color: light9        #d70000                       ~     9
-" Color: light10       #008700                       ~    10
-" Color: light11       #d78700                       ~    11
-" Color: light12       #0087d7                       ~    12
-" Color: light13       #af00af                       ~    13
-" Color: light14       #00afaf                       ~    14
-" Color: light15       #ffffff                       ~    15
-" Color: diffred              #d78787                ~   
-" Color: diffgreen            #87d787                ~   
-" Color: diffblue             #afafd7                ~   
-" Color: diffpink 	          #d787d7                ~
-" Color: uipink               #ff00af                ~          
-" Color: uilime               #afff00                ~          
-" Color: uiteal               #00ffaf                ~                                      
-" Color: uiblue               #00afff                ~          
-" Color: uipurple             #af00ff                ~          
-" Color: uiamber              #ffaf00                ~          
-" Color: invisigrey           #a8a8a8                ~   
-" Color: yasogrey             #e4e4e4                ~
-" Color: errorred             #ff005f                ~
+" Color: brightwhite   #eeeeee           255               grey
+" Color: light0        #080808           232               black
+" Color: light1        #af0000           124               darkred
+" Color: light2        #005f00           22                darkgreen
+" Color: light3        #af5f00           130               darkyellow
+" Color: light4        #005faf           25                darkblue
+" Color: light5        #870087           90                darkmagenta
+" Color: light6        #008787           30                darkcyan
+" Color: light7        #d7d7d7           188               grey
+" Color: light8        #626262           241               darkgrey
+" Color: light9        #d70000           160               red
+" Color: light10       #008700           28                green
+" Color: light11       #d78700           172               yellow
+" Color: light12       #0087d7           32                blue
+" Color: light13       #af00af           127               magenta
+" Color: light14       #00afaf           37                cyan
+" Color: light15       #ffffff           231               white
+" Color: diffred       #d78787           174               red
+" Color: diffgreen     #87d787           114               green
+" Color: diffblue      #afafd7           146               blue
+" Color: diffpink      #d787d7           176               magenta
+" Color: uipink        #ff00af           199               magenta
+" Color: uilime        #afff00           154               green
+" Color: uiteal        #00ffaf           49                cyan
+" Color: uiblue        #00afff           39                blue
+" Color: uipurple      #af00ff           129               darkmagenta
+" Color: uiamber       #ffaf00           214               yellow
+" Color: invisigrey    #a8a8a8           248               darkgrey
+" Color: yasogrey      #e4e4e4           254               grey
+" Color: errorred      #ff005f           197               red
 " Term colors: light0 light1 light2 light3 light4 light5 light6 light7
 " Term colors: light8 light9 light10 light11 light12 light13 light14 light15
 " Background: any

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: 2022-07-26 15:50:11
+" Last Updated: Tue 23 Aug 2022 16:50:45 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -12,7 +12,7 @@ set background=dark
 hi clear
 let g:colors_name = 'ron'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
 
 hi! link Terminal Normal
 hi! link Boolean Constant

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: 2022-07-26 15:50:12
+" Last Updated: Tue 23 Aug 2022 16:50:46 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'shine'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']

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: 2022-07-26 15:50:14
+" Last Updated: Tue 23 Aug 2022 16:50:46 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,10 +13,10 @@ set background=dark
 hi clear
 let g:colors_name = 'slate'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']
+  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 endif
 hi! link Terminal Normal
 hi! link LineNrAbove LineNr
@@ -53,18 +53,18 @@ hi Visual guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE
 hi SignColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
 hi VisualNOS guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE
 hi LineNr guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#5f87d7 guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
 hi ErrorMsg guifg=#ff0000 guibg=#000000 gui=reverse cterm=reverse
 hi ModeMsg guifg=#262626 guibg=#ffd700 gui=NONE cterm=NONE
 hi WarningMsg guifg=#ff8787 guibg=NONE gui=NONE cterm=NONE
 hi MoreMsg guifg=#00875f guibg=NONE gui=NONE cterm=NONE
 hi Question guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#ff0000 guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE
 hi Search guifg=#000000 guibg=#d7875f gui=NONE cterm=NONE
 hi IncSearch guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
+hi Todo guifg=#ff0000 guibg=#ffff00 gui=NONE cterm=NONE
 hi WildMenu guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE
+hi Underlined guifg=#5f87d7 guibg=NONE gui=underline cterm=underline
 hi Cursor guifg=#333333 guibg=#d7d787 gui=NONE cterm=NONE
 hi lCursor guifg=#262626 guibg=#ffafaf gui=NONE cterm=NONE
 hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
@@ -128,18 +128,18 @@ if s:t_Co >= 256
   hi SignColumn ctermfg=NONE ctermbg=235 cterm=NONE
   hi VisualNOS ctermfg=186 ctermbg=64 cterm=NONE
   hi LineNr ctermfg=241 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=68 ctermbg=NONE cterm=underline
   hi Error ctermfg=196 ctermbg=231 cterm=reverse
   hi ErrorMsg ctermfg=196 ctermbg=16 cterm=reverse
   hi ModeMsg ctermfg=235 ctermbg=220 cterm=NONE
   hi WarningMsg ctermfg=210 ctermbg=NONE cterm=NONE
   hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
   hi Question ctermfg=220 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=196 ctermbg=226 cterm=NONE
   hi MatchParen ctermfg=16 ctermbg=220 cterm=NONE
   hi Search ctermfg=16 ctermbg=173 cterm=NONE
   hi IncSearch ctermfg=16 ctermbg=46 cterm=NONE
+  hi Todo ctermfg=196 ctermbg=226 cterm=NONE
   hi WildMenu ctermfg=235 ctermbg=186 cterm=NONE
+  hi Underlined ctermfg=68 ctermbg=NONE cterm=underline
   hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=226 ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=217 ctermbg=NONE cterm=underline
@@ -169,12 +169,12 @@ if s:t_Co >= 256
 endif
 
 if s:t_Co >= 16
-  hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineNC ctermfg=darkgrey ctermbg=grey cterm=NONE
-  hi StatusLineTerm ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineTermNC ctermfg=darkgrey ctermbg=grey cterm=NONE
+  hi Normal ctermfg=grey ctermbg=black cterm=NONE
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=white ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
+  hi StatusLineTerm ctermfg=white ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=black ctermbg=grey cterm=NONE
   hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
@@ -198,38 +198,38 @@ if s:t_Co >= 16
   hi SignColumn ctermfg=NONE ctermbg=black cterm=NONE
   hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=NONE
   hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   hi Error ctermfg=darkred ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
   hi ModeMsg ctermfg=black ctermbg=yellow cterm=NONE
   hi WarningMsg ctermfg=cyan ctermbg=NONE cterm=NONE
   hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE
   hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkred ctermbg=darkyellow cterm=NONE
   hi MatchParen ctermfg=black ctermbg=yellow cterm=NONE
   hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=red ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
-  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi String ctermfg=cyan ctermbg=NONE cterm=NONE
-  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=bold
-  hi Constant ctermfg=red ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=red ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Operator ctermfg=red ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=red ctermbg=NONE cterm=NONE
+  hi Structure ctermfg=green ctermbg=NONE cterm=NONE
+  hi Function ctermfg=yellow ctermbg=NONE cterm=NONE
   hi Type ctermfg=blue ctermbg=NONE cterm=bold
-  hi Operator ctermfg=darkmagenta 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=bold
+  hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=yellow ctermbg=NONE cterm=bold
+  hi Title ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -274,27 +274,28 @@ if s:t_Co >= 8
   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 Todo ctermfg=black ctermbg=yellow cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   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 Identifier ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=bold
+  hi Operator ctermfg=darkred ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Structure ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Function ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi Type ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Operator ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Define ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Structure ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -376,29 +377,45 @@ if s:t_Co >= 0
 endif
 
 " Background: dark
-" Color: foreground  #FFFFFF        231            white
-" Color: background  #262626        235            black
-" Color: color00     #000000        16             black
-" Color: color08     #333333        236            darkgrey
-" Color: color01     #FF0000        196            darkred
-" Color: color09     #FFAFAF        217            red
-" Color: color02     #5F8700        64             darkgreen
-" Color: color10     #00875F        29             green
-" Color: color03     #ffff00        226            darkyellow
-" Color: color11     #FFD700        220            yellow
-" Color: color04     #87d7FF        117            darkblue
-" Color: color12     #5F87D7        68             blue
-" Color: color05     #d7d787        186            darkmagenta
-" Color: color13     #AFAF87        144            magenta
-" Color: color06     #FFD7AF        223            darkcyan
-" Color: color14     #FF8787        210            cyan
-" Color: color07     #666666        241            grey
-" Color: color15     #FFFFFF        231            white
-" Color: color16     #D7875F        173            darkmagenta
-" Color: color17     #00FF00        46             darkgreen
-" Color: Pmenu       #4A4A4A        239            darkgrey
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" Color: x_black       #000000           16                black
+" Color: x_darkred     #cd0000           160               darkred
+" Color: x_darkgreen   #00cd00           40                darkgreen
+" Color: x_darkyellow  #cdcd00           184               darkyellow
+" Color: x_darkblue    #0000ee           21                darkblue
+" Color: x_darkmagenta #cd00cd           164               darkmagenta
+" Color: x_darkcyan    #00cdcd           44                darkcyan
+" Color: x_gray        #e5e5e5           254               gray
+" Color: x_darkgray    #7f7f7f           244               darkgray
+" Color: x_red         #ff0000           196               red
+" Color: x_green       #00ff00           46                green
+" Color: x_yellow      #ffff00           226               yellow
+" Color: x_blue        #5c5cff           63                blue
+" Color: x_magenta     #ff00ff           201               magenta
+" Color: x_cyan        #00ffff           51                cyan
+" Color: x_white       #ffffff           231               white
+" Color: foreground    #FFFFFF           231               white
+" Color: background    #262626           235               black
+" Color: color00       #000000           16                black
+" Color: color08       #333333           236               darkgrey
+" Color: color01       #FF0000           196               darkred
+" Color: color09       #FFAFAF           217               red
+" Color: color02       #5F8700           64                darkgreen
+" Color: color10       #00875F           29                green
+" Color: color03       #ffff00           226               darkyellow
+" Color: color11       #FFD700           220               yellow
+" Color: color04       #87d7FF           117               darkblue
+" Color: color12       #5F87D7           68                blue
+" Color: color05       #d7d787           186               darkmagenta
+" Color: color13       #AFAF87           144               magenta
+" Color: color06       #FFD7AF           223               darkcyan
+" Color: color14       #FF8787           210               cyan
+" Color: color07       #666666           241               grey
+" Color: color15       #FFFFFF           231               white
+" Color: color16       #D7875F           173               darkmagenta
+" Color: color17       #00FF00           46                darkgreen
+" Color: Pmenu         #4A4A4A           239               darkgrey
+" Term colors: x_black    x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray
+" Term colors: x_darkgray x_red     x_green     x_yellow     x_blue     x_magenta     x_cyan     x_white
 " Color: bgDiffA     #5F875F        65             darkgreen
 " Color: bgDiffC     #5F87AF        67             blue
 " Color: bgDiffD     #AF5FAF        133            magenta

runtime/colors/tools/check_colors.vim

@@ -6,10 +6,23 @@ vim9script
 def Test_check_colors()
     const savedview = winsaveview()
     cursor(1, 1)
-    var err = {}
+
+    # err is
+    # {
+    #    colors_name: "message",
+    #    init: "message",
+    #    background: "message",
+    #    ....etc
+    #    highlight: {
+    #       'Normal': "Missing ...",
+    #       'Conceal': "Missing ..."
+    #       ....etc
+    #    }
+    # }
+    var err: dict<any> = {}
 
     # 1) Check g:colors_name is existing
-    if !search('\<\%(g:\)\?colors_name\>', 'cnW')
+    if search('\<\%(g:\)\?colors_name\>', 'cnW') == 0
         err['colors_name'] = 'g:colors_name not set'
     else
         err['colors_name'] = 'OK'
@@ -180,11 +193,12 @@ def Test_check_colors()
     Result(err)
 enddef
 
-def Result(err: any)
+
+def Result(err: dict<any>)
     var do_groups: bool = v:false
     echohl Title | echomsg "---------------" | echohl Normal
     for key in sort(keys(err))
-        if key is 'highlight'
+        if key == 'highlight'
             do_groups = !empty(err[key])
             continue
         else

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: 2022-07-26 15:50:15
+" Last Updated: Tue 23 Aug 2022 16:50:47 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'torte'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']

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: 2022-07-26 15:50:16
+" Last Updated: Tue 23 Aug 2022 16:50:48 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'zellner'
 
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -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']

runtime/compiler/context.vim

@@ -1,54 +1,48 @@
-" Vim compiler file
-" Compiler:     ConTeXt typesetting engine
-" Maintainer:   Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Last Change:  2016 Oct 21
+vim9script
 
-if exists("current_compiler")
+# Language:           ConTeXt typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision:    2022 Aug 12
+
+if exists("g:current_compiler")
   finish
 endif
-let s:keepcpo= &cpo
-set cpo&vim
 
-if exists(":CompilerSet") != 2    " older Vim always used :setlocal
+import autoload '../autoload/context.vim'
+
+if exists(":CompilerSet") != 2 # Older Vim always used :setlocal
   command -nargs=* CompilerSet setlocal <args>
 endif
 
-" If makefile exists and we are not asked to ignore it, we use standard make
-" (do not redefine makeprg)
+g:current_compiler = 'context'
+
 if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
-      \ (!filereadable('Makefile') && !filereadable('makefile'))
-  let current_compiler = 'context'
-  " The following assumes that the current working directory is set to the
-  " directory of the file to be typeset
-  let &l:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode --synctex='
-        \ . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-        \ . ' ' . shellescape(expand('%:p:t'))
+  (!filereadable('Makefile') && !filereadable('makefile'))
+  &l:makeprg =  join(context.ConTeXtCmd(shellescape(expand('%:p:t'))), ' ')
 else
-  let current_compiler = 'make'
+  g:current_compiler = 'make'
 endif
 
-let b:context_errorformat = ''
-      \ . '%-Popen source%.%#> %f,'
-      \ . '%-Qclose source%.%#> %f,'
-      \ . "%-Popen source%.%#name '%f',"
-      \ . "%-Qclose source%.%#name '%f',"
-      \ . '%Etex %trror%.%#mp error on line %l in file %f:%.%#,'
-      \ . 'tex %trror%.%#error on line %l in file %f: %m,'
-      \ . '%Elua %trror%.%#error on line %l in file %f:,'
-      \ . '%+Emetapost %#> error: %#,'
-      \ . '! error: %#%m,'
-      \ . '%-C %#,'
-      \ . '%C! %m,'
-      \ . '%Z[ctxlua]%m,'
-      \ . '%+C<*> %.%#,'
-      \ . '%-C%.%#,'
-      \ . '%Z...%m,'
-      \ . '%-Zno-error,'
-      \ . '%-G%.%#' " Skip remaining lines
+const context_errorformat = join([
+  "%-Popen source%.%#> %f",
+  "%-Qclose source%.%#> %f",
+  "%-Popen source%.%#name '%f'",
+  "%-Qclose source%.%#name '%f'",
+  "tex %trror%.%#error on line %l in file %f: %m",
+  "%Elua %trror%.%#error on line %l in file %f:",
+  "%+Emetapost %#> error: %#",
+  "%Emetafun%.%#error: %m",
+  "! error: %#%m",
+  "%-C %#",
+  "%C! %m",
+  "%Z[ctxlua]%m",
+  "%+C<*> %.%#",
+  "%-C%.%#",
+  "%Z...%m",
+  "%-Zno-error",
+  "%-G%.%#"], ",")
 
-execute 'CompilerSet errorformat=' . escape(b:context_errorformat, ' ')
+execute 'CompilerSet errorformat=' .. escape(context_errorformat, ' ')
 
-let &cpo = s:keepcpo
-unlet s:keepcpo
+# vim: sw=2 fdm=marker

runtime/compiler/raco.vim

@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'raco'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco
+CompilerSet errorformat=%f:%l:%c:%m

runtime/compiler/racomake.vim

@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco make (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'racomake'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco\ make\ --\ %
+CompilerSet errorformat=%f:%l:%c:%m

runtime/compiler/racosetup.vim

@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco setup (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'racosetup'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco\ setup
+CompilerSet errorformat=%f:%l:%c:%m

runtime/compiler/racotest.vim

@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco test (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'racotest'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco\ test\ %
+CompilerSet errorformat=location:%f:%l:%c

runtime/doc/Makefile

@@ -31,6 +31,8 @@ DOCS = \
 	filetype.txt \
 	fold.txt \
 	ft_ada.txt \
+	ft_context.txt \
+	ft_mp.txt \
 	ft_ps1.txt \
 	ft_raku.txt \
 	ft_rust.txt \
@@ -180,6 +182,8 @@ HTMLS = \
 	filetype.html \
 	fold.html \
 	ft_ada.html \
+	ft_context.html \
+	ft_mp.html \
 	ft_ps1.html \
 	ft_raku.html \
 	ft_rust.html \

runtime/doc/builtin.txt

@@ -253,6 +253,7 @@ getreg([{regname} [, 1 [, {list}]]])
 				String or List   contents of a register
 getreginfo([{regname}])		Dict	information about a register
 getregtype([{regname}])		String	type of a register
+getscriptinfo([{opts}])		List	list of sourced scripts
 gettabinfo([{expr}])		List	list of tab pages
 gettabvar({nr}, {varname} [, {def}])
 				any	variable {varname} in tab {nr} or {def}
@@ -291,6 +292,8 @@ iconv({expr}, {from}, {to})	String	convert encoding of {expr}
 indent({lnum})			Number	indent of line {lnum}
 index({object}, {expr} [, {start} [, {ic}]])
 				Number	index in {object} where {expr} appears
+indexof({object}, {expr} [, {opts}]])
+				Number	index in {object} where {expr} is true
 input({prompt} [, {text} [, {completion}]])
 				String	get input from the user
 inputdialog({prompt} [, {text} [, {cancelreturn}]])
@@ -502,6 +505,7 @@ setbufvar({buf}, {varname}, {val})
 setcellwidths({list})		none	set character cell width overrides
 setcharpos({expr}, {list})	Number	set the {expr} position to {list}
 setcharsearch({dict})		Dict	set character search from {dict}
+setcmdline({str} [, {pos}])	Number	set command-line
 setcmdpos({pos})		Number	set cursor position in command-line
 setcursorcharpos({list})	Number	move cursor to position in {list}
 setenv({name}, {val})		none	set environment variable
@@ -1176,7 +1180,8 @@ browsedir({title}, {initdir})
 		browsing is not possible, an empty string is returned.
 
 bufadd({name})						*bufadd()*
-		Add a buffer to the buffer list with String {name}.
+		Add a buffer to the buffer list with name {name} (must be a
+		String).
 		If a buffer for file {name} already exists, return that buffer
 		number.  Otherwise return the buffer number of the newly
 		created buffer.  When {name} is an empty string then a new
@@ -1229,7 +1234,8 @@ bufload({buf})						*bufload()*
 		Ensure the buffer {buf} is loaded.  When the buffer name
 		refers to an existing file then the file is read.  Otherwise
 		the buffer will be empty.  If the buffer was already loaded
-		then there is no change.
+		then there is no change.  If the buffer is not related to a
+		file the no file is read (e.g., when 'buftype' is "nofile").
 		If there is an existing swap file for the file of the buffer,
 		there will be no dialog, the buffer will be loaded anyway.
 		The {buf} argument is used like with |bufexists()|.
@@ -2731,8 +2737,6 @@ finddir({name} [, {path} [, {count}]])				*finddir()*
 		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}
 
 		Can also be used as a |method|: >
 			GetName()->finddir()
@@ -3422,7 +3426,8 @@ getcmdcompltype()					*getcmdcompltype()*
 		Only works when the command line is being edited, thus
 		requires use of |c_CTRL-\_e| or |c_CTRL-R_=|.
 		See |:command-completion| for the return string.
-		Also see |getcmdtype()|, |setcmdpos()| and |getcmdline()|.
+		Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()| and
+		|setcmdline()|.
 		Returns an empty string when completion is not defined.
 
 getcmdline()						*getcmdline()*
@@ -3431,7 +3436,8 @@ getcmdline()						*getcmdline()*
 		|c_CTRL-R_=|.
 		Example: >
 			:cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR>
-<		Also see |getcmdtype()|, |getcmdpos()| and |setcmdpos()|.
+<		Also see |getcmdtype()|, |getcmdpos()|, |setcmdpos()| and
+		|setcmdline()|.
 		Returns an empty string when entering a password or using
 		|inputsecret()|.
 
@@ -3441,7 +3447,8 @@ getcmdpos()						*getcmdpos()*
 		Only works when editing the command line, thus requires use of
 		|c_CTRL-\_e| or |c_CTRL-R_=| or an expression mapping.
 		Returns 0 otherwise.
-		Also see |getcmdtype()|, |setcmdpos()| and |getcmdline()|.
+		Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()| and
+		|setcmdline()|.
 
 getcmdscreenpos()					*getcmdscreenpos()*
 		Return the screen position of the cursor in the command line
@@ -3450,7 +3457,8 @@ getcmdscreenpos()					*getcmdscreenpos()*
 		Only works when editing the command line, thus requires use of
 		|c_CTRL-\_e| or |c_CTRL-R_=| or an expression mapping.
 		Returns 0 otherwise.
-		Also see |getcmdpos()|, |setcmdpos()|.
+		Also see |getcmdpos()|, |setcmdpos()|, |getcmdline()| and
+		|setcmdline()|.
 
 getcmdtype()						*getcmdtype()*
 		Return the current command-line type. Possible return values
@@ -4086,6 +4094,47 @@ getregtype([{regname}])					*getregtype()*
 		Can also be used as a |method|: >
 			GetRegname()->getregtype()
 
+getscriptinfo([{opts})					*getscriptinfo()*
+		Returns a |List| with information about all the sourced Vim
+		scripts in the order they were sourced, like what
+		`:scriptnames` shows.
+
+		The optional Dict argument {opts} supports the following
+		optional items:
+		    name	Script name match pattern. If specified,
+				and "sid" is not specified, information about
+				scripts with name that match the pattern
+				"name" are returned.
+		    sid		Script ID |<SID>|.  If specified, only
+				information about the script with ID "sid" is
+				returned and "name" is ignored.
+
+		Each item in the returned List is a |Dict| with the following
+		items:
+		    autoload	Set to TRUE for a script that was used with
+				`import autoload` but was not actually sourced
+				yet (see |import-autoload|).
+		    functions   List of script-local function names defined in
+				the script.  Present only when a particular
+				script is specified using the "sid" item in
+				{opts}.
+		    name	Vim script file name.
+		    sid		Script ID |<SID>|.
+		    sourced	Script ID of the actually sourced script that
+				this script name links to, if any, otherwise
+				zero
+		    variables   A dictionary with the script-local variables.
+				Present only when the a particular script is
+				specified using the "sid" item in {opts}.
+				Note that this is a copy, the value of
+				script-local variables cannot be changed using
+				this dictionary.
+		    version	Vimscript version (|scriptversion|)
+
+		Examples: >
+			:echo getscriptinfo({'name': 'myscript'})
+			:echo getscriptinfo({'sid': 15}).variables
+<
 gettabinfo([{tabnr}])					*gettabinfo()*
 		If {tabnr} is not specified, then information about all the
 		tab pages is returned as a |List|. Each List item is a
@@ -4397,8 +4446,11 @@ has({feature} [, {check}])
 
 has_key({dict}, {key})					*has_key()*
 		The result is a Number, which is TRUE if |Dictionary| {dict}
-		has an entry with key {key}.  FALSE otherwise. The {key}
-		argument is a string.
+		has an entry with key {key}.  FALSE otherwise.
+		The {key} argument is a string.  In |Vim9| script a number is
+		also accepted (and converted to a string) but no other types.
+		In legacy script the usual automatic conversion to string is
+		done.
 
 		Can also be used as a |method|: >
 			mydict->has_key(key)
@@ -4730,19 +4782,25 @@ indent({lnum})	The result is a Number, which is indent of line {lnum} in the
 			GetLnum()->indent()
 
 index({object}, {expr} [, {start} [, {ic}]])			*index()*
+		Find {expr} in {object} and return its index.  See
+		|indexof()| for using a lambda to select the item.
+
 		If {object} is a |List| return the lowest index where the item
 		has a value equal to {expr}.  There is no automatic
 		conversion, so the String "4" is different from the Number 4.
 		And the number 4 is different from the Float 4.0.  The value
-		of 'ignorecase' is not used here, case always matters.
+		of 'ignorecase' is not used here, case matters as indicated by
+		the {ic} argument.
 
 		If {object} is |Blob| return the lowest index where the byte
 		value is equal to {expr}.
 
 		If {start} is given then start looking at the item with index
 		{start} (may be negative for an item relative to the end).
+
 		When {ic} is given and it is |TRUE|, ignore case.  Otherwise
 		case must match.
+
 		-1 is returned when {expr} is not found in {object}.
 		Example: >
 			:let idx = index(words, "the")
@@ -4751,6 +4809,47 @@ index({object}, {expr} [, {start} [, {ic}]])			*index()*
 <		Can also be used as a |method|: >
 			GetObject()->index(what)
 
+indexof({object}, {expr} [, {opts}])			*indexof()*
+		Returns the index of an item in {object} where {expr} is
+		v:true.  {object} must be a |List| or a |Blob|.
+
+		If {object} is a |List|, evaluate {expr} for each item in the
+		List until the expression is v:true and return the index of
+		this item.
+
+		If {object} is a |Blob| evaluate {expr} for each byte in the
+		Blob until the expression is v:true and return the index of
+		this byte.
+
+		{expr} must be a |string| or |Funcref|.
+
+		If {expr} is a |string|: If {object} is a |List|, inside
+		{expr} |v:key| has the index of the current List item and
+		|v:val| has the value of the item.  If {object} is a |Blob|,
+		inside {expr} |v:key| has the index of the current byte and
+		|v:val| has the byte value.
+
+		If {expr} is a |Funcref| it must take two arguments:
+			1. the key or the index of the current item.
+			2. the value of the current item.
+		The function must return |TRUE| if the item is found and the
+		search should stop.
+
+		The optional argument {opts} is a Dict and supports the
+		following items:
+		    startidx	start evaluating {expr} at the item with this
+				index; may be negative for an item relative to
+				the end
+		Returns -1 when {expr} evaluates to v:false for all the items.
+		Example: >
+			:let l = [#{n: 10}, #{n: 20}, #{n: 30}]
+			:echo indexof(l, "v:val.n == 20")
+			:echo indexof(l, {i, v -> v.n == 30})
+			:echo indexof(l, "v:val.n == 20", #{startidx: 1})
+
+<		Can also be used as a |method|: >
+			mylist->indexof(expr)
+
 input({prompt} [, {text} [, {completion}]])		*input()*
 		The result is a String, which is whatever the user typed on
 		the command-line.  The {prompt} argument is either a prompt
@@ -7372,8 +7471,10 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		starts in column zero and then matches before the cursor are
 		skipped.  When the 'c' flag is present in 'cpo' the next
 		search starts after the match.  Without the 'c' flag the next
-		search starts one column further.  This matters for
-		overlapping matches.
+		search starts one column after the start of the match.  This
+		matters for overlapping matches.  See |cpo-c|.  You can also
+		insert "\ze" to change where the match ends, see  |/\ze|.
+
 		When searching backwards and the 'z' flag is given then the
 		search starts in column zero, thus no match in the current
 		line will be found (unless wrapping around the end of the
@@ -7847,6 +7948,16 @@ setcharsearch({dict})					*setcharsearch()*
 		Can also be used as a |method|: >
 			SavedSearch()->setcharsearch()
 
+setcmdline({str} [, {pos}])					*setcmdline()*
+		Set the command line to {str} and set the cursor position to
+		{pos}.
+		If {pos} is omitted, the cursor is positioned after the text.
+		Returns 0 when successful, 1 when not editing the command
+		line.
+
+		Can also be used as a |method|: >
+			GetText()->setcmdline()
+
 setcmdpos({pos})					*setcmdpos()*
 		Set the cursor position in the command line to byte position
 		{pos}.  The first position is 1.
@@ -7859,8 +7970,8 @@ setcmdpos({pos})					*setcmdpos()*
 		before inserting the resulting text.
 		When the number is too big the cursor is put at the end of the
 		line.  A number smaller than one has undefined results.
-		Returns FALSE when successful, TRUE when not editing the
-		command line.
+		Returns 0 when successful, 1 when not editing the command
+		line.
 
 		Can also be used as a |method|: >
 			GetPos()->setcmdpos()
@@ -10413,7 +10524,8 @@ use: `if exists('+shellslash')`
 
 
 acl			Compiled with |ACL| support.
-all_builtin_terms	Compiled with all builtin terminals enabled.
+all_builtin_terms	Compiled with all builtin terminals enabled. (always
+			true)
 amiga			Amiga version of Vim.
 arabic			Compiled with Arabic support |Arabic|.
 arp			Compiled with ARP support (Amiga).
@@ -10427,7 +10539,7 @@ browse			Compiled with |:browse| support, and browse() will
 			work.
 browsefilter		Compiled with support for |browsefilter|.
 bsd			Compiled on an OS in the BSD family (excluding macOS).
-builtin_terms		Compiled with some builtin terminals.
+builtin_terms		Compiled with some builtin terminals. (always true)
 byte_offset		Compiled with support for 'o' in 'statusline'
 channel			Compiled with support for |channel| and |job|
 cindent			Compiled with 'cindent' support. (always true)
@@ -10459,7 +10571,8 @@ ex_extra		|+ex_extra| (always true)
 extra_search		Compiled with support for |'incsearch'| and
 			|'hlsearch'|
 farsi			Support for Farsi was removed |farsi|.
-file_in_path		Compiled with support for |gf| and |<cfile>|
+file_in_path		Compiled with support for |gf| and |<cfile>| (always
+			true)
 filterpipe		When 'shelltemp' is off pipes are used for shell
 			read/write/filter commands
 find_in_path		Compiled with support for include file searches

runtime/doc/cmdline.txt

@@ -199,9 +199,6 @@ CTRL-R CTRL-L				*c_CTRL-R_CTRL-L* *c_<C-R>_<C-L>*
 		currently displayed match is used.  With CTRL-W the part of
 		the word that was already typed is not inserted again.
 
-		CTRL-F and CTRL-P: {only when |+file_in_path| feature is
-		included}
-
 					*c_CTRL-R_CTRL-R* *c_<C-R>_<C-R>*
 					*c_CTRL-R_CTRL-O* *c_<C-R>_<C-O>*
 CTRL-R CTRL-R {register CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}

runtime/doc/editing.txt

@@ -247,8 +247,6 @@ If you want to keep the changed buffer without saving it, switch on the
 							*:fin* *:find*
 :fin[d][!] [++opt] [+cmd] {file}
 			Find {file} in 'path' and then |:edit| it.
-			{not available when the |+file_in_path| feature was
-			disabled at compile time}
 
 :{count}fin[d][!] [++opt] [+cmd] {file}
 			Just like ":find", but use the {count} match in
@@ -322,8 +320,6 @@ CTRL-^			Edit the alternate file.  Mostly the alternate file is
 			For Unix the '~' character is expanded, like in
 			"~user/file".  Environment variables are expanded too
 			|expand-env|.
-			{not available when the |+file_in_path| feature was
-			disabled at compile time}
 
 							*v_gf*
 {Visual}[count]gf	Same as "gf", but the highlighted text is used as the
@@ -1707,8 +1703,6 @@ problem goes away the next day.
 ==============================================================================
 11. File Searching					*file-searching*
 
-{not available when compiled without the |+path_extra| feature}
-
 The file searching is currently used for the 'path', 'cdpath' and 'tags'
 options, for |finddir()| and |findfile()|.  Other commands use |wildcards|
 which is slightly different.

runtime/doc/eval.txt

@@ -1098,6 +1098,7 @@ a different type means the values are different: >
 	echo 0 is []
 	0
 "is#"/"isnot#" and "is?"/"isnot?" can be used to match and ignore case.
+In |Vim9| script this doesn't work, two strings are never identical.
 
 In legacy script, when comparing a String with a Number, the String is
 converted to a Number, and the comparison is done on Numbers.  This means
@@ -3607,6 +3608,9 @@ text...
 			iterate over.  Unlike with |List|, modifying the
 			|Blob| does not affect the iteration.
 
+			When {object} is a |String| each item is a string with
+			one character, plus any combining characters.
+
 			In |Vim9| script `:endfor` cannot be shortened, to
 			improve script readability.
 
@@ -3820,6 +3824,18 @@ text...
 		:echomsg "It's a Zizzer Zazzer Zuzz, as you can plainly see."
 <			See |:echo-redraw| to avoid the message disappearing
 			when the screen is redrawn.
+
+					*:echow* *:echowin* *:echowindow*
+:echow[indow] {expr1} ..
+			Like |:echomsg| but when the messages popup window is
+			available the message is displayed there.  This means
+			it will show for three seconds and avoid a
+			|hit-enter| prompt.  If you want to hide it before
+			that, press Esc in Normal mode (when it would
+			otherwise beep).
+			The message window is available when Vim was compiled
+			with the +timer and the +popupwin features.
+
 							*:echoe* *:echoerr*
 :echoe[rr] {expr1} ..	Echo the expression(s) as an error message, saving the
 			message in the |message-history|.  When used in a

runtime/doc/ft_context.txt

@@ -0,0 +1,152 @@
+*ft_context.txt*	For Vim version 9.0.  Last change: 2022 Aug 12
+
+This is the documentation for the ConTeXt filetype plugin.
+
+NOTE: the plugin requires +vim9script.
+
+==============================================================================
+CONTENTS						*context.vim* *ft-context*
+
+1. Introduction				|ft-context-intro|
+2. Commands				|ft-context-commands|
+3. Settings				|ft-context-settings|
+4. Mappings				|ft-context-mappings|
+
+==============================================================================
+							*ft-context-intro*
+Introduction ~
+
+ConTeXt, similarly to LaTeX, is a macro-based typesetting system built on TeX:
+>
+	https://wiki.contextgarden.net
+	https://wiki.contextgarden.net/Vim
+<
+The ConTeXt plugin provides syntax highlighting, completion and support for
+typesetting ConTeXt documents. The recommended way to typeset a document is to
+use |:ConTeXt|. This will invoke the `mtxrun` script that is found in $PATH.
+
+For more fine grained control over the command and its environment, you may
+invoke `context.Typeset()` directly (or `context#Typeset()` from legacy Vim
+script). For instance, if you have installed a version of ConTeXt in
+`~/context`, you may define a function to use it (you may put the following
+code in `~/.vim/after/ftplugin/context.vim`) similar to the following:
+>
+	import autoload 'context.vim'
+
+	def MyConTeXt()
+	    const env = {'PATH':
+	      printf("%s/context/tex/texmf-<os>-<arch>/bin:%s", $HOME, $PATH)}
+	    context.Typeset("%", env)
+	enddef
+<
+and perhaps use it with a mapping:
+>
+	nnoremap <silent><buffer><leader>t <scriptcmd>MyConTeXt()<cr>
+<
+`context.Typeset()` accepts a third optional argument to specify a custom
+typesetting command. Such argument must be a function that takes a path and
+returns the command as a List. For example:
+>
+	def ConTeXtCustomCommand(path: string): list<string>
+	  return ['mtxrun', '--script', 'context', '--nonstopmode, path]
+	enddef
+
+	context.ConTeXtTypeset("%", v:none, ConTeXtCustomCommand)
+<
+Large projects are often organized as a root document and various chapter
+files. When editing a chapter file, it is convenient to invoke |:ConTeXt|
+directly on it, rather than having to switch to the root file. A "magic line"
+can be added at the beginning of each chapter file, which specifies the
+relative path to the root file. For instance:
+>
+	% !TEX root = ../MyRoot.tex
+<
+Vim searches for the magic line in the first ten lines of the current buffer:
+if it is found, the document specified by that line is typeset rather than the
+one in the current buffer. The root document does not have to be opened in
+Vim.
+
+To extend completion and syntax highlighting, you may generate supporting
+files using ConTeXt and add them to your configuration. If you configuration
+resides in `~/.vim`, you may use these commands:
+>
+	mkdir -p ~/.vim/syntax/shared
+	cd ~/.vim/syntax/shared
+	mtxrun --script interface --vim
+<
+The last command will create the following syntax files:
+
+- `context-data-context.vim`;
+- `context-data-interfaces.vim`;
+- `context-data-metafun.vim`;
+- `context-data-tex.vim`. 
+
+The same command can be used to update those syntax files.
+
+							*ft-context-commands*
+Commands ~
+					*:ConTeXt*
+Start a background |job| to typeset the document in the current buffer. The
+command accepts an optional buffer's name, if you want to typeset a document
+that is in a different buffer.
+
+					*:ConTeXtLog*
+Edit the log file corresponding to the source in the current buffer.
+
+					*:ConTeXtJobsStatus*
+Echo the number of jobs currently running in the background.
+
+					*:ConTeXtStopJobs*
+Stop all the ConTeXt jobs currently running in the background.
+
+							*ft-context-settings*
+Settings ~
+					*'b:context_ignore_makefile'*
+					*'g:context_ignore_makefile'*
+`make` can be used to (synchronously) typeset a document. If a Makefile exists
+and this option is not set, standard `make` is used. If this option is set,
+`mtxrun` is invoked instead, even if a Makefile exists.
+>
+	g:context_ignore_makefile = 0
+<
+NOTE: before using `make`, set the working directory of the buffer to the
+directory of the file to be typeset.
+					*'b:context_include'*
+					*'g:context_include'*
+Dictionary of filetype/GROUP pairs for which syntax highlighting should be
+activated between \startGROUP and \stopGROUP. The default is to highlight XML
+between `\startXML` and `\stopXML`.
+>
+	g:context_include = {'xml': 'XML'}
+
+NOTE: Lua and MetaPost are always highlighted within the respective blocks.
+
+					*'g:no_context_maps'*
+When set, do not define any mappings.
+>
+	g:no_context_maps = 0
+<
+							*ft-context-mappings*
+Mappings ~
+
+tp			"reflow TeX paragraph".
+
+i$			"inside inline math block".
+
+a$			"around inline math block".
+
+]]			[count] start of sections forward.
+
+[[			[count] start of sections backward.
+
+][			[count] end sections forward.
+
+[]			[count] end of sections backward.
+
+]}			[count] end of blocks (\stop..., \setup...,
+			\define...) forward.
+
+[{			[count] begin of blocks (\start..., \setup...,
+			\define...) backward.
+
+ vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

runtime/doc/ft_mp.txt

@@ -0,0 +1,151 @@
+*ft_mp.txt*	For Vim version 9.0.  Last change: 2022 Aug 12
+
+This is the documentation for the METAFONT and MetaPost filetype plugins.
+Unless otherwise specified, the commands, settings and mappings defined below
+apply equally to both filetypes.
+
+NOTE: the plugin requires +vim9script.
+
+==============================================================================
+CONTENTS						*mp.vim* *ft-metapost*
+							*mf.vim* *ft-metafont*
+
+1. Introduction				|ft-metapost-intro|
+2. Commands				|ft-metapost-commands|
+3. Settings				|ft-metapost-settings|
+4. Mappings				|ft-metapost-mappings|
+
+==============================================================================
+							*ft-metapost-intro*
+							*ft-metafont-intro*
+Introduction ~
+This filetype plugin provides extensive support for editing METAFONT and
+MetaPost documents, including syntax coloring, indentation, and completion.
+
+Defining indentation rules for METAFONT and MetaPost code is tricky and
+somewhat subjective, because the syntax is quite liberal. The plugin uses some
+heuristics that work well most of the time, but in particular cases you may
+want to to override the automatic rules, so that the manually defined
+indentation is preserved by commands like `gg=G`.
+
+This can be achieved by appending `%>`, `%<`, `%=` or `%!` to a line to
+explicitly control the indentation of the next line. The `<` and `>` symbols
+may be repeated many times: for instance, `%>>` will cause the next line to be
+indented twice. Of course, `%<` means that the next line should be
+de-indented; `%=` sets the indentation of the next line to be equal to the
+indentation of the current line; and `%!` means that the indentation of the
+next line should not change from whatever it has been manually set.
+
+For example, this is the default indentation of a simple macro:
+>
+   def foo =
+       makepen(
+           subpath(T-n,t) of r
+           shifted .5down
+           --subpath(t,T) of r shifted .5up -- cycle
+       )
+       withcolor black
+   enddef
+<
+By adding the special comments, the indentation can be adjusted arbitrarily:
+>
+   def foo =
+       makepen(
+           subpath(T-n,t) of r  %>
+               shifted .5down   %>
+                   --subpath(t,T) of r shifted .5up -- cycle   %<<<
+       )
+       withcolor black
+   enddef
+<
+							*ft-metapost-commands*
+Commands ~
+					*:FixBeginfigs*
+Renumber beginfig() blocks in the current buffer so that the n-th figure has
+number n. MetaPost only.
+
+							*ft-metapost-settings*
+							*ft-metafont-settings*
+Settings ~
+					*'g:mf_other_macros'*
+Highlight some other basic macro names, e.g., from cmbase, logo, etc. This is
+set to 1 by default in METAFONT buffers, and it is set to 0 by default in
+MetaPost buffers.
+
+					*'g:mf_plain_macros'*
+Highlight keywords defined by plain.mf. This is set to 1 by default in
+METAFONT buffers, and it is set to 0 by default in MetaPost buffers.
+
+					*'g:mf_plain_modes'*
+Highlight keywords defined by modes.mf. This is set to 1 by default in
+METAFONT buffers, and it is set to 0 by default in MetaPost buffers.
+
+					*'g:mp_close_tag'*
+Define additional keywords that end indented blocks. For instance, if you
+define:
+>
+	g:mp_end_tag = ['\<endfoo\>']
+<
+any line starting with `endfoo` will be de-indented compared to its previous
+line.
+>
+	g:mp_close_tag = []
+<
+					*'b:mp_metafun'*
+					*'g:mp_metafun'*
+If set to 1, highlight ConTeXt's MetaFun keywords. MetaPost only.
+>
+	g:mp_metafun = 0
+<
+					*'g:mp_mfplain_macros'*
+Highlight keywords defined by mfplain.mp. MetaPost only.
+>
+	g:mp_mfplain_macros = 1
+<
+					*'g:mp_open_tag'*
+Define additional keywords that start indented blocks. For instance, if you
+define:
+>
+	g:mp_open_tag = ['\<beginfoo\>']
+<
+the line following `beginfoo` will be indented.
+>
+	g:mp_open_tag = []
+<
+					*'g:mp_other_macros'*
+Highlight keywords defined by all base macro packages (boxes, rboxes, format,
+graph, marith, sarith, string, TEX). This option affects only MetaPost
+buffers.
+>
+	g:mp_other_macros = 1
+<
+					*'g:mp_plain_macros'*
+Highlight keywords defined by plain.mp. MetaPost only.
+>
+	g:mp_plain_macros = 1
+<
+					*'g:no_mp_maps'*
+					*'g:no_mf_maps'*
+When set, do not define any mapping in buffers with the corresponding
+filetype.
+>
+	g:no_mp_maps = 0
+	g:no_mf_maps = 0
+<
+							*ft-metapost-mappings*
+							*ft-metafont-mappings*
+Mappings ~
+
+]]			[count] vardefs, macros or figures forward.
+
+[[			[count] vardefs, macros or figures backward.
+
+][			[count] end of vardefs, macros or figures forward.
+
+[]			[count] end of vardefs, macros or figures backward.
+
+]}			[count] end of blocks (fi, endfor, endgroup) forward.
+
+[{			[count] begin of blocks (if, for, begingroup) backward.
+
+ vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

runtime/doc/indent.txt

@@ -983,25 +983,38 @@ indentation: >
 PYTHON							*ft-python-indent*
 
 The amount of indent can be set for the following situations.  The examples
-given are the defaults.  Note that the variables are set to an expression, so
-that you can change the value of 'shiftwidth' later.
+given are the defaults.  Note that the dictionary values are set to an
+expression, so that you can change the value of 'shiftwidth' later.
 
 Indent after an open paren: >
-	let g:pyindent_open_paren = 'shiftwidth() * 2'
+	let g:python_indent.open_paren = 'shiftwidth() * 2'
 Indent after a nested paren: >
-	let g:pyindent_nested_paren = 'shiftwidth()'
+	let g:python_indent.nested_paren = 'shiftwidth()'
 Indent for a continuation line: >
-	let g:pyindent_continue = 'shiftwidth() * 2'
+	let g:python_indent.continue = 'shiftwidth() * 2'
+
+By default, the closing paren on a multiline construct lines up under the first
+non-whitespace character of the previous line.
+If you prefer that it's lined up under the first character of the line that
+starts the multiline construct, reset this key: >
+	let g:python_indent.closed_paren_align_last_line = v:false
 
 The method uses |searchpair()| to look back for unclosed parentheses.  This
 can sometimes be slow, thus it timeouts after 150 msec.  If you notice the
 indenting isn't correct, you can set a larger timeout in msec: >
-	let g:pyindent_searchpair_timeout = 500
+	let g:python_indent.searchpair_timeout = 500
 
 If looking back for unclosed parenthesis is still too slow, especially during
 a copy-paste operation, or if you don't need indenting inside multi-line
 parentheses, you can completely disable this feature: >
-	let g:pyindent_disable_parentheses_indenting = 1
+	let g:python_indent.disable_parentheses_indenting = 1
+
+For backward compatibility, these variables are also supported: >
+	g:pyindent_open_paren
+	g:pyindent_nested_paren
+	g:pyindent_continue
+	g:pyindent_searchpair_timeout
+	g:pyindent_disable_parentheses_indenting
 
 
 R								*ft-r-indent*

runtime/doc/map.txt

@@ -1724,11 +1724,11 @@ The valid escape sequences are
 					*<mods>* *<q-mods>* *:command-modifiers*
 	<mods>  The command modifiers, if specified. Otherwise, expands to
 		nothing. Supported modifiers are |:aboveleft|, |:belowright|,
-		|:botright|, |:browse|, |:confirm|, |:hide|, |:keepalt|,
-		|:keepjumps|, |:keepmarks|, |:keeppatterns|, |:leftabove|,
-		|:lockmarks|, |:noautocmd|, |:noswapfile| |:rightbelow|,
-		|:sandbox|, |:silent|, |:tab|, |:topleft|, |:unsilent|,
-		|:verbose|, and |:vertical|.
+		|:botright|, |:browse|, |:confirm|, |:hide|, |:horizontal|,
+		|:keepalt|, |:keepjumps|, |:keepmarks|, |:keeppatterns|,
+		|:leftabove|, |:lockmarks|, |:noautocmd|, |:noswapfile|
+		|:rightbelow|, |:sandbox|, |:silent|, |:tab|, |:topleft|,
+		|:unsilent|, |:verbose|, and |:vertical|.
 		Note that |:filter| is not supported.
 		Examples: >
 		    command! -nargs=+ -complete=file MyEdit

runtime/doc/motion.txt

@@ -532,8 +532,6 @@ including white space, the commands starting with "i" select an "inner" object
 without white space, or just the white space.  Thus the "inner" commands
 always select less text than the "a" commands.
 
-These commands are not available when the |+textobjects| feature has been
-disabled at compile time.
 Also see `gn` and `gN`, operating on the last search pattern.
 
 							*v_aw* *aw*
@@ -612,7 +610,8 @@ i)							*v_i)* *i)* *i(*
 i(							*vib* *v_ib* *v_i(* *ib*
 ib			"inner block", select [count] blocks, from "[count] [("
 			to the matching ')', excluding the '(' and ')' (see
-			|[(|).
+			|[(|).  If the cursor is not inside a () block, then
+			find the next "(".
 			When used in Visual mode it is made characterwise.
 
 a>						*v_a>* *v_a<* *a>* *a<*
@@ -633,6 +632,7 @@ at			"a tag block", select [count] tag blocks, from the
 			"</aaa>", including the "<aaa>" and "</aaa>".
 			See |tag-blocks| about the details.
 			When used in Visual mode it is made characterwise.
+			Only available when compiled with the |+eval| feature.
 
 						*v_it* *it*
 it			"inner tag block", select [count] tag blocks, from the

runtime/doc/options.txt

@@ -799,7 +799,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When on, Vim will change the current working directory whenever you
 	open a file, switch buffers, delete a buffer or open/close a window.
 	It will change to the directory containing the file which was opened
-	or selected.
+	or selected.  When a buffer has no name it also has no directory, thus
+	the current directory won't change when navigating to it.
 	Note: When this option is on some plugins may not work.
 
 			*'autoshelldir'* *'asd'* *'noautoshelldir'* *'noasd'*
@@ -814,7 +815,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		if [[ -n "$VIM_TERMINAL" ]]; then
 		    PROMPT_COMMAND='_vim_sync_PWD'
 		    function _vim_sync_PWD() {
-			printf "\033]7;file://%s\033\\" "$PWD"
+			printf '\033]7;file://%s\033\\' "$PWD"
 		    }
 		fi
 <
@@ -823,14 +824,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 		    autoload -Uz add-zsh-hook
 		    add-zsh-hook -Uz chpwd _vim_sync_PWD
 		    function _vim_sync_PWD() {
-			printf "\033]7;file://%s\033\\" "$PWD"
+			printf '\033]7;file://%s\033\\' "$PWD"
 		    }
 		fi
 <
 	In a fish init file: >
 		if test -n "$VIM_TERMINAL"
 		    function _vim_sync_PWD --on-variable=PWD
-			printf "\033]7;file://%s\033\\" "$PWD"
+			printf '\033]7;file://%s\033\\' "$PWD"
 		    end
 		end
 <
@@ -1176,8 +1177,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 				 Unix: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*"
 				 Mac: "/private/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*")
 			global
-			{not available when compiled without the |+wildignore|
-			feature}
 	A list of file patterns.  When one of the patterns matches with the
 	name of the file which is written, no backup file is created.  Both
 	the specified file name and the full path name of the file are used.
@@ -1558,8 +1557,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'cdpath'* *'cd'* *E344* *E346*
 'cdpath' 'cd'		string	(default: equivalent to $CDPATH or ",,")
 			global
-			{not available when compiled without the
-			|+file_in_path| feature}
 	This is a list of directories which will be searched when using the
 	|:cd|, |:tcd| and |:lcd| commands, provided that the directory being
 	searched for has a relative path, not an absolute part starting with
@@ -1786,15 +1783,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'cmdheight'* *'ch'*
 'cmdheight' 'ch'	number	(default 1)
 			global or local to tab page
-	Number of screen lines to use for the command-line.  Helps avoiding
-	|hit-enter| prompts.
+	Number of screen lines to use for the command-line.  A larger value
+	helps avoiding |hit-enter| prompts.
 	The value of this option is stored with the tab page, so that each tab
 	page can have a different value.
 
-	When 'cmdheight' is zero, there is no command-line unless it is being
-	used.  Some informative messages will not be displayed, any other
-	messages will cause the |hit-enter| prompt.
-
 						*'cmdwinheight'* *'cwh'*
 'cmdwinheight' 'cwh'	number	(default 7)
 			global
@@ -5949,7 +5942,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  "http://www.vim.org" will make ":find index.html" work.
 	- Search upwards and downwards in a directory tree using "*", "**" and
 	  ";".  See |file-searching| for info and syntax.
-	  {not available when compiled without the |+path_extra| feature}
 	- Careful with '\' characters, type two to get one in the option: >
 		:set path=.,c:\\include
 <	  Or just use '/' instead: >
@@ -6475,11 +6467,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 		45%	relative position in the file
 	If 'rulerformat' is set, it will determine the contents of the ruler.
 	Each window has its own ruler.  If a window has a status line, the
-	ruler is shown there.  If a window doesn't have a status line and
-	'cmdheight' is zero, the ruler is not shown.  Otherwise it is shown in
-	the last line of the screen.  If the statusline is given by
-	'statusline' (i.e. not empty), this option takes precedence over
-	'ruler' and 'rulerformat'.
+	ruler is shown there.  Otherwise it is shown in the last line of the
+	screen.  If the statusline is given by 'statusline' (i.e. not empty),
+	this option takes precedence over 'ruler' and 'rulerformat'.
 	If the number of characters displayed is different from the number of
 	bytes in the text (e.g., for a TAB or a multibyte character), both
 	the text column (byte number) and the screen column are shown,
@@ -7129,7 +7119,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 			|+cmdline_info| feature}
 	Show (partial) command in the last line of the screen.  Set this
 	option off if your terminal is slow.
-	The option has no effect when 'cmdheight' is zero.
 	In Visual mode the size of the selected area is shown:
 	- When selecting characters within a line, the number of characters.
 	  If the number of bytes is different it is also displayed: "2-6"
@@ -7179,7 +7168,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	If in Insert, Replace or Visual mode put a message on the last line.
 	Use the 'M' flag in 'highlight' to set the type of highlighting for
 	this message.
-	The option has no effect when 'cmdheight' is zero.
 	When |XIM| may be used the message will include "XIM".  But this
 	doesn't mean XIM is really active, especially when 'imactivatekey' is
 	not set.
@@ -7724,8 +7712,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'suffixesadd'* *'sua'*
 'suffixesadd' 'sua'	string	(default "")
 			local to buffer
-			{not available when compiled without the
-			|+file_in_path| feature}
 	Comma-separated list of suffixes, which are used when searching for a
 	file for the "gf", "[I", etc. commands.  Example: >
 		:set suffixesadd=.java
@@ -8003,8 +7989,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	a directory tree.  See |file-searching|.  E.g., "/lib/**/tags" will
 	find all files named "tags" below "/lib".  The filename itself cannot
 	contain wildcards, it is used as-is.  E.g., "/lib/**/tags?" will find
-	files called "tags?".  {not available when compiled without the
-	|+path_extra| feature}
+	files called "tags?".
 	The |tagfiles()| function can be used to get a list of the file names
 	actually used.
 	If Vim was compiled with the |+emacs_tags| feature, Emacs-style tag
@@ -9028,8 +9013,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'wildignore'* *'wig'*
 'wildignore' 'wig'	string	(default "")
 			global
-			{not available when compiled without the |+wildignore|
-			feature}
 	A list of file patterns.  A file that matches with one of these
 	patterns is ignored when expanding |wildcards|, completing file or
 	directory names, and influences the result of |expand()|, |glob()| and
@@ -9055,13 +9038,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 				*'wildmenu'* *'wmnu'* *'nowildmenu'* *'nowmnu'*
 'wildmenu' 'wmnu'	boolean	(default off, set in |defaults.vim|)
 			global
-			{not available if compiled without the |+wildmenu|
-			feature}
 	When 'wildmenu' is on, command-line completion operates in an enhanced
 	mode.  On pressing 'wildchar' (usually <Tab>) to invoke completion,
-	the possible matches are shown just above the command line, with the
-	first match highlighted (overwriting the status line, if there is
-	one).  This is the behavior without "pum" in 'wildoptions'.
+	the possible matches are shown.
+	When 'wildoptions' contains "pum", then the completion matches are
+	shown in a popup menu.  Otherwise they are displayed just above the
+	command line, with the first match highlighted (overwriting the status
+	line, if there is one).
 	Keys that show the previous/next match, such as <Tab> or
 	CTRL-P/CTRL-N, cause the highlight to move to the appropriate match.
 	When 'wildmode' is used, "wildmenu" mode is used where "full" is
@@ -9070,8 +9053,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	If there are more matches than can fit in the line, a ">" is shown on
 	the right and/or a "<" is shown on the left.  The status line scrolls
 	as needed.
-	When 'wildoptions' contains "pum", then the completion matches are
-	shown in a popup menu.
 	The "wildmenu" mode is abandoned when a key is hit that is not used
 	for selecting a completion.
 	While the "wildmenu" is active, not using the popup menu, the
@@ -9160,8 +9141,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'wildoptions'* *'wop'*
 'wildoptions' 'wop'	string	(default "")
 			global
-			{not available when compiled without the |+wildignore|
-			feature}
 	A list of words that change how |cmdline-completion| is done.
 	The following values are supported:
 	  fuzzy		Use |fuzzy-matching| to find completion matches. When

runtime/doc/repeat.txt

@@ -417,6 +417,10 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			For a script that was used with `import autoload` but
 			was not actually sourced yet an "A" is shown after the
 			script ID.
+			For a script that was referred to by one name but
+			after resolving symbolic links got sourced with
+			another name the other script is after "->".  E.g.
+			"20->22" means script 20 was sourced as script 22.
 			{not available when compiled without the |+eval|
 			feature}
 

runtime/doc/syntax.txt

@@ -4905,6 +4905,7 @@ Before the color scheme will be loaded all default color list scripts
 autocommand event is triggered.  After the color scheme has been loaded the
 |ColorScheme| autocommand event is triggered.
 
+						*colorscheme-override*
 If a color scheme is almost right, you can add modifications on top of it by
 using the |ColorScheme| autocommand.  For example, to remove the background
 color (can make it transparent in some terminals): >
@@ -5367,7 +5368,9 @@ CursorLineFold	Like FoldColumn when 'cursorline' is set for the cursor line.
 							*hl-MatchParen*
 MatchParen	Character under the cursor or just before it, if it
 		is a paired bracket, and its match. |pi_paren.txt|
-
+							*hl-MessageWindow*
+MessageWindow	Messages popup window used when 'cmdheight' is zero.  If not
+		defined |hl-WarningMsg| is used.
 							*hl-ModeMsg*
 ModeMsg		'showmode' message (e.g., "-- INSERT --").
 							*hl-MoreMsg*
@@ -5387,6 +5390,10 @@ PmenuSel	Popup menu: Selected item.
 PmenuSbar	Popup menu: Scrollbar.
 							*hl-PmenuThumb*
 PmenuThumb	Popup menu: Thumb of the scrollbar.
+							*hl-PopupNotification*
+PopupNotification
+		Popup window created with |popup_notification()|.  If not
+		defined |hl-WarningMsg| is used.
 							*hl-Question*
 Question	|hit-enter| prompt and yes/no questions.
 							*hl-QuickFixLine*

runtime/doc/tabpage.txt

@@ -81,8 +81,6 @@ For the related autocommands see |tabnew-autocmd|.
 :[count]tabf[ind] [++opt] [+cmd] {file}			*:tabf* *:tabfind*
 		Open a new tab page and edit {file} in 'path', like with
 		|:find|.  For [count] see |:tabnew| above.
-		{not available when the |+file_in_path| feature was disabled
-		at compile time}
 
 :[count]tab {cmd}					*:tab*
 		Execute {cmd} and when it opens a new window open a new tab

runtime/doc/tags

@@ -69,6 +69,9 @@ $quote	eval.txt	/*$quote*
 'autowriteall'	options.txt	/*'autowriteall'*
 'aw'	options.txt	/*'aw'*
 'awa'	options.txt	/*'awa'*
+'b:context_ignore_makefile'	ft_context.txt	/*'b:context_ignore_makefile'*
+'b:context_include'	ft_context.txt	/*'b:context_include'*
+'b:mp_metafun'	ft_mp.txt	/*'b:mp_metafun'*
 'background'	options.txt	/*'background'*
 'backspace'	options.txt	/*'backspace'*
 'backup'	options.txt	/*'backup'*
@@ -299,6 +302,20 @@ $quote	eval.txt	/*$quote*
 'fs'	options.txt	/*'fs'*
 'fsync'	options.txt	/*'fsync'*
 'ft'	options.txt	/*'ft'*
+'g:context_ignore_makefile'	ft_context.txt	/*'g:context_ignore_makefile'*
+'g:context_include'	ft_context.txt	/*'g:context_include'*
+'g:mf_other_macros'	ft_mp.txt	/*'g:mf_other_macros'*
+'g:mf_plain_macros'	ft_mp.txt	/*'g:mf_plain_macros'*
+'g:mf_plain_modes'	ft_mp.txt	/*'g:mf_plain_modes'*
+'g:mp_close_tag'	ft_mp.txt	/*'g:mp_close_tag'*
+'g:mp_metafun'	ft_mp.txt	/*'g:mp_metafun'*
+'g:mp_mfplain_macros'	ft_mp.txt	/*'g:mp_mfplain_macros'*
+'g:mp_open_tag'	ft_mp.txt	/*'g:mp_open_tag'*
+'g:mp_other_macros'	ft_mp.txt	/*'g:mp_other_macros'*
+'g:mp_plain_macros'	ft_mp.txt	/*'g:mp_plain_macros'*
+'g:no_context_maps'	ft_context.txt	/*'g:no_context_maps'*
+'g:no_mf_maps'	ft_mp.txt	/*'g:no_mf_maps'*
+'g:no_mp_maps'	ft_mp.txt	/*'g:no_mp_maps'*
 'gcr'	options.txt	/*'gcr'*
 'gd'	options.txt	/*'gd'*
 'gdefault'	options.txt	/*'gdefault'*
@@ -1301,7 +1318,6 @@ $quote	eval.txt	/*$quote*
 +balloon_eval	various.txt	/*+balloon_eval*
 +balloon_eval_term	various.txt	/*+balloon_eval_term*
 +browse	various.txt	/*+browse*
-+builtin_terms	various.txt	/*+builtin_terms*
 +byte_offset	various.txt	/*+byte_offset*
 +channel	various.txt	/*+channel*
 +cindent	various.txt	/*+cindent*
@@ -2036,12 +2052,17 @@ $quote	eval.txt	/*$quote*
 :Cfilter	quickfix.txt	/*:Cfilter*
 :Clear	terminal.txt	/*:Clear*
 :CompilerSet	usr_51.txt	/*:CompilerSet*
+:ConTeXt	ft_context.txt	/*:ConTeXt*
+:ConTeXtJobsStatus	ft_context.txt	/*:ConTeXtJobsStatus*
+:ConTeXtLog	ft_context.txt	/*:ConTeXtLog*
+:ConTeXtStopJobs	ft_context.txt	/*:ConTeXtStopJobs*
 :Continue	terminal.txt	/*:Continue*
 :DiffOrig	diff.txt	/*:DiffOrig*
 :DoMatchParen	pi_paren.txt	/*:DoMatchParen*
 :Evaluate	terminal.txt	/*:Evaluate*
 :Explore	pi_netrw.txt	/*:Explore*
 :Finish	terminal.txt	/*:Finish*
+:FixBeginfigs	ft_mp.txt	/*:FixBeginfigs*
 :GLVS	pi_getscript.txt	/*:GLVS*
 :Gdb	terminal.txt	/*:Gdb*
 :GetLatestVimScripts_dat	pi_getscript.txt	/*:GetLatestVimScripts_dat*
@@ -2448,6 +2469,9 @@ $quote	eval.txt	/*$quote*
 :echom	eval.txt	/*:echom*
 :echomsg	eval.txt	/*:echomsg*
 :echon	eval.txt	/*:echon*
+:echow	eval.txt	/*:echow*
+:echowin	eval.txt	/*:echowin*
+:echowindow	eval.txt	/*:echowindow*
 :edit	editing.txt	/*:edit*
 :edit!	editing.txt	/*:edit!*
 :edit!_f	editing.txt	/*:edit!_f*
@@ -4300,6 +4324,10 @@ E1290	change.txt	/*E1290*
 E1291	testing.txt	/*E1291*
 E1292	cmdline.txt	/*E1292*
 E1293	textprop.txt	/*E1293*
+E1294	textprop.txt	/*E1294*
+E1295	textprop.txt	/*E1295*
+E1296	textprop.txt	/*E1296*
+E1297	vim9.txt	/*E1297*
 E13	message.txt	/*E13*
 E131	eval.txt	/*E131*
 E132	eval.txt	/*E132*
@@ -6228,6 +6256,7 @@ collate-variable	eval.txt	/*collate-variable*
 color-schemes	syntax.txt	/*color-schemes*
 color-xterm	syntax.txt	/*color-xterm*
 coloring	syntax.txt	/*coloring*
+colorscheme-override	syntax.txt	/*colorscheme-override*
 colortest.vim	syntax.txt	/*colortest.vim*
 command-attributes	map.txt	/*command-attributes*
 command-block	vim9.txt	/*command-block*
@@ -6289,6 +6318,7 @@ conceal	syntax.txt	/*conceal*
 confirm()	builtin.txt	/*confirm()*
 connection-refused	message.txt	/*connection-refused*
 console-menus	gui.txt	/*console-menus*
+context.vim	ft_context.txt	/*context.vim*
 control	intro.txt	/*control*
 conversion-server	mbyte.txt	/*conversion-server*
 convert-to-HTML	syntax.txt	/*convert-to-HTML*
@@ -6933,6 +6963,11 @@ ft-clojure-indent	indent.txt	/*ft-clojure-indent*
 ft-clojure-syntax	syntax.txt	/*ft-clojure-syntax*
 ft-cobol-syntax	syntax.txt	/*ft-cobol-syntax*
 ft-coldfusion-syntax	syntax.txt	/*ft-coldfusion-syntax*
+ft-context	ft_context.txt	/*ft-context*
+ft-context-commands	ft_context.txt	/*ft-context-commands*
+ft-context-intro	ft_context.txt	/*ft-context-intro*
+ft-context-mappings	ft_context.txt	/*ft-context-mappings*
+ft-context-settings	ft_context.txt	/*ft-context-settings*
 ft-cpp-syntax	syntax.txt	/*ft-cpp-syntax*
 ft-csh-syntax	syntax.txt	/*ft-csh-syntax*
 ft-css-omni	insert.txt	/*ft-css-omni*
@@ -6992,6 +7027,15 @@ ft-markdown-syntax	syntax.txt	/*ft-markdown-syntax*
 ft-masm-syntax	syntax.txt	/*ft-masm-syntax*
 ft-mathematica-syntax	syntax.txt	/*ft-mathematica-syntax*
 ft-matlab-indent	indent.txt	/*ft-matlab-indent*
+ft-metafont	ft_mp.txt	/*ft-metafont*
+ft-metafont-intro	ft_mp.txt	/*ft-metafont-intro*
+ft-metafont-mappings	ft_mp.txt	/*ft-metafont-mappings*
+ft-metafont-settings	ft_mp.txt	/*ft-metafont-settings*
+ft-metapost	ft_mp.txt	/*ft-metapost*
+ft-metapost-commands	ft_mp.txt	/*ft-metapost-commands*
+ft-metapost-intro	ft_mp.txt	/*ft-metapost-intro*
+ft-metapost-mappings	ft_mp.txt	/*ft-metapost-mappings*
+ft-metapost-settings	ft_mp.txt	/*ft-metapost-settings*
 ft-mma-syntax	syntax.txt	/*ft-mma-syntax*
 ft-moo-syntax	syntax.txt	/*ft-moo-syntax*
 ft-msql-syntax	syntax.txt	/*ft-msql-syntax*
@@ -7070,6 +7114,8 @@ ft-yaml-syntax	syntax.txt	/*ft-yaml-syntax*
 ft-zimbu-plugin	filetype.txt	/*ft-zimbu-plugin*
 ft-zsh-syntax	syntax.txt	/*ft-zsh-syntax*
 ft_ada.txt	ft_ada.txt	/*ft_ada.txt*
+ft_context.txt	ft_context.txt	/*ft_context.txt*
+ft_mp.txt	ft_mp.txt	/*ft_mp.txt*
 ft_ps1.txt	ft_ps1.txt	/*ft_ps1.txt*
 ft_raku.txt	ft_raku.txt	/*ft_raku.txt*
 ft_rust.txt	ft_rust.txt	/*ft_rust.txt*
@@ -7444,6 +7490,7 @@ getscript-data	pi_getscript.txt	/*getscript-data*
 getscript-history	pi_getscript.txt	/*getscript-history*
 getscript-plugins	pi_getscript.txt	/*getscript-plugins*
 getscript-start	pi_getscript.txt	/*getscript-start*
+getscriptinfo()	builtin.txt	/*getscriptinfo()*
 gettabinfo()	builtin.txt	/*gettabinfo()*
 gettabvar()	builtin.txt	/*gettabvar()*
 gettabwinvar()	builtin.txt	/*gettabwinvar()*
@@ -7692,6 +7739,7 @@ hl-LineNrAbove	syntax.txt	/*hl-LineNrAbove*
 hl-LineNrBelow	syntax.txt	/*hl-LineNrBelow*
 hl-MatchParen	syntax.txt	/*hl-MatchParen*
 hl-Menu	syntax.txt	/*hl-Menu*
+hl-MessageWindow	syntax.txt	/*hl-MessageWindow*
 hl-ModeMsg	syntax.txt	/*hl-ModeMsg*
 hl-MoreMsg	syntax.txt	/*hl-MoreMsg*
 hl-NonText	syntax.txt	/*hl-NonText*
@@ -7700,6 +7748,7 @@ hl-Pmenu	syntax.txt	/*hl-Pmenu*
 hl-PmenuSbar	syntax.txt	/*hl-PmenuSbar*
 hl-PmenuSel	syntax.txt	/*hl-PmenuSel*
 hl-PmenuThumb	syntax.txt	/*hl-PmenuThumb*
+hl-PopupNotification	syntax.txt	/*hl-PopupNotification*
 hl-Question	syntax.txt	/*hl-Question*
 hl-QuickFixLine	syntax.txt	/*hl-QuickFixLine*
 hl-Scrollbar	syntax.txt	/*hl-Scrollbar*
@@ -7899,6 +7948,7 @@ if_sniff.txt	if_sniff.txt	/*if_sniff.txt*
 if_tcl.txt	if_tcl.txt	/*if_tcl.txt*
 ignore-errors	eval.txt	/*ignore-errors*
 ignore-timestamp	editing.txt	/*ignore-timestamp*
+import-autoload	vim9.txt	/*import-autoload*
 import-legacy	vim9.txt	/*import-legacy*
 import-map	vim9.txt	/*import-map*
 improved-autocmds-5.4	version5.txt	/*improved-autocmds-5.4*
@@ -7933,6 +7983,7 @@ indentkeys-format	indent.txt	/*indentkeys-format*
 index	index.txt	/*index*
 index()	builtin.txt	/*index()*
 index.txt	index.txt	/*index.txt*
+indexof()	builtin.txt	/*indexof()*
 info-message	starting.txt	/*info-message*
 inform.vim	syntax.txt	/*inform.vim*
 informix	ft_sql.txt	/*informix*
@@ -8313,6 +8364,7 @@ message.txt	message.txt	/*message.txt*
 messages	message.txt	/*messages*
 meta	intro.txt	/*meta*
 method	eval.txt	/*method*
+mf.vim	ft_mp.txt	/*mf.vim*
 min()	builtin.txt	/*min()*
 missing-options	vi_diff.txt	/*missing-options*
 mkdir()	builtin.txt	/*mkdir()*
@@ -8346,6 +8398,7 @@ mouse_lnum-variable	eval.txt	/*mouse_lnum-variable*
 mouse_win-variable	eval.txt	/*mouse_win-variable*
 mouse_winid-variable	eval.txt	/*mouse_winid-variable*
 movement	intro.txt	/*movement*
+mp.vim	ft_mp.txt	/*mp.vim*
 ms-dos	os_msdos.txt	/*ms-dos*
 msdos	os_msdos.txt	/*msdos*
 msql.vim	syntax.txt	/*msql.vim*
@@ -9203,6 +9256,7 @@ regexp	pattern.txt	/*regexp*
 regexp-changes-5.4	version5.txt	/*regexp-changes-5.4*
 register	sponsor.txt	/*register*
 register-faq	sponsor.txt	/*register-faq*
+register-functions	usr_41.txt	/*register-functions*
 register-variable	eval.txt	/*register-variable*
 registers	change.txt	/*registers*
 rego.vim	syntax.txt	/*rego.vim*
@@ -9384,6 +9438,7 @@ setbufvar()	builtin.txt	/*setbufvar()*
 setcellwidths()	builtin.txt	/*setcellwidths()*
 setcharpos()	builtin.txt	/*setcharpos()*
 setcharsearch()	builtin.txt	/*setcharsearch()*
+setcmdline()	builtin.txt	/*setcmdline()*
 setcmdpos()	builtin.txt	/*setcmdpos()*
 setcursorcharpos()	builtin.txt	/*setcursorcharpos()*
 setenv()	builtin.txt	/*setenv()*

runtime/doc/term.txt

@@ -43,15 +43,10 @@ On non-Unix systems a termcap is only available if Vim was compiled with
 TERMCAP defined.
 
 					*builtin-terms* *builtin_terms*
-Which builtin terminals are available depends on a few defines in feature.h,
-which need to be set at compile time:
-    define		output of ":version"	terminals builtin	~
-NO_BUILTIN_TCAPS	-builtin_terms		none
-SOME_BUILTIN_TCAPS	+builtin_terms		most common ones (default)
-ALL_BUILTIN_TCAPS	++builtin_terms		all available
-
-You can see a list of available builtin terminals with ":set term=xxx" (when
-not running the GUI).  Also see |+builtin_terms|.
+A number of builtin terminals are available.  Since patch 9.0.0280 there is no
+difference between Vim versions.  You can see a list of available builtin
+terminals in the error message you get for `:set term=xxx` (when not running
+the GUI).  Also see |++builtin_terms|.
 
 If the termcap code is included Vim will try to get the strings for the
 terminal you are using from the termcap file and the builtin termcaps.  Both
@@ -648,6 +643,18 @@ Example for an xterm, this changes the color of the cursor: >
     endif
 NOTE: When Vim exits the shape for Normal mode will remain.  The shape from
 before Vim started will not be restored.
+
+For Windows Terminal you can use something like this: >
+    " Note: This should be set after `set termguicolors` or `set t_Co=256`.
+    if &term =~ 'xterm' || &term == 'win32'
+	" Use DECSCUSR escape sequences
+	let &t_SI = "\e[5 q"    " blink bar
+	let &t_SR = "\e[3 q"    " blink underline
+	let &t_EI = "\e[1 q"    " blink block
+	let &t_ti ..= "\e[1 q"   " blink block
+	let &t_te ..= "\e[0 q"   " default (depends on terminal, normally blink block)
+    endif
+
 {not available when compiled without the |+cursorshape| feature}
 
 							*termcap-title*

runtime/doc/terminal.txt

@@ -1022,8 +1022,10 @@ create a security problem.
 						*terminal-autoshelldir*
 This can be used to pass the current directory from a shell to Vim.
 Put this in your .vimrc: >
-	def g:Tapi_lcd(_, args: string)
-	    execute 'silent lcd ' .. args
+	def g:Tapi_lcd(_, path: string)
+	    if isdirectory(path)
+                execute 'silent lcd ' .. fnameescape(path)
+            endif
 	enddef
 <
 And, in a bash init file: >

runtime/doc/textprop.txt

@@ -126,6 +126,7 @@ prop_add({lnum}, {col}, {props})
 		If {col} is invalid an error is given. *E964*
 
 		{props} is a dictionary with these fields:
+		   type		name of the text property type
 		   length	length of text in bytes, can only be used
 				for a property that does not continue in
 				another line; can be zero
@@ -142,20 +143,31 @@ prop_add({lnum}, {col}, {props})
 				automatically to a negative number; otherwise
 				zero is used
 		   text		text to be displayed before {col}, or after the
-				line if {col} is zero
-		   text_align	when "text" is present and {col} is zero
+				line if {col} is zero; prepend and/or append
+				spaces for padding with highlighting
+		   					*E1294*
+		   text_align	when "text" is present and {col} is zero;
 				specifies where to display the text:
 				   after   after the end of the line
-				   right   right aligned in the window
+				   right   right aligned in the window (unless
+					   the text wraps to the next screen
+					   line)
 				   below   in the next screen line
-				When omitted "after" is used.
+				When omitted "after" is used.  Only one
+				"right" property can fit in each line, if
+				there are two ore more these will go in a
+				separate line (still right aligned).
+		   text_padding_left				*E1296*
+				used when "text" is present and {col} is zero;
+				padding between the end of the text line
+				(leftmost column for "below") and the virtual
+				text, not highlighted
 		   text_wrap	when "text" is present and {col} is zero,
 				specifies what happens if the text doesn't
 				fit:
 				   wrap      wrap the text to the next line
 				   truncate  truncate the text to make it fit
 		   		When omitted "truncate" is used.
-		   type		name of the text property type
 		All fields except "type" are optional.
 
 		It is an error when both "length" and "end_lnum" or "end_col"
@@ -186,9 +198,10 @@ prop_add({lnum}, {col}, {props})
 		buffer line, the cursor cannot be placed on it.  A mouse click
 		in the text will move the cursor to the first character after
 		the text, or the last character of the line.
+		Any Tab and other control character in the text will be
+		changed to a space (Rationale: otherwise the size of the text
+		is difficult to compute).
 		A negative "id" will be chosen and is returned.  Once a
-		Any Tab in the text will be changed to a space (Rationale:
-		otherwise the size of the text is difficult to compute).
 		property with "text" has been added for a buffer then using a
 		negative "id" for any other property will give an error:
 		*E1293*
@@ -347,11 +360,16 @@ prop_remove({props} [, {lnum} [, {lnum-end}]])
 		{props} is a dictionary with these fields:
 		   id		remove text properties with this ID
 		   type		remove text properties with this type name
-		   both		"id" and "type" must both match
+		   types	remove text properties with type names in this
+				List
+		   both		"id" and "type"/"types" must both match
 		   bufnr	use this buffer instead of the current one
 		   all		when TRUE remove all matching text properties,
 				not just the first one
-		A property matches when either "id" or "type" matches.
+		Only one of "type" and "types" may be supplied. *E1295*
+
+		A property matches when either "id" or one of the supplied
+		types matches.
 		If buffer "bufnr" does not exist you get an error message.
 		If buffer "bufnr" is not loaded then nothing happens.
 

runtime/doc/todo.txt

@@ -38,6 +38,13 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+cmdheight=0:
+- :g/pattern should not use message window  #11012
+
+*.sil detection with FTsil() (lacygoill, Aug 25)
+
+Avoid using "Xfile" and "Xdir" in tests, use specific names.
+
 Further Vim9 improvements, possibly after launch:
 - Use Vim9 for more runtime files.
 - Check performance with callgrind and kcachegrind.
@@ -67,18 +74,6 @@ Further Vim9 improvements, possibly after launch:
     has(featureName), len(someString)
 - Implement as part of an expression: ++expr, --expr, expr++, expr--.
 
-Update list of features to vote on:
-- Remove Athena item (won't happen)
-- Remove "add open mode" (won't happen)
-- Remove "editing of a hidden buffer" (done)
-- Change "add IDE features" to "improve terminal debugger"
-- Change "diff/merge capability for CVS" to "CVS and git"
-- Remove "pre-compile them" from "improve the performance of Vim scripts"
-- Add: multiple cursors, edit text in more than one place at a time
-- Add: fast syntax highlighting with parser instead of regex patterns
-- Add: virtual text, text properties can insert text in the line
-- Add: start first line halfway, scroll per wrapped screen line
-
 Popup windows:
 - Preview popup not properly updated when it overlaps with completion menu.
   (Yegappan Lakshmanan, 2021 May 22)
@@ -188,14 +183,10 @@ Terminal emulator window:
 - When 'encoding' is not utf-8, or the job is using another encoding, setup
   conversions.
 
-Patches considered for including:
-- use int instead of char_ for index  #10818  needs a test
-- Add "-n" option to xxd. #10599  needs a test
-- allow for nesting of timeout, sketch in #10595
+Cleanup:
+- Remove FEAT_FOOTER ?
 
-Add 'splitscroll'  #10682  Useful?  Any trouble? Null Chilly says it's OK.
-    suggestion: names instead of numbers for the option value
-    problem depending on whether window is focused or not
+Add 'splitscroll'  #10682  Useful?  Any remaining trouble?
 
 Autoconf: must use autoconf 2.69, later version generates lots of warnings
 - try using autoconf 2.71 and fix all "obsolete" warnings
@@ -252,6 +243,9 @@ MS-Windows: did path modifier :p:8 stop working?  #8600
 Version of getchar() that does not move the cursor - #10603 Use a separate
 argument for the new flag.
 
+Add "lastline" entry to 'fillchars' to specify a character instead of '@'.
+#10963
+
 test_arglist func Test_all_not_allowed_from_cmdwin() hangs on MS-Windows.
 
 Information for a specific terminal (e.g. gnome, tmux, konsole, alacritty) is
@@ -884,9 +878,6 @@ The ++ options for the :edit command are also useful on the Vim command line.
 Overlong utf-8 sequence is displayed wrong. (Harm te Hennepe, 2017 Sep 14,
 #2089)  Patch with possible solution by Björn Linse.
 
-The change list index is local to a buffer, but it doesn't make sense using it
-for another buffer.  (lacygoill) Copy w_changelistidx to wininfo_S and back.
-
 X11: Putting more than about 262040 characters of text on the clipboard and
 pasting it in another Vim doesn't work.  (Dominique Pelle, 2008 Aug 21-23)
 clip_x11_request_selection_cb() is called with zero value and length.
@@ -3958,15 +3949,16 @@ Vim script language:
     can be the plugin name.
     Perhaps also have a way to remove everything that the package added?
     including autocommands.
-7   Pre-parse or compile Vim scripts into a bytecode.
+7   Pre-parse or compile Vim scripts into a bytecode, like :def functions.
+    Possibilities:
     1. Put the bytecode with the original script, with an ":if
-       has('bytecode')" around it, so that it's only used with a Vim that
-       supports it.  Update the code with a command, can be used in an
-       autocommand.
+       has('bytecode-1234')" around it, so that it's only used with a Vim that
+       supports the version.  Update the code with a command, can be used in
+       an autocommand.
     2. Use a ".vic" file (like Python use .pyc).  Create it when writing a
-       .vim file.  Problem: distribution.
-    3. Use a cache directory for each user.  How to recognize which cached
-       file belongs to a sourced script?
+       .vim file.  Problem: distribution, non-writable directory, etc.
+    3. Use a cache directory for each user.  Disadvantage: cache lookup may
+       cost more time than bytecode wins.
 7   Add argument to winwidth() to subtract the space taken by 'foldcolumn',
     signs and/or 'number'.
 6   Add ++ and -- operators?  They only work on variables (lvals), how to

runtime/doc/usr_41.txt

@@ -792,14 +792,16 @@ List manipulation:					*list-functions*
 	reduce()		reduce a List to a value
 	slice()			take a slice of a List
 	sort()			sort a List
-	reverse()		reverse the order of a List
+	reverse()		reverse the order of a List or Blob
 	uniq()			remove copies of repeated adjacent items
 	split()			split a String into a List
 	join()			join List items into a String
 	range()			return a List with a sequence of numbers
 	string()		String representation of a List
 	call()			call a function with List as arguments
-	index()			index of a value in a List
+	index()			index of a value in a List or Blob
+	indexof()		index in a List or Blob where an expression
+				evaluates to true 
 	max()			maximum value in a List
 	min()			minimum value in a List
 	count()			count number of times a value appears in a List
@@ -1036,6 +1038,7 @@ Command line:					*command-line-functions*
 	getcmdpos()		get position of the cursor in the command line
 	getcmdscreenpos()	get screen position of the cursor in the
 				command line
+	setcmdline()		set the current command line
 	setcmdpos()		set position of the cursor in the command line
 	getcmdtype()		return the current command-line type
 	getcmdwintype()		return the current command-line window type
@@ -1308,6 +1311,14 @@ Prompt Buffer:					*promptbuffer-functions*
 	prompt_setinterrupt()	set interrupt callback for a buffer
 	prompt_setprompt()	set the prompt text for a buffer
 
+Registers:					*register-functions*
+	getreg()		get contents of a register
+	getreginfo()		get information about a register
+	getregtype()		get type of a register
+	setreg()		set contents and type of a register
+	reg_executing()		return the name of the register being executed
+	reg_recording()		return the name of the register being recorded
+
 Text Properties:				*text-property-functions*
 	prop_add()		attach a property at a position
 	prop_add_list()		attach a property at multiple positions
@@ -1339,6 +1350,7 @@ Various:					*various-functions*
 	did_filetype()		check if a FileType autocommand was used
 	eventhandler()		check if invoked by an event handler
 	getpid()		get process ID of Vim
+	getscriptinfo()		get list of sourced vim scripts
 	getimstatus()		check if IME status is active
 	interrupt()		interrupt script execution
 	windowsversion()	get MS-Windows version
@@ -1350,13 +1362,6 @@ Various:					*various-functions*
 	undofile()		get the name of the undo file
 	undotree()		return the state of the undo tree
 
-	getreg()		get contents of a register
-	getreginfo()		get information about a register
-	getregtype()		get type of a register
-	setreg()		set contents and type of a register
-	reg_executing()		return the name of the register being executed
-	reg_recording()		return the name of the register being recorded
-
 	shiftwidth()		effective value of 'shiftwidth'
 
 	wordcount()		get byte/word/char count of buffer

runtime/doc/various.txt

@@ -332,7 +332,8 @@ g8			Print the hex values of the bytes used in the
    *+ARP*		Amiga only: ARP support included
 B  *+arabic*		|Arabic| language support
 B  *+autochdir*		support 'autochdir' option
-T  *+autocmd*		|:autocmd|, automatic commands
+T  *+autocmd*		|:autocmd|, automatic commands.  Always enabled since
+			8.0.1564
 H  *+autoservername*	Automatically enable |clientserver|
 m  *+balloon_eval*	|balloon-eval| support in the GUI. Included when
 			compiling with supported GUI (Motif, GTK, GUI) and
@@ -341,8 +342,8 @@ m  *+balloon_eval*	|balloon-eval| support in the GUI. Included when
 H  *+balloon_eval_term*	|balloon-eval| support in the terminal,
 			'balloonevalterm'
 N  *+browse*		|:browse| command
-N  *+builtin_terms*	some terminals builtin |builtin-terms|
-B  *++builtin_terms*	maximal terminals builtin |builtin-terms|
+T  *++builtin_terms*	maximal terminals builtin |builtin-terms| Always
+			enabled since 9.0.0280
 N  *+byte_offset*	support for 'o' flag in 'statusline' option, "go"
 			and ":goto" commands.
 m  *+channel*		inter process communication |channel|
@@ -373,7 +374,8 @@ N  *+eval*		expression evaluation |eval.txt|
 T  *+ex_extra*		always on now, used to be for Vim's extra Ex commands
 N  *+extra_search*	|'hlsearch'| and |'incsearch'| options.
 -  *+farsi*		Removed: |farsi| language
-N  *+file_in_path*	|gf|, |CTRL-W_f| and |<cfile>|
+T  *+file_in_path*	|gf|, |CTRL-W_f| and |<cfile>|  Always enabled since
+			9.0.265
 N  *+find_in_path*	include file searches: |[I|, |:isearch|,
 			|CTRL-W_CTRL-I|, |:checkpath|, etc.
 N  *+folding*		|folding|
@@ -431,7 +433,8 @@ T  *+num64*		64-bit Number support |Number|
 			check the actual size of a Number.
 m  *+ole*		Win32 GUI only: |ole-interface|
 N  *+packages*		Loading |packages|
-N  *+path_extra*	Up/downwards search in 'path' and 'tags'
+T  *+path_extra*	Up/downwards search in 'path' and 'tags'  Always
+			enabled since 9.0.0270
 m  *+perl*		Perl interface |perl|
 m  *+perl/dyn*		Perl interface |perl-dynamic| |/dyn|
 N  *+persistent_undo*	Persistent undo |undo-persistence|
@@ -470,7 +473,7 @@ m  *+terminal*		Support for terminal window |terminal|
    *+terminfo*		uses |terminfo| instead of termcap
 N  *+termresponse*	support for |t_RV| and |v:termresponse|
 B  *+termguicolors*	24-bit color in xterm-compatible terminals support
-N  *+textobjects*	|text-objects| selection
+T  *+textobjects*	|text-objects| selection. Always enabled since 9.0.0222.
 N  *+textprop*		|text-properties|
    *+tgetent*		non-Unix only: able to use external termcap
 N  *+timers*		the |timer_start()| function
@@ -488,8 +491,8 @@ T  *+visual*		Visual mode |Visual-mode| Always enabled since 7.4.200.
 T  *+visualextra*	extra Visual mode commands |blockwise-operators|
 T  *+vreplace*		|gR| and |gr|
    *+vtp*		on MS-Windows console: support for 'termguicolors'
-N  *+wildignore*	|'wildignore'|
-N  *+wildmenu*		|'wildmenu'|
+T  *+wildignore*	|'wildignore'|  Always enabled since 9.0.0278
+T  *+wildmenu*		|'wildmenu'||  Always enabled since 9.0.0279
 T  *+windows*		more than one window; Always enabled since 8.0.1118.
 m  *+writebackup*	|'writebackup'| is default on
 m  *+xim*		X input method |xim|

runtime/doc/vim9.txt

@@ -913,6 +913,12 @@ Comparators ~
 The 'ignorecase' option is not used for comparators that use strings.
 Thus "=~" works like "=~#".
 
+"is" and "isnot" (|expr-is| and |expr-isnot|) when used on strings now return
+false.  In legacy script they just compare the strings, in |Vim9| script they
+check identity, and strings are copied when used, thus two strings are never
+the same (this might change some day if strings are not copied but reference
+counted).
+
 
 Abort after error ~
 
@@ -1612,7 +1618,7 @@ type, it can not be used in Vim9 script.
 			 *E1211* *E1217* *E1218* *E1219* *E1220* *E1221*
 			 *E1222* *E1223* *E1224* *E1225* *E1226* *E1227*
 			 *E1228* *E1238* *E1250* *E1251* *E1252* *E1253*
-			 *E1256*
+			 *E1256* *E1297* *E1298*
 Types are checked for most builtin functions to make it easier to spot
 mistakes.
 
@@ -1817,7 +1823,7 @@ defined.  This does not apply to autoload imports, see the next section.
 
 
 Importing an autoload script ~
-							*vim9-autoload*
+					*vim9-autoload* *import-autoload*
 For optimal startup speed, loading scripts should be postponed until they are
 actually needed.  Using the autoload mechanism is recommended:
 							*E1264*

runtime/doc/windows.txt

@@ -183,6 +183,8 @@ CTRL-W v						*CTRL-W_v*
 		3. 'eadirection' isn't "ver", and
 		4. one of the other windows is wider than the current or new
 		   window.
+		If N was given make the new window N columns wide, if
+		possible.
 		Note: In other places CTRL-Q does the same as CTRL-V, but here
 		it doesn't!
 
@@ -254,9 +256,16 @@ and 'winminwidth' are relevant.
 						*:vert* *:vertical*
 :vert[ical] {cmd}
 		Execute {cmd}.  If it contains a command that splits a window,
-		it will be split vertically.
+		it will be split vertically.  For `vertical wincmd =` windows
+		will be equialized only vertically.
 		Doesn't work for |:execute| and |:normal|.
 
+						*:hor* *:horizontal*
+:hor[izontal] {cmd}
+		Execute {cmd}.  Currently only makes a difference for
+		`horizontal wincmd =`, which will equal windows only
+		horizontally.
+
 :lefta[bove] {cmd}				*:lefta* *:leftabove*
 :abo[veleft] {cmd}				*:abo* *:aboveleft*
 		Execute {cmd}.  If it contains a command that splits a window,
@@ -551,6 +560,10 @@ CTRL-W =	Make all windows (almost) equally high and wide, but use
 		'winheight' and 'winwidth' for the current window.
 		Windows with 'winfixheight' set keep their height and windows
 		with 'winfixwidth' set keep their width.
+		To equalize only vertically (make window equally high) use
+		`vertical wincmd =`
+		To equalize only horizontally (make window equally wide) use
+		`horizontal wincmd =`
 
 :res[ize] -N					*:res* *:resize* *CTRL-W_-*
 CTRL-W -	Decrease current window height by N (default 1).
@@ -841,30 +854,22 @@ CTRL-W CTRL-F	Split current window in two.  Edit file name under cursor.
 		If the name is a hypertext link that looks like
 		"type://machine/path", only "/path" is used.
 		If a count is given, the count'th matching file is edited.
-		{not available when the |+file_in_path| feature was disabled
-		at compile time}
 
 CTRL-W F						*CTRL-W_F*
 		Split current window in two.  Edit file name under cursor and
 		jump to the line number following the file name. See |gF| for
 		details on how the line number is obtained.
-		{not available when the |+file_in_path| feature was disabled
-		at compile time}
 
 CTRL-W gf						*CTRL-W_gf*
 		Open a new tab page and edit the file name under the cursor.
 		Like "tab split" and "gf", but the new tab page isn't created
 		if the file does not exist.
-		{not available when the |+file_in_path| feature was disabled
-		at compile time}
 
 CTRL-W gF						*CTRL-W_gF*
 		Open a new tab page and edit the file name under the cursor
 		and jump to the line number following the file name.  Like
 		"tab split" and "gF", but the new tab page isn't created if
 		the file does not exist.
-		{not available when the |+file_in_path| feature was disabled
-		at compile time}
 
 CTRL-W gt						*CTRL-W_gt*
 		Go to next tab page, same as `gt`.

runtime/filetype.vim

@@ -172,6 +172,9 @@ au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call dist#ft#FTasm()
 " Assembly - Macro (VAX)
 au BufNewFile,BufRead *.mar			setf vmasm
 
+" Astro
+au BufNewFile,BufRead *.astro			setf astro
+
 " Atlas
 au BufNewFile,BufRead *.atl,*.as		setf atlas
 
@@ -693,7 +696,10 @@ au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
 au BufNewFile,BufRead *.gd			setf gdscript
 
 " Godot resource
-au BufRead,BufNewFile *.tscn,*.tres			setf gdresource
+au BufRead,BufNewFile *.tscn,*.tres		setf gdresource
+
+" Godot shader
+au BufRead,BufNewFile *.gdshader,*.shader	setf gdshader
 
 " Gedcom
 au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
@@ -1160,6 +1166,7 @@ au BufNewFile,BufRead *.mf			setf mf
 
 " MetaPost
 au BufNewFile,BufRead *.mp			setf mp
+au BufNewFile,BufRead *.mpxl,*.mpiv,*.mpvi	let b:mp_metafun = 1 | setf mp
 
 " MGL
 au BufNewFile,BufRead *.mgl			setf mgl
@@ -1531,6 +1538,9 @@ au BufNewFile,BufRead *.ptl,*.pyi,SConstruct		   setf python
 " QL
 au BufRead,BufNewFile *.ql,*.qll		setf ql
 
+" Quarto
+au BufRead,BufNewFile *.qmd     setf quarto
+
 " Radiance
 au BufNewFile,BufRead *.rad,*.mat		setf radiance
 
@@ -2084,6 +2094,11 @@ au BufNewFile,BufRead */.config/upstart/*.override	       setf upstart
 " Vala
 au BufNewFile,BufRead *.vala			setf vala
 
+" VDM
+au BufRead,BufNewFile *.vdmpp,*.vpp		setf vdmpp
+au BufRead,BufNewFile *.vdmrt			setf vdmrt
+au BufRead,BufNewFile *.vdmsl,*.vdm		setf vdmsl
+
 " Vera
 au BufNewFile,BufRead *.vr,*.vri,*.vrh		setf vera
 

runtime/ftplugin/context.vim

@@ -1,117 +1,115 @@
-" Vim filetype plugin file
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2021 Oct 15
+vim9script
+
+# Vim filetype plugin file
+# Language:           ConTeXt typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision:    2022 Aug 12
 
 if exists("b:did_ftplugin")
   finish
 endif
-let b:did_ftplugin = 1
 
-let s:cpo_save = &cpo
-set cpo&vim
+import autoload '../autoload/context.vim'
+
+b:did_ftplugin = 1
 
 if !exists('current_compiler')
   compiler context
 endif
 
-let b:undo_ftplugin = "setl com< cms< def< inc< sua< fo< ofu<"
+b:undo_ftplugin = "setl com< cms< def< inc< sua< fo< ofu<"
 
-setlocal comments=b:%D,b:%C,b:%M,:% commentstring=%\ %s formatoptions+=tjcroql2
-if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
-  setlocal omnifunc=contextcomplete#Complete
-  let g:omni_syntax_group_include_context = 'mf\w\+,mp\w\+'
-  let g:omni_syntax_group_exclude_context = 'mfTodoComment'
+setlocal comments=b:%D,b:%C,b:%M,:%
+setlocal commentstring=%\ %s
+setlocal formatoptions+=tjcroql2
+setlocal omnifunc=context.Complete
+setlocal suffixesadd=.tex,.mkxl,.mkvi,.mkiv,.mkii
+
+&l:define = '\\\%([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
+..          'def\|\\font\|\\\%(future\)\=let'
+..          '\|\\new\%(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
+..          '\|fam\|insert\|if\)'
+
+&l:include = '^\s*\\\%(input\|component\|product\|project\|environment\)'
+
+if exists("g:loaded_matchit") && !exists("b:match_words")
+  b:match_ignorecase = 0
+  b:match_skip = 'r:\\\@<!\%(\\\\\)*%'
+  b:match_words = '(:),\[:],{:},\\(:\\),\\\[:\\],\\start\(\a\+\):\\stop\1'
+  b:undo_ftplugin ..= "| unlet! b:match_ignorecase b:match_words b:match_skip"
 endif
 
-let &l:define='\\\%([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
-        \ .     'def\|\\font\|\\\%(future\)\=let'
-        \ . '\|\\new\%(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
-        \ .     '\|fam\|insert\|if\)'
+if !get(g:, 'no_context_maps', 0) && !get(g:, 'no_plugin_maps', 0)
+  const context_regex = {
+    'beginsection': '\\\%(start\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
+    'endsection':   '\\\%(stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
+    'beginblock':   '\\\%(start\|setup\|define\)',
+    'endblock':     '\\\%(stop\|setup\|define\)',
+    }
 
-let &l:include = '^\s*\\\%(input\|component\|product\|project\|environment\)'
+  def UndoMap(mapping: string, modes: string)
+    for mode in modes
+      b:undo_ftplugin ..= printf(" | silent! execute '%sunmap <buffer> %s'", mode, mapping)
+    endfor
+  enddef
 
-setlocal suffixesadd=.tex
+  def MoveAround(count: number, what: string, flags: string)
+    search(context_regex[what], flags .. 's')  # 's' sets previous context mark
+    var i = 2
+    while i <= count
+      search(context_regex[what], flags)
+      i += 1
+    endwhile
+  enddef
 
-if exists("loaded_matchit") && !exists("b:match_words")
-  let b:match_ignorecase = 0
-  let b:match_skip = 'r:\\\@<!\%(\\\\\)*%'
-  let b:match_words = '(:),\[:],{:},\\(:\\),\\\[:\\],' .
-        \ '\\start\(\a\+\):\\stop\1'
-  let b:undo_ftplugin .= " | unlet! b:match_ignorecase b:match_words b:match_skip"
-endif
+  # Macros to move around
+  nnoremap <silent><buffer> [[ <scriptcmd>MoveAround(v:count1, "beginsection", "bW")<cr>
+  vnoremap <silent><buffer> [[ <scriptcmd>MoveAround(v:count1, "beginsection", "bW")<cr>
+  nnoremap <silent><buffer> ]] <scriptcmd>MoveAround(v:count1, "beginsection", "W") <cr>
+  vnoremap <silent><buffer> ]] <scriptcmd>MoveAround(v:count1, "beginsection", "W") <cr>
+  nnoremap <silent><buffer> [] <scriptcmd>MoveAround(v:count1, "endsection",   "bW")<cr>
+  vnoremap <silent><buffer> [] <scriptcmd>MoveAround(v:count1, "endsection",   "bW")<cr>
+  nnoremap <silent><buffer> ][ <scriptcmd>MoveAround(v:count1, "endsection",   "W") <cr>
+  vnoremap <silent><buffer> ][ <scriptcmd>MoveAround(v:count1, "endsection",   "W") <cr>
+  nnoremap <silent><buffer> [{ <scriptcmd>MoveAround(v:count1, "beginblock",   "bW")<cr>
+  vnoremap <silent><buffer> [{ <scriptcmd>MoveAround(v:count1, "beginblock",   "bW")<cr>
+  nnoremap <silent><buffer> ]} <scriptcmd>MoveAround(v:count1, "endblock",     "W") <cr>
+  vnoremap <silent><buffer> ]} <scriptcmd>MoveAround(v:count1, "endblock",     "W") <cr>
 
-let s:context_regex = {
-      \ 'beginsection' : '\\\%(start\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
-      \ 'endsection'   : '\\\%(stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
-      \ 'beginblock'   : '\\\%(start\|setup\|define\)',
-      \ 'endblock'     : '\\\%(stop\|setup\|define\)'
-      \ }
+  for mapping in ['[[', ']]', '[]', '][', '[{', ']}']
+    UndoMap(mapping, 'nv')
+  endfor
 
-function! s:move_around(count, what, flags, visual)
-  if a:visual
-    exe "normal! gv"
-  endif
-  call search(s:context_regex[a:what], a:flags.'s') " 's' sets previous context mark
-  call map(range(2, a:count), 'search(s:context_regex[a:what], a:flags)')
-endfunction
+  # Other useful mappings
+  const tp_regex = '?^$\|^\s*\\\(item\|start\|stop\|blank\|\%(sub\)*section\|chapter\|\%(sub\)*subject\|title\|part\)'
 
-if !exists("no_plugin_maps") && !exists("no_context_maps")
-  " Move around macros.
-  nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
-  vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
-  nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
-  vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
-  nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
-  vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
-  nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
-  vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
-  nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
-  vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
-  nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
-  vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
-
-  let b:undo_ftplugin .= " | sil! exe 'nunmap <buffer> [[' | sil! exe 'vunmap <buffer> [['" .
-	\                " | sil! exe 'nunmap <buffer> ]]' | sil! exe 'vunmap <buffer> ]]'" .
-	\                " | sil! exe 'nunmap <buffer> []' | sil! exe 'vunmap <buffer> []'" .
-	\                " | sil! exe 'nunmap <buffer> ][' | sil! exe 'vunmap <buffer> ]['" .
-	\                " | sil! exe 'nunmap <buffer> [{' | sil! exe 'vunmap <buffer> [{'" .
-	\                " | sil! exe 'nunmap <buffer> ]}' | sil! exe 'vunmap <buffer> ]}'"
-end
-
-" Other useful mappings
-if get(g:, 'context_mappings', 1)
-  let s:tp_regex = '?^$\|^\s*\\\(item\|start\|stop\|blank\|\%(sub\)*section\|chapter\|\%(sub\)*subject\|title\|part\)'
-
-  fun! s:tp()
-    call cursor(search(s:tp_regex, 'bcW') + 1, 1)
+  def TeXPar()
+    cursor(search(tp_regex, 'bcW') + 1, 1)
     normal! V
-    call cursor(search(s:tp_regex, 'W') - 1, 1)
-  endf
+    cursor(search(tp_regex, 'W') - 1, 1)
+  enddef
 
-  if !exists("no_plugin_maps") && !exists("no_context_maps")
-    " Reflow paragraphs with commands like gqtp ("gq TeX paragraph")
-    onoremap <silent><buffer> tp :<c-u>call <sid>tp()<cr>
-    " Select TeX paragraph
-    vnoremap <silent><buffer> tp <esc>:<c-u>call <sid>tp()<cr>
+  # Reflow paragraphs with mappings like gqtp ("gq TeX paragraph")
+  onoremap <silent><buffer> tp <scriptcmd>TeXPar()<cr>
+  # Select TeX paragraph
+  vnoremap <silent><buffer> tp <scriptcmd>TeXPar()<cr>
 
-    " $...$ text object
-    onoremap <silent><buffer> i$ :<c-u>normal! T$vt$<cr>
-    onoremap <silent><buffer> a$ :<c-u>normal! F$vf$<cr>
-    vnoremap <buffer> i$ T$ot$
-    vnoremap <buffer> a$ F$of$
+  # $...$ text object
+  onoremap <silent><buffer> i$ <scriptcmd>normal! T$vt$<cr>
+  onoremap <silent><buffer> a$ <scriptcmd>normal! F$vf$<cr>
+  vnoremap <buffer> i$ T$ot$
+  vnoremap <buffer> a$ F$of$
 
-    let b:undo_ftplugin .= " | sil! exe 'ounmap <buffer> tp' | sil! exe 'vunmap <buffer> tp'" .
-	  \                " | sil! exe 'ounmap <buffer> i$' | sil! exe 'vunmap <buffer> i$'" .
-	  \                " | sil! exe 'ounmap <buffer> a$' | sil! exe 'vunmap <buffer> a$'"
-    endif
+  for mapping in ['tp', 'i$', 'a$']
+    UndoMap(mapping, 'ov')
+  endfor
 endif
 
-" Commands for asynchronous typesetting
-command! -buffer -nargs=? -complete=file ConTeXt          call context#typeset(<q-args>)
-command!         -nargs=0                ConTeXtJobStatus call context#job_status()
-command!         -nargs=0                ConTeXtStopJobs  call context#stop_jobs()
+# Commands for asynchronous typesetting
+command! -buffer -nargs=? -complete=buffer ConTeXt          context.Typeset(<q-args>)
+command! -buffer -nargs=0                  ConTeXtLog       context.Log('%')
+command!         -nargs=0                  ConTeXtJobStatus context.JobStatus()
+command!         -nargs=0                  ConTeXtStopJobs  context.StopJobs()
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
+# vim: sw=2 fdm=marker

runtime/ftplugin/elixir.vim

@@ -1,11 +1,29 @@
 " Elixir filetype plugin
 " Language: Elixir
 " Maintainer:	Mitchell Hanberg <vimNOSPAM@mitchellhanberg.com>
-" Last Change: 2022 Apr 20
+" Last Change: 2022 August 10
 
 if exists("b:did_ftplugin")
   finish
 endif
 let b:did_ftplugin = 1
 
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Matchit support
+if exists('loaded_matchit') && !exists('b:match_words')
+  let b:match_ignorecase = 0
+
+  let b:match_words = '\:\@<!\<\%(do\|fn\)\:\@!\>' .
+        \ ':' .
+        \ '\<\%(else\|catch\|after\|rescue\)\:\@!\>' .
+        \ ':' .
+        \ '\:\@<!\<end\>' .
+        \ ',{:},\[:\],(:)'
+endif
+
 setlocal commentstring=#\ %s
+
+let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/gdscript.vim

@@ -0,0 +1,53 @@
+vim9script
+
+# Vim filetype plugin file
+# Language: gdscript (Godot game engine scripting language)
+# Maintainer: Maxim Kim <habamax@gmail.com>
+
+if exists("b:did_ftplugin") | finish | endif
+
+b:did_ftplugin = 1
+b:undo_ftplugin = 'setlocal cinkeys<'
+      \ .. '| setlocal indentkeys<'
+      \ .. '| setlocal commentstring<'
+      \ .. '| setlocal suffixesadd<'
+      \ .. '| setlocal foldexpr<'
+      \ .. '| setlocal foldignore<'
+
+setlocal cinkeys-=0#
+setlocal indentkeys-=0#
+setlocal suffixesadd=.gd
+setlocal commentstring=#\ %s
+setlocal foldignore=
+setlocal foldexpr=GDScriptFoldLevel()
+
+
+def GDScriptFoldLevel(): string
+    var line = getline(v:lnum)
+    if line =~? '^\s*$'
+        return "-1"
+    endif
+
+    var sw = shiftwidth()
+    var indent = indent(v:lnum) / sw
+    var indent_next = indent(nextnonblank(v:lnum + 1)) / sw
+
+    if indent_next > indent && line =~ ':\s*$'
+        return $">{indent_next}"
+    else
+        return $"{indent}"
+    endif
+enddef
+
+
+# Next/Previous section
+def NextSection(back: bool, cnt: number)
+    for n in range(cnt)
+        search('^\s*func\s', back ? 'bW' : 'W')
+    endfor
+enddef
+
+nnoremap <silent><buffer>   ]] <scriptcmd>NextSection(false, v:count1)<CR>
+nnoremap <silent><buffer>   [[ <scriptcmd>NextSection(true, v:count1)<CR>
+xmap <silent><buffer><expr> ]] "\<esc>" .. v:count1 .. ']]m>gv'
+xmap <silent><buffer><expr> [[ "\<esc>" .. v:count1 .. '[[m>gv'

runtime/ftplugin/gdshader.vim

@@ -0,0 +1,12 @@
+vim9script
+
+# Vim filetype plugin file
+# Language: Godot shading language
+# Maintainer: Maxim Kim <habamax@gmail.com>
+
+if exists("b:did_ftplugin") | finish | endif
+b:did_ftplugin = 1
+
+b:undo_ftplugin = 'setlocal suffixesadd<'
+
+setlocal suffixesadd=.gdshader

runtime/ftplugin/j.vim

@@ -2,7 +2,7 @@
 " Language:	J
 " Maintainer:	David Bürgin <dbuergin@gluet.ch>
 " URL:		https://gitlab.com/glts/vim-j
-" Last Change:	2015-10-27
+" Last Change:	2022-08-06
 
 if exists('b:did_ftplugin')
   finish
@@ -29,41 +29,43 @@ let b:undo_ftplugin = 'setlocal suffixesadd< includeexpr< include< path< matchpa
 
 " Section movement with ]] ][ [[ []. The start/end patterns below are amended
 " inside the function in order to avoid matching on the current cursor line.
-let s:sectionstart = '\%(\s*Note\|.\{-}\<\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\)\>.*'
-let s:sectionend = '\s*)\s*'
+if !exists('no_plugin_maps') && !exists('no_j_maps')
+  let s:sectionstart = '\%(\s*Note\|.\{-}\<\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\)\>.*'
+  let s:sectionend = '\s*)\s*'
 
-function! s:SearchSection(end, backwards, visualmode) abort
-  if a:visualmode !=# ''
-    normal! gv
-  endif
-  let l:flags = a:backwards ? 'bsW' : 'sW'
-  if a:end
-    call search('^' . s:sectionend . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags)
-  else
-    call search('^' . s:sectionstart . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags)
-  endif
-endfunction
+  function! s:SearchSection(end, backwards, visualmode) abort
+    if a:visualmode !=# ''
+      normal! gv
+    endif
+    let l:flags = a:backwards ? 'bsW' : 'sW'
+    if a:end
+      call search('^' . s:sectionend . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags)
+    else
+      call search('^' . s:sectionstart . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags)
+    endif
+  endfunction
 
-noremap <buffer> <silent> ]] :<C-U>call <SID>SearchSection(0, 0, '')<CR>
-xnoremap <buffer> <silent> ]] :<C-U>call <SID>SearchSection(0, 0, visualmode())<CR>
-sunmap <buffer> ]]
-noremap <buffer> <silent> ][ :<C-U>call <SID>SearchSection(1, 0, '')<CR>
-xnoremap <buffer> <silent> ][ :<C-U>call <SID>SearchSection(1, 0, visualmode())<CR>
-sunmap <buffer> ][
-noremap <buffer> <silent> [[ :<C-U>call <SID>SearchSection(0, 1, '')<CR>
-xnoremap <buffer> <silent> [[ :<C-U>call <SID>SearchSection(0, 1, visualmode())<CR>
-sunmap <buffer> [[
-noremap <buffer> <silent> [] :<C-U>call <SID>SearchSection(1, 1, '')<CR>
-xnoremap <buffer> <silent> [] :<C-U>call <SID>SearchSection(1, 1, visualmode())<CR>
-sunmap <buffer> []
+  noremap <buffer> <silent> ]] :<C-U>call <SID>SearchSection(0, 0, '')<CR>
+  xnoremap <buffer> <silent> ]] :<C-U>call <SID>SearchSection(0, 0, visualmode())<CR>
+  sunmap <buffer> ]]
+  noremap <buffer> <silent> ][ :<C-U>call <SID>SearchSection(1, 0, '')<CR>
+  xnoremap <buffer> <silent> ][ :<C-U>call <SID>SearchSection(1, 0, visualmode())<CR>
+  sunmap <buffer> ][
+  noremap <buffer> <silent> [[ :<C-U>call <SID>SearchSection(0, 1, '')<CR>
+  xnoremap <buffer> <silent> [[ :<C-U>call <SID>SearchSection(0, 1, visualmode())<CR>
+  sunmap <buffer> [[
+  noremap <buffer> <silent> [] :<C-U>call <SID>SearchSection(1, 1, '')<CR>
+  xnoremap <buffer> <silent> [] :<C-U>call <SID>SearchSection(1, 1, visualmode())<CR>
+  sunmap <buffer> []
 
-let b:undo_ftplugin .= ' | silent! execute "unmap <buffer> ]]"'
-                   \ . ' | silent! execute "unmap <buffer> ]["'
-                   \ . ' | silent! execute "unmap <buffer> [["'
-                   \ . ' | silent! execute "unmap <buffer> []"'
+  let b:undo_ftplugin .= ' | silent! execute "unmap <buffer> ]]"'
+                     \ . ' | silent! execute "unmap <buffer> ]["'
+                     \ . ' | silent! execute "unmap <buffer> [["'
+                     \ . ' | silent! execute "unmap <buffer> []"'
+endif
 
-" Browse dialog filter on Windows (see ":help browsefilter")
-if has('gui_win32') && !exists('b:browsefilter')
+" Browse dialog filter on Windows and GTK (see ":help browsefilter")
+if (has('gui_win32') || has('gui_gtk')) && !exists('b:browsefilter')
   let b:browsefilter = "J Script Files (*.ijs)\t*.ijs\n"
                    \ . "All Files (*.*)\t*.*\n"
   let b:undo_ftplugin .= ' | unlet! b:browsefilter'

runtime/ftplugin/mf.vim

@@ -1,70 +1,82 @@
-" Vim filetype plugin file
-" Language:           METAFONT
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2016 Oct 2
+vim9script
+
+# Vim filetype plugin file
+# Language:           METAFONT
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision:    2022 Aug 12
 
 if exists("b:did_ftplugin")
   finish
 endif
-let b:did_ftplugin = 1
 
-let s:cpo_save = &cpo
-set cpo&vim
+b:did_ftplugin = 1
+b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<"
 
-let b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<"
-      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
-
-setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=cjroql2
-setlocal suffixesadd=.mf
-let &l:include = '\<input\>'
-let &l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+'
+setlocal comments=:%
+setlocal commentstring=%\ %s
+setlocal formatoptions+=cjroql2
+setlocal formatoptions-=t
 setlocal omnifunc=syntaxcomplete#Complete
-let g:omni_syntax_group_include_mf = 'mf\w\+'
-let g:omni_syntax_group_exclude_mf = 'mfTodoComment'
+setlocal suffixesadd=.mf
 
-let s:mp_regex = {
-      \ 'beginsection' : '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|beginchar\|beginlogochar\)\>',
-      \ 'endsection'   : '^\s*\%(enddef\|endchar\)\>',
-      \ 'beginblock'   : '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
-      \ 'endblock'     : '^\s*\%(endgroup\|fi\|endfor\)\>'
-      \ }
+&l:include = '\<input\>'
+&l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+'
 
-function! s:move_around(count, what, flags, visual)
-  if a:visual
-    exe "normal! gv"
-  endif
-  call search(s:mp_regex[a:what], a:flags.'s') " 's' sets previous context mark
-  call map(range(2, a:count), 'search(s:mp_regex[a:what], a:flags)')
-endfunction
+g:omni_syntax_group_include_mf = 'mf\w\+'
+g:omni_syntax_group_exclude_mf = 'mfTodoComment'
 
-
-" Move around macros.
-nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
-vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
-nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
-vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
-nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
-vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
-nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
-vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
-nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
-vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
-nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
-vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
-
-if exists("loaded_matchit")
-  let b:match_ignorecase = 0
-  let b:match_words =
-        \ '\<if\>:\<else\%[if]\>:\<fi\>,' .
-        \ '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,' .
-        \ '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' .
-        \ '\<begingroup\>:\<endgroup\>,' .
-        \ '\<begin\%(logo\)\?char\>:\<endchar\>'
-  " Ignore comments and strings
-  let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
-        \ =~# "mf\\(Comment\\|String\\)$"'
+if exists("g:loaded_matchit") && !exists("b:match_words")
+  b:match_ignorecase = 0
+  b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name") =~# "mf\\(Comment\\|String\\)$"'
+  b:match_words = '\<if\>:\<else\%[if]\>:\<fi\>,'
+  ..              '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,'
+  ..              '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,'
+  ..              '\<begingroup\>:\<endgroup\>,'
+  ..              '\<begin\%(logo\)\?char\>:\<endchar\>'
+  b:undo_ftplugin ..= "| unlet! b:match_ignorecase b:match_words b:match_skip"
 endif
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
+if !get(g:, 'no_mf_maps', 0) && !get(g:, 'no_plugin_maps', 0)
+  const mf_regex = {
+    'beginsection': '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|beginchar\|beginlogochar\)\>',
+    'endsection':   '^\s*\%(enddef\|endchar\)\>',
+    'beginblock':   '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
+    'endblock':     '^\s*\%(endgroup\|fi\|endfor\)\>'}
+
+  def MoveAround(count: number, what: string, flags: string)
+    search(mf_regex[what], flags .. 's')  # 's' sets previous context mark
+    var i = 2
+    while i <= count
+      search(mf_regex[what], flags)
+      i += 1
+    endwhile
+  enddef
+
+  # Macros to move around
+  nnoremap <silent><buffer> [[ <scriptcmd>MoveAround(v:count1, "beginsection", "bW")<cr>
+  vnoremap <silent><buffer> [[ <scriptcmd>MoveAround(v:count1, "beginsection", "bW")<cr>
+  nnoremap <silent><buffer> ]] <scriptcmd>MoveAround(v:count1, "beginsection", "W") <cr>
+  vnoremap <silent><buffer> ]] <scriptcmd>MoveAround(v:count1, "beginsection", "W") <cr>
+  nnoremap <silent><buffer> [] <scriptcmd>MoveAround(v:count1, "endsection",   "bW")<cr>
+  vnoremap <silent><buffer> [] <scriptcmd>MoveAround(v:count1, "endsection",   "bW")<cr>
+  nnoremap <silent><buffer> ][ <scriptcmd>MoveAround(v:count1, "endsection",   "W") <cr>
+  vnoremap <silent><buffer> ][ <scriptcmd>MoveAround(v:count1, "endsection",   "W") <cr>
+  nnoremap <silent><buffer> [{ <scriptcmd>MoveAround(v:count1, "beginblock",   "bW")<cr>
+  vnoremap <silent><buffer> [{ <scriptcmd>MoveAround(v:count1, "beginblock",   "bW")<cr>
+  nnoremap <silent><buffer> ]} <scriptcmd>MoveAround(v:count1, "endblock",     "W") <cr>
+  vnoremap <silent><buffer> ]} <scriptcmd>MoveAround(v:count1, "endblock",     "W") <cr>
+
+  for mapping in ["[[", "]]", "[]", "][", "[{", "]}"]
+    b:undo_ftplugin ..= printf(" | silent! execute 'nunmap <buffer> %s'", mapping)
+    b:undo_ftplugin ..= printf(" | silent! execute 'vunmap <buffer> %s'", mapping)
+  endfor
+endif
+
+if (has('gui_win32') || has('gui_gtk')) && !exists('b:browsefilter')
+  b:browsefilter = "METAFONT Source Files (*.mf)\t*.mf\n"
+  ..                   "All Files (*.*)\t*.*\n"
+  b:undo_ftplugin ..= ' | unlet! b:browsefilter'
+endif
+
+# vim: sw=2 fdm=marker

runtime/ftplugin/mp.vim

@@ -1,82 +1,91 @@
-" Vim filetype plugin file
-" Language:           MetaPost
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2016 Oct 2
+vim9script
+
+# Vim filetype plugin file
+# Language:           MetaPost
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision:    2022 Aug 12
 
 if exists("b:did_ftplugin")
   finish
 endif
-let b:did_ftplugin = 1
 
-let s:cpo_save = &cpo
-set cpo&vim
+b:did_ftplugin = 1
+b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<"
 
-let b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<"
-      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
-
-setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=cjroql2
-setlocal suffixesadd=.mp,.mpiv
-let &l:include = '\<\%(input\|loadmodule\)\>' " loadmodule is in MetaFun
-let &l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+'
+setlocal comments=:%
+setlocal commentstring=%\ %s
+setlocal formatoptions+=cjroql2
+setlocal formatoptions-=t
 setlocal omnifunc=syntaxcomplete#Complete
-let g:omni_syntax_group_include_mp = 'mf\w\+,mp\w\+'
-let g:omni_syntax_group_exclude_mp = 'mfTodoComment'
+setlocal suffixesadd=.mp,.mpiv,.mpvi,.mpxl
 
-if exists(":FixBeginfigs") != 2
-  command -nargs=0 FixBeginfigs call s:fix_beginfigs()
+&l:include = '\<\%(input\|loadmodule\)\>'  # loadmodule is from MetaFun
+&l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+'
 
-  function! s:fix_beginfigs()
-    let i = 1
-    g/^beginfig(\d*);$/s//\='beginfig('.i.');'/ | let i = i + 1
-  endfunction
+g:omni_syntax_group_include_mp = 'mf\w\+,mp\w\+,metafun\w\+'
+g:omni_syntax_group_exclude_mp = 'mfTodoComment'
+
+var fignum: number
+
+def FixBeginfigs()
+  fignum = 1
+  g/^\s*beginfig(\d*)\s*;\(\s*%.*\)\=$/s/^.\{-};/\='beginfig(' .. fignum .. ');'/ | ++fignum
+enddef
+
+command! -buffer -nargs=0 -bar FixBeginfigs FixBeginfigs()
+
+if exists("g:loaded_matchit") && !exists("b:match_words")
+  b:match_ignorecase = 0
+  b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name") =~# "^mf\\%(Comment\\|String\\|\\)$\\|^mpTeXinsert$"'
+  b:match_words = '\<if\>:\<else\%[if]\>:\<fi\>,'
+  ..              '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,'
+  ..              '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,'
+  ..              '\<begin\(\a\+\)\>:end\1,'
+  ..              '\<beginlogochar\>:\<endchar\>'
+  b:undo_ftplugin ..= "| unlet! b:match_ignorecase b:match_words b:match_skip"
 endif
 
-let s:mp_regex = {
-      \ 'beginsection' : '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|begin\%(fig\|char\|logochar\|glyph\|graph\)\)\>',
-      \ 'endsection'   : '^\s*\%(enddef\|end\%(fig\|char\|glyph\|graph\)\)\>',
-      \ 'beginblock'   : '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
-      \ 'endblock'     : '^\s*\%(endgroup\|fi\|endfor\)\>'
-      \ }
+if !get(g:, 'no_mp_maps', 0) && !get(g:, 'no_plugin_maps', 0)
+  const mp_regex = {
+    'beginsection': '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|begin\%(fig\|char\|logochar\|glyph\|graph\)\)\>',
+    'endsection':   '^\s*\%(enddef\|end\%(fig\|char\|glyph\|graph\)\)\>',
+    'beginblock':   '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
+    'endblock':     '^\s*\%(endgroup\|fi\|endfor\)\>'}
 
-function! s:move_around(count, what, flags, visual)
-  if a:visual
-    exe "normal! gv"
-  endif
-  call search(s:mp_regex[a:what], a:flags.'s') " 's' sets previous context mark
-  call map(range(2, a:count), 'search(s:mp_regex[a:what], a:flags)')
-endfunction
+  def MoveAround(count: number, what: string, flags: string)
+    search(mp_regex[what], flags .. 's')  # 's' sets previous context mark
+    var i = 2
+    while i <= count
+      search(mp_regex[what], flags)
+      i += 1
+    endwhile
+  enddef
 
+  # Macros to move around
+  nnoremap <silent><buffer> [[ <scriptcmd>MoveAround(v:count1, "beginsection", "bW")<cr>
+  vnoremap <silent><buffer> [[ <scriptcmd>MoveAround(v:count1, "beginsection", "bW")<cr>
+  nnoremap <silent><buffer> ]] <scriptcmd>MoveAround(v:count1, "beginsection", "W") <cr>
+  vnoremap <silent><buffer> ]] <scriptcmd>MoveAround(v:count1, "beginsection", "W") <cr>
+  nnoremap <silent><buffer> [] <scriptcmd>MoveAround(v:count1, "endsection",   "bW")<cr>
+  vnoremap <silent><buffer> [] <scriptcmd>MoveAround(v:count1, "endsection",   "bW")<cr>
+  nnoremap <silent><buffer> ][ <scriptcmd>MoveAround(v:count1, "endsection",   "W") <cr>
+  vnoremap <silent><buffer> ][ <scriptcmd>MoveAround(v:count1, "endsection",   "W") <cr>
+  nnoremap <silent><buffer> [{ <scriptcmd>MoveAround(v:count1, "beginblock",   "bW")<cr>
+  vnoremap <silent><buffer> [{ <scriptcmd>MoveAround(v:count1, "beginblock",   "bW")<cr>
+  nnoremap <silent><buffer> ]} <scriptcmd>MoveAround(v:count1, "endblock",     "W") <cr>
+  vnoremap <silent><buffer> ]} <scriptcmd>MoveAround(v:count1, "endblock",     "W") <cr>
 
-" Move around macros.
-nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
-vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
-nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
-vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
-nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
-vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
-nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
-vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
-nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
-vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
-nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
-vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
-
-if exists("loaded_matchit")
-  let b:match_ignorecase = 0
-  let b:match_words =
-        \ '\<if\>:\<else\%[if]\>:\<fi\>,' .
-        \ '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,' .
-        \ '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' .
-        \ '\<beginfig\>:\<endfig\>,' .
-        \ '\<begingroup\>:\<endgroup\>,' .
-        \ '\<begin\%(logo\)\?char\>:\<endchar\>,' .
-        \ '\<beginglyph\>:\<endglyph\>,' .
-        \ '\<begingraph\>:\<endgraph\>'
-  " Ignore comments and strings
-  let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
-        \ =~# "^mf\\%(Comment\\|String\\|\\)$\\|^mpTeXinsert$"'
+  for mapping in ["[[", "]]", "[]", "][", "[{", "]}"]
+    b:undo_ftplugin ..= printf(" | silent! execute 'nunmap <buffer> %s'", mapping)
+    b:undo_ftplugin ..= printf(" | silent! execute 'vunmap <buffer> %s'", mapping)
+  endfor
 endif
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
+if (has('gui_win32') || has('gui_gtk')) && !exists('b:browsefilter')
+  b:browsefilter = "MetaPost Source Files (*.mp)\t*.mp\n"
+  ..               "All Files (*.*)\t*.*\n"
+  b:undo_ftplugin ..= ' | unlet! b:browsefilter'
+endif
+
+# vim: sw=2 fdm=marker

runtime/ftplugin/racket.vim

@@ -0,0 +1,82 @@
+" Vim filetype plugin
+" Language:             Racket
+" Maintainer:           D. Ben Knoble <ben.knoble+github@gmail.com>
+" Previous Maintainer:  Will Langstroth <will@langstroth.com>
+" URL:                  https://github.com/benknoble/vim-racket
+" Last Change:          2022 Aug 29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" quick hack to allow adding values
+setlocal iskeyword=@,!,#-',*-:,<-Z,a-z,~,_,94
+
+" Enable auto begin new comment line when continuing from an old comment line
+setlocal comments=:;;;;,:;;;,:;;,:;
+setlocal formatoptions+=r
+
+"setlocal commentstring=;;%s
+setlocal commentstring=#\|\ %s\ \|#
+
+setlocal formatprg=raco\ fmt
+
+" Undo our settings when the filetype changes away from Racket
+" (this should be amended if settings/mappings are added above!)
+let b:undo_ftplugin =
+      \  "setlocal iskeyword< lispwords< lisp< comments< formatoptions< formatprg<"
+      \. " | setlocal commentstring<"
+
+if !exists("no_plugin_maps") && !exists("no_racket_maps")
+  " Simply setting keywordprg like this works:
+  "    setlocal keywordprg=raco\ docs
+  " but then vim says:
+  "    "press ENTER or type a command to continue"
+  " We avoid the annoyance of having to hit enter by remapping K directly.
+  function s:RacketDoc(word) abort
+    execute 'silent !raco docs --' shellescape(a:word)
+    redraw!
+  endfunction
+  nnoremap <buffer> <Plug>RacketDoc :call <SID>RacketDoc(expand('<cword>'))<CR>
+  nmap <buffer> K <Plug>RacketDoc
+
+  " For the visual mode K mapping, it's slightly more convoluted to get the
+  " selected text:
+  function! s:Racket_visual_doc()
+    try
+      let l:old_a = @a
+      normal! gv"ay
+      call system("raco docs '". @a . "'")
+      redraw!
+      return @a
+    finally
+      let @a = l:old_a
+    endtry
+  endfunction
+
+  xnoremap <buffer> <Plug>RacketDoc :call <SID>Racket_visual_doc()<cr>
+  xmap <buffer> K <Plug>RacketDoc
+
+  let b:undo_ftplugin .=
+      \  " | silent! execute 'nunmap <buffer> K'"
+      \. " | silent! execute 'xunmap <buffer> K'"
+endif
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter =
+        \  "Racket Source Files (*.rkt *.rktl)\t*.rkt;*.rktl\n"
+        \. "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin .= " | unlet! b:browsefilter"
+endif
+
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_words = '#|:|#'
+  let b:undo_ftplugin .= " | unlet! b:match_words"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/indent/context.vim

@@ -1,36 +1,65 @@
-" ConTeXt indent file
-" Language: ConTeXt typesetting engine
-" Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Last Change:  2016 Oct 15
+vim9script
+
+# Language:           ConTeXt typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision:    2022 Aug 12
 
 if exists("b:did_indent")
   finish
 endif
 
-if !get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
-  finish
-endif
-
-" Load MetaPost indentation script
+# Load MetaPost indentation script (this will also set b:did_indent)
 runtime! indent/mp.vim
 
-let s:keepcpo= &cpo
-set cpo&vim
+setlocal indentexpr=ConTeXtIndent()
 
-setlocal indentexpr=GetConTeXtIndent()
+b:undo_indent = "setl indentexpr<"
 
-let b:undo_indent = "setl indentexpr<"
+def PrevNotComment(l: number): number
+  var prevlnum = prevnonblank(l)
 
-function! GetConTeXtIndent()
-  " Use MetaPost rules inside MetaPost graphic environments
+  while prevlnum > 0 && getline(prevlnum) =~# '^\s*%'
+    prevlnum = prevnonblank(prevlnum - 1)
+  endwhile
+
+  return prevlnum
+enddef
+
+def FindPair(pstart: string, pmid: string, pend: string): number
+  cursor(v:lnum, 1)
+  return indent(searchpair(pstart, pmid, pend, 'bWn',
+    'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
+enddef
+
+def ConTeXtIndent(): number
+  # Use MetaPost rules inside MetaPost graphic environments
   if len(synstack(v:lnum, 1)) > 0 &&
-        \ synIDattr(synstack(v:lnum, 1)[0], "name") ==# 'contextMPGraphic'
-    return GetMetaPostIndent()
+    synIDattr(synstack(v:lnum, 1)[0], "name") ==# 'contextMPGraphic'
+    return g:MetaPostIndent()
   endif
+
+  const prevlnum = PrevNotComment(v:lnum - 1)
+  const prevind  = indent(prevlnum)
+  const prevline = getline(prevlnum)
+  const currline = getline(v:lnum)
+
+  # If the current line starts with ], match indentation.
+  if currline =~# '^\s*\]'
+    return FindPair('\[', '', '\]')
+  endif
+
+  # If the current line starts with }, match indentation.
+  if currline =~# '^\s*}'
+    return FindPair('{', '', '}')
+  endif
+
+  # If the previous line ends with [ or { (possibly followed by a comment) then indent.
+  if prevline =~# '[{[]\s*\%(%.*\)\=$'
+    return prevind + shiftwidth()
+  endif
+
   return -1
-endfunc
+enddef
 
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim:sw=2
+# vim: sw=2 fdm=marker

runtime/indent/gdscript.vim

@@ -0,0 +1,148 @@
+vim9script
+
+# Vim indent file
+# Language: gdscript (Godot game engine)
+# Maintainer: Maxim Kim <habamax@gmail.com>
+# Based on python indent file.
+
+if exists("b:did_indent")
+    finish
+endif
+b:did_indent = 1
+
+var undo_opts = "setl indentexpr< indentkeys< lisp< autoindent<"
+
+if exists('b:undo_indent')
+    b:undo_indent ..= "|" .. undo_opts
+else
+    b:undo_indent = undo_opts
+endif
+
+setlocal nolisp
+setlocal autoindent
+setlocal indentexpr=GDScriptIndent()
+setlocal indentkeys+=<:>,=elif,=except
+
+
+def GDScriptIndent(): number
+    # If this line is explicitly joined: If the previous line was also joined,
+    # line it up with that one, otherwise add two 'shiftwidth'
+    if getline(v:lnum - 1) =~ '\\$'
+        if v:lnum > 1 && getline(v:lnum - 2) =~ '\\$'
+            return indent(v:lnum - 1)
+        endif
+        return indent(v:lnum - 1) + (shiftwidth() * 2)
+    endif
+
+    # If the start of the line is in a string don't change the indent.
+    if has('syntax_items') && synIDattr(synID(v:lnum, 1, 1), "name") =~ "String$"
+        return -1
+    endif
+
+    # Search backwards for the previous non-empty line.
+    var plnum = prevnonblank(v:lnum - 1)
+
+    if plnum == 0
+        # This is the first non-empty line, use zero indent.
+        return 0
+    endif
+
+    var plindent = indent(plnum)
+    var plnumstart = plnum
+
+    # Get the line and remove a trailing comment.
+    # Use syntax highlighting attributes when possible.
+    var pline = getline(plnum)
+    var pline_len = strlen(pline)
+    if has('syntax_items')
+        # If the last character in the line is a comment, do a binary search for
+        # the start of the comment.  synID() is slow, a linear search would take
+        # too long on a long line.
+        if synIDattr(synID(plnum, pline_len, 1), "name") =~ "\\(Comment\\|Todo\\)$"
+            var min = 1
+            var max = pline_len
+            while min < max
+                var col = (min + max) / 2
+                if synIDattr(synID(plnum, col, 1), "name") =~ "\\(Comment\\|Todo\\)$"
+                    max = col
+                else
+                    min = col + 1
+                endif
+            endwhile
+            pline = strpart(pline, 0, min - 1)
+        endif
+    else
+        var col = 0
+        while col < pline_len
+            if pline[col] == '#'
+                pline = strpart(pline, 0, col)
+                break
+            endif
+            col = col + 1
+        endwhile
+    endif
+
+
+    # When "inside" parenthesis: If at the first line below the parenthesis add
+    # one 'shiftwidth' ("inside" is simplified and not really checked)
+    # my_var = (
+    #     a
+    #     + b
+    #     + c
+    # )
+    if pline =~ '[({\[]\s*$'
+        return indent(plnum) + shiftwidth()
+    endif
+
+
+    # If the previous line ended with a colon, indent this line
+    if pline =~ ':\s*$'
+        return plindent + shiftwidth()
+    endif
+
+    # If the previous line was a stop-execution statement...
+    if getline(plnum) =~ '^\s*\(break\|continue\|raise\|return\|pass\)\>'
+        # See if the user has already dedented
+        if indent(v:lnum) > indent(plnum) - shiftwidth()
+            # If not, recommend one dedent
+            return indent(plnum) - shiftwidth()
+        endif
+        # Otherwise, trust the user
+        return -1
+    endif
+
+    # If the current line begins with a keyword that lines up with "try"
+    if getline(v:lnum) =~ '^\s*\(except\|finally\)\>'
+        var lnum = v:lnum - 1
+        while lnum >= 1
+            if getline(lnum) =~ '^\s*\(try\|except\)\>'
+                var ind = indent(lnum)
+                if ind >= indent(v:lnum)
+                    return -1   # indent is already less than this
+                endif
+                return ind      # line up with previous try or except
+            endif
+            lnum = lnum - 1
+        endwhile
+        return -1               # no matching "try"!
+    endif
+
+
+    # If the current line begins with a header keyword, dedent
+    if getline(v:lnum) =~ '^\s*\(elif\|else\)\>'
+
+        # Unless the previous line was a one-liner
+        if getline(plnumstart) =~ '^\s*\(for\|if\|try\)\>'
+            return plindent
+        endif
+
+        # Or the user has already dedented
+        if indent(v:lnum) <= plindent - shiftwidth()
+            return -1
+        endif
+
+        return plindent - shiftwidth()
+    endif
+
+    return -1
+enddef

runtime/indent/mf.vim

@@ -1,6 +1,6 @@
 " METAFONT indent file
 " Language:    METAFONT
 " Maintainer:  Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Last Change: 2016 Oct 1
+" Latest Revision:    2022 Aug 12
 
 runtime! indent/mp.vim

runtime/indent/mp.vim

@@ -1,360 +1,320 @@
-" MetaPost indent file
-" Language:           MetaPost
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Eugene Minkovskii <emin@mccme.ru>
-" Last Change:        2016 Oct 2, 4:13pm
-" Version: 0.2
+vim9script
+
+# MetaPost indent file
+# Language:           MetaPost
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Eugene Minkovskii <emin@mccme.ru>
+# Latest Revision:    2022 Aug 12
 
 if exists("b:did_indent")
   finish
 endif
-let b:did_indent = 1
 
-setlocal indentexpr=GetMetaPostIndent()
+b:did_indent = 1
+
+setlocal indentexpr=g:MetaPostIndent()
 setlocal indentkeys+==end,=else,=fi,=fill,0),0]
+setlocal nolisp
+setlocal nosmartindent
 
-let b:undo_indent = "setl indentkeys< indentexpr<"
+b:undo_indent = "setl indentexpr< indentkeys< lisp< smartindent<"
 
-" Only define the function once.
-if exists("*GetMetaPostIndent")
-  finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
+# Regexps {{{
+# Expressions starting indented blocks
+const MP_OPEN_TAG = [
+  '\<if\>',
+  '\<else\%[if]\>',
+  '\<for\%(\|ever\|suffixes\)\>',
+  '\<begingroup\>',
+  '\<\%(\|var\|primary\|secondary\|tertiary\)def\>',
+  '^\s*\<begin\%(fig\|graph\|glyph\|char\|logochar\)\>',
+  '[([{]',
+  ]->extend(get(g:, "mp_open_tag", []))->join('\|')
 
-function GetMetaPostIndent()
-  let ignorecase_save = &ignorecase
-  try
-    let &ignorecase = 0
-    return GetMetaPostIndentIntern()
-  finally
-    let &ignorecase = ignorecase_save
-  endtry
-endfunc
+# Expressions ending indented blocks
+const MP_CLOSE_TAG = [
+  '\<fi\>',
+  '\<else\%[if]\>',
+  '\<end\%(\|for\|group\|def\|fig\|char\|glyph\|graph\)\>',
+  '[)\]}]'
+  ]->extend(get(g:, "mp_close_tag", []))->join('\|')
 
-" Regexps {{{
-" Note: the next three variables are made global so that a user may add
-" further keywords.
-"
-" Example:
-"
-"    Put these in ~/.vim/after/indent/mp.vim
-"
-"    let g:mp_open_tag .= '\|\<begintest\>'
-"    let g:mp_close_tag .= '\|\<endtest\>'
+# Statements that may span multiple lines and are ended by a semicolon. To
+# keep this list short, statements that are unlikely to be very long or are
+# not very common (e.g., keywords like `interim` or `showtoken`) are not
+# included.
+#
+# The regex for assignments and equations (the last branch) is tricky, because
+# it must not match things like `for i :=`, `if a=b`, `def...=`, etc... It is
+# not perfect, but it works reasonably well.
+const MP_STATEMENT = [
+  '\<\%(\|un\|cut\)draw\%(dot\)\=\>',
+  '\<\%(\|un\)fill\%[draw]\>',
+  '\<draw\%(dbl\)\=arrow\>',
+  '\<clip\>',
+  '\<addto\>',
+  '\<save\>',
+  '\<setbounds\>',
+  '\<message\>',
+  '\<errmessage\>',
+  '\<errhelp\>',
+  '\<fontmapline\>',
+  '\<pickup\>',
+  '\<show\>',
+  '\<special\>',
+  '\<write\>',
+  '\%(^\|;\)\%([^;=]*\%(' .. MP_OPEN_TAG .. '\)\)\@!.\{-}:\==',
+  ]->join('\|')
 
-" Expressions starting indented blocks
-let g:mp_open_tag = ''
-      \ . '\<if\>'
-      \ . '\|\<else\%[if]\>'
-      \ . '\|\<for\%(\|ever\|suffixes\)\>'
-      \ . '\|\<begingroup\>'
-      \ . '\|\<\%(\|var\|primary\|secondary\|tertiary\)def\>'
-      \ . '\|^\s*\<begin\%(fig\|graph\|glyph\|char\|logochar\)\>'
-      \ . '\|[([{]'
+# A line ends with zero or more spaces, possibly followed by a comment.
+const EOL = '\s*\%($\|%\)'
+# }}}
 
-" Expressions ending indented blocks
-let g:mp_close_tag = ''
-      \ . '\<fi\>'
-      \ . '\|\<else\%[if]\>'
-      \ . '\|\<end\%(\|for\|group\|def\|fig\|char\|glyph\|graph\)\>'
-      \ . '\|[)\]}]'
+# Auxiliary functions {{{
+# Returns true if (0-based) position immediately preceding `pos` in `line` is
+# inside a string or a comment; returns false otherwise.
 
-" Statements that may span multiple lines and are ended by a semicolon. To
-" keep this list short, statements that are unlikely to be very long or are
-" not very common (e.g., keywords like `interim` or `showtoken`) are not
-" included.
-"
-" The regex for assignments and equations (the last branch) is tricky, because
-" it must not match things like `for i :=`, `if a=b`, `def...=`, etc... It is
-" not perfect, but it works reasonably well.
-let g:mp_statement = ''
-      \ . '\<\%(\|un\|cut\)draw\>'
-      \ . '\|\<\%(\|un\)fill\%[draw]\>'
-      \ . '\|\<draw\%(dbl\)\=arrow\>'
-      \ . '\|\<clip\>'
-      \ . '\|\<addto\>'
-      \ . '\|\<save\>'
-      \ . '\|\<setbounds\>'
-      \ . '\|\<message\>'
-      \ . '\|\<errmessage\>'
-      \ . '\|\<errhelp\>'
-      \ . '\|\<fontmapline\>'
-      \ . '\|\<pickup\>'
-      \ . '\|\<show\>'
-      \ . '\|\<special\>'
-      \ . '\|\<write\>'
-      \ . '\|\%(^\|;\)\%([^;=]*\%('.g:mp_open_tag.'\)\)\@!.\{-}:\=='
+# This is the function that is called more often when indenting, so it is
+# critical that it is efficient. The method we use is significantly faster
+# than using syntax attributes, and more general (it does not require
+# syntax_items). It is also faster than using a single regex matching an even
+# number of quotes. It helps that MetaPost strings cannot span more than one
+# line and cannot contain escaped quotes.
+def IsCommentOrString(line: string, pos: number): bool
+  var in_string = 0
+  var q = stridx(line, '"')
+  var c = stridx(line, '%')
 
-" A line ends with zero or more spaces, possibly followed by a comment.
-let s:eol = '\s*\%($\|%\)'
-" }}}
-
-" Auxiliary functions {{{
-" Returns 1 if (0-based) position immediately preceding `pos` in `line` is
-" inside a string or a comment; returns 0 otherwise.
-
-" This is the function that is called more often when indenting, so it is
-" critical that it is efficient. The method we use is significantly faster
-" than using syntax attributes, and more general (it does not require
-" syntax_items). It is also faster than using a single regex matching an even
-" number of quotes. It helps that MetaPost strings cannot span more than one
-" line and cannot contain escaped quotes.
-function! s:CommentOrString(line, pos)
-  let in_string = 0
-  let q = stridx(a:line, '"')
-  let c = stridx(a:line, '%')
-  while q >= 0 && q < a:pos
+  while q >= 0 && q < pos
     if c >= 0 && c < q
-      if in_string " Find next percent symbol
-        let c = stridx(a:line, '%', q + 1)
-      else " Inside comment
-        return 1
+      if in_string # Find next percent symbol
+        c = stridx(line, '%', q + 1)
+      else # Inside comment
+        return true
       endif
     endif
-    let in_string = 1 - in_string
-    let q = stridx(a:line, '"', q + 1) " Find next quote
+    in_string = 1 - in_string
+    q = stridx(line, '"', q + 1) # Find next quote
   endwhile
-  return in_string || (c >= 0 && c <= a:pos)
-endfunction
 
-" Find the first non-comment non-blank line before the current line.
-function! s:PrevNonBlankNonComment(lnum)
-  let l:lnum = prevnonblank(a:lnum - 1)
-  while getline(l:lnum) =~# '^\s*%'
-    let l:lnum = prevnonblank(l:lnum - 1)
+  return in_string || (c >= 0 && c <= pos)
+enddef
+
+# Find the first non-comment non-blank line before the given line.
+def PrevNonBlankNonComment(lnum: number): number
+  var nr = prevnonblank(lnum - 1)
+  while getline(nr) =~# '^\s*%'
+    nr = prevnonblank(nr - 1)
   endwhile
-  return l:lnum
-endfunction
+  return nr
+enddef
 
-" Returns true if the last tag appearing in the line is an open tag; returns
-" false otherwise.
-function! s:LastTagIsOpen(line)
-  let o = s:LastValidMatchEnd(a:line, g:mp_open_tag, 0)
-  if o == - 1 | return v:false | endif
-  return s:LastValidMatchEnd(a:line, g:mp_close_tag, o) < 0
-endfunction
+# Returns true if the last tag appearing in the line is an open tag; returns
+# false otherwise.
+def LastTagIsOpen(line: string): bool
+  var o = LastValidMatchEnd(line, MP_OPEN_TAG, 0)
+  if o == - 1
+    return false
+  endif
+  return LastValidMatchEnd(line, MP_CLOSE_TAG, o) < 0
+enddef
 
-" A simple, efficient and quite effective heuristics is used to test whether
-" a line should cause the next line to be indented: count the "opening tags"
-" (if, for, def, ...) in the line, count the "closing tags" (endif, endfor,
-" ...) in the line, and compute the difference. We call the result the
-" "weight" of the line. If the weight is positive, then the next line should
-" most likely be indented. Note that `else` and `elseif` are both opening and
-" closing tags, so they "cancel out" in almost all cases, the only exception
-" being a leading `else[if]`, which is counted as an opening tag, but not as
-" a closing tag (so that, for instance, a line containing a single `else:`
-" will have weight equal to one, not zero). We do not treat a trailing
-" `else[if]` in any special way, because lines ending with an open tag are
-" dealt with separately before this function is called (see
-" GetMetaPostIndentIntern()).
-"
-" Example:
-"
-"     forsuffixes $=a,b: if x.$ = y.$ : draw else: fill fi
-"       % This line will be indented because |{forsuffixes,if,else}| > |{else,fi}| (3 > 2)
-"     endfor
-
-function! s:Weight(line)
-  let [o, i] = [0, s:ValidMatchEnd(a:line, g:mp_open_tag, 0)]
+# A simple, efficient and quite effective heuristics is used to test whether
+# a line should cause the next line to be indented: count the "opening tags"
+# (if, for, def, ...) in the line, count the "closing tags" (endif, endfor,
+# ...) in the line, and compute the difference. We call the result the
+# "weight" of the line. If the weight is positive, then the next line should
+# most likely be indented. Note that `else` and `elseif` are both opening and
+# closing tags, so they "cancel out" in almost all cases, the only exception
+# being a leading `else[if]`, which is counted as an opening tag, but not as
+# a closing tag (so that, for instance, a line containing a single `else:`
+# will have weight equal to one, not zero). We do not treat a trailing
+# `else[if]` in any special way, because lines ending with an open tag are
+# dealt with separately before this function is called (see MetaPostIndent()).
+#
+# Example:
+#
+#     forsuffixes $=a,b: if x.$ = y.$ : draw else: fill fi
+#       % This line will be indented because |{forsuffixes,if,else}| > |{else,fi}| (3 > 2)
+#     endfor
+def Weight(line: string): number
+  var o = 0
+  var i = ValidMatchEnd(line, MP_OPEN_TAG, 0)
   while i > 0
-    let o += 1
-    let i = s:ValidMatchEnd(a:line, g:mp_open_tag, i)
+    o += 1
+    i = ValidMatchEnd(line, MP_OPEN_TAG, i)
   endwhile
-  let [c, i] = [0, matchend(a:line, '^\s*\<else\%[if]\>')] " Skip a leading else[if]
-  let i = s:ValidMatchEnd(a:line, g:mp_close_tag, i)
+  var c = 0
+  i = matchend(line, '^\s*\<else\%[if]\>')  # Skip a leading else[if]
+  i = ValidMatchEnd(line, MP_CLOSE_TAG, i)
   while i > 0
-    let c += 1
-    let i = s:ValidMatchEnd(a:line, g:mp_close_tag, i)
+    c += 1
+    i = ValidMatchEnd(line, MP_CLOSE_TAG, i)
   endwhile
   return o - c
-endfunction
+enddef
 
-" Similar to matchend(), but skips strings and comments.
-" line: a String
-function! s:ValidMatchEnd(line, pat, start)
-  let i = matchend(a:line, a:pat, a:start)
-  while i > 0 && s:CommentOrString(a:line, i)
-    let i = matchend(a:line, a:pat, i)
+# Similar to matchend(), but skips strings and comments.
+# line: a String
+def ValidMatchEnd(line: string, pat: string, start: number): number
+  var i = matchend(line, pat, start)
+  while i > 0 && IsCommentOrString(line, i)
+    i = matchend(line, pat, i)
   endwhile
   return i
-endfunction
+enddef
 
-" Like s:ValidMatchEnd(), but returns the end position of the last (i.e.,
-" rightmost) match.
-function! s:LastValidMatchEnd(line, pat, start)
-  let last_found = -1
-  let i = matchend(a:line, a:pat, a:start)
+# Like s:ValidMatchEnd(), but returns the end position of the last (i.e.,
+# rightmost) match.
+def LastValidMatchEnd(line: string, pat: string, start: number): number
+  var last_found = -1
+  var i = matchend(line, pat, start)
   while i > 0
-    if !s:CommentOrString(a:line, i)
-      let last_found = i
+    if !IsCommentOrString(line, i)
+      last_found = i
     endif
-    let i = matchend(a:line, a:pat, i)
+    i = matchend(line, pat, i)
   endwhile
   return last_found
-endfunction
+enddef
 
-function! s:DecreaseIndentOnClosingTag(curr_indent)
-  let cur_text = getline(v:lnum)
-  if cur_text =~# '^\s*\%('.g:mp_close_tag.'\)'
-    return max([a:curr_indent - shiftwidth(), 0])
+def DecreaseIndentOnClosingTag(curr_indent: number): number
+  var cur_text = getline(v:lnum)
+  if cur_text =~# '^\s*\%(' .. MP_CLOSE_TAG .. '\)'
+    return max([curr_indent - shiftwidth(), 0])
   endif
-  return a:curr_indent
-endfunction
-" }}}
+  return curr_indent
+enddef
+# }}}
 
-" Main function {{{
-"
-" Note: Every rule of indentation in MetaPost is very subjective. We might get
-" creative, but things get murky very soon (there are too many corner cases).
-" So, we provide a means for the user to decide what to do when this script
-" doesn't get it. We use a simple idea: use '%>', '%<' and '%=' to explicitly
-" control indentation. The '<' and '>' symbols may be repeated many times
-" (e.g., '%>>' will cause the next line to be indented twice).
-"
-" By using '%>...', '%<...' and '%=', the indentation the user wants is
-" preserved by commands like gg=G, even if it does not follow the rules of
-" this script.
-"
-" Example:
-"
-"    def foo =
-"        makepen(
-"            subpath(T-n,t) of r  %>
-"                shifted .5down   %>
-"                    --subpath(t,T) of r shifted .5up -- cycle   %<<<
-"        )
-"        withcolor black
-"    enddef
-"
-" The default indentation of the previous example would be:
-"
-"    def foo =
-"        makepen(
-"            subpath(T-n,t) of r
-"            shifted .5down
-"            --subpath(t,T) of r shifted .5up -- cycle
-"        )
-"        withcolor black
-"    enddef
-"
-" Personally, I prefer the latter, but anyway...
-function! GetMetaPostIndentIntern()
-  " Do not touch indentation inside verbatimtex/btex.. etex blocks.
+# Main function {{{
+def g:MetaPostIndent(): number
+  # Do not touch indentation inside verbatimtex/btex.. etex blocks.
   if synIDattr(synID(v:lnum, 1, 1), "name") =~# '^mpTeXinsert$\|^tex\|^Delimiter'
     return -1
   endif
 
-  " This is the reference line relative to which the current line is indented
-  " (but see below).
-  let lnum = s:PrevNonBlankNonComment(v:lnum)
+  # At the start of a MetaPost block inside ConTeXt, do not touch indentation
+  if synIDattr(synID(prevnonblank(v:lnum - 1), 1, 1), "name") == "contextBlockDelim"
+    return -1
+  endif
 
-  " At the start of the file use zero indent.
+  var lnum = PrevNonBlankNonComment(v:lnum)
+
+  # At the start of the file use zero indent.
   if lnum == 0
     return 0
   endif
 
-  let prev_text = getline(lnum)
+  var prev_text = getline(lnum)
 
-  " User-defined overrides take precedence over anything else.
-  " See above for an example.
-  let j = match(prev_text, '%[<>=]')
+  # Every rule of indentation in MetaPost is very subjective. We might get
+  # creative, but things get murky very soon (there are too many corner
+  # cases). So, we provide a means for the user to decide what to do when this
+  # script doesn't get it. We use a simple idea: use '%>', '%<', '%=', and
+  # '%!', to explicitly control indentation. The '<' and '>' symbols may be
+  # repeated many times (e.g., '%>>' will cause the next line to be indented
+  # twice).
+  #
+  # User-defined overrides take precedence over anything else.
+  var j = match(prev_text, '%[<>=!]')
   if j > 0
-    let i = strlen(matchstr(prev_text, '%>\+', j)) - 1
+    var i = strlen(matchstr(prev_text, '%>\+', j)) - 1
     if i > 0
       return indent(lnum) + i * shiftwidth()
     endif
 
-    let i = strlen(matchstr(prev_text, '%<\+', j)) - 1
+    i = strlen(matchstr(prev_text, '%<\+', j)) - 1
     if i > 0
       return max([indent(lnum) - i * shiftwidth(), 0])
     endif
 
-    if match(prev_text, '%=', j)
+    if match(prev_text, '%=', j) > -1
       return indent(lnum)
     endif
-  endif
 
-  " If the reference line ends with an open tag, indent.
-  "
-  " Example:
-  "
-  " if c:
-  "     0
-  " else:
-  "     1
-  " fi if c2: % Note that this line has weight equal to zero.
-  "     ...   % This line will be indented
-  if s:LastTagIsOpen(prev_text)
-    return s:DecreaseIndentOnClosingTag(indent(lnum) + shiftwidth())
-  endif
-
-  " Lines with a positive weight are unbalanced and should likely be indented.
-  "
-  " Example:
-  "
-  " def f = enddef for i = 1 upto 5: if x[i] > 0: 1 else: 2 fi
-  "     ... % This line will be indented (because of the unterminated `for`)
-  if s:Weight(prev_text) > 0
-    return s:DecreaseIndentOnClosingTag(indent(lnum) + shiftwidth())
-  endif
-
-  " Unterminated statements cause indentation to kick in.
-  "
-  " Example:
-  "
-  " draw unitsquare
-  "     withcolor black; % This line is indented because of `draw`.
-  " x := a + b + c
-  "     + d + e;         % This line is indented because of `:=`.
-  "
-  let i = s:LastValidMatchEnd(prev_text, g:mp_statement, 0)
-  if i >= 0 " Does the line contain a statement?
-    if s:ValidMatchEnd(prev_text, ';', i) < 0 " Is the statement unterminated?
-      return indent(lnum) + shiftwidth()
-    else
-      return s:DecreaseIndentOnClosingTag(indent(lnum))
+    if match(prev_text, '%!', j) > -1
+      return -1
     endif
   endif
 
-  " Deal with the special case of a statement spanning multiple lines. If the
-  " current reference line L ends with a semicolon, search backwards for
-  " another semicolon or a statement keyword. If the latter is found first,
-  " its line is used as the reference line for indenting the current line
-  " instead of L.
-  "
-  "  Example:
-  "
-  "  if cond:
-  "    draw if a: z0 else: z1 fi
-  "        shifted S
-  "        scaled T;      % L
-  "
-  "    for i = 1 upto 3:  % <-- Current line: this gets the same indent as `draw ...`
-  "
-  " NOTE: we get here only if L does not contain a statement (among those
-  " listed in g:mp_statement).
-  if s:ValidMatchEnd(prev_text, ';'.s:eol, 0) >= 0 " L ends with a semicolon
-    let stm_lnum = s:PrevNonBlankNonComment(lnum)
+  # If the reference line ends with an open tag, indent.
+  #
+  # Example:
+  #
+  # if c:
+  #     0
+  # else:
+  #     1
+  # fi if c2: % Note that this line has weight equal to zero.
+  #     ...   % This line will be indented
+  if LastTagIsOpen(prev_text)
+    return DecreaseIndentOnClosingTag(indent(lnum) + shiftwidth())
+  endif
+
+  # Lines with a positive weight are unbalanced and should likely be indented.
+  #
+  # Example:
+  #
+  # def f = enddef for i = 1 upto 5: if x[i] > 0: 1 else: 2 fi
+  #     ... % This line will be indented (because of the unterminated `for`)
+  if Weight(prev_text) > 0
+    return DecreaseIndentOnClosingTag(indent(lnum) + shiftwidth())
+  endif
+
+  # Unterminated statements cause indentation to kick in.
+  #
+  # Example:
+  #
+  # draw unitsquare
+  #     withcolor black; % This line is indented because of `draw`.
+  # x := a + b + c
+  #     + d + e;         % This line is indented because of `:=`.
+  #
+  var i = LastValidMatchEnd(prev_text, MP_STATEMENT, 0)
+  if i >= 0 # Does the line contain a statement?
+    if ValidMatchEnd(prev_text, ';', i) < 0 # Is the statement unterminated?
+      return indent(lnum) + shiftwidth()
+    else
+      return DecreaseIndentOnClosingTag(indent(lnum))
+    endif
+  endif
+
+  # Deal with the special case of a statement spanning multiple lines. If the
+  # current reference line L ends with a semicolon, search backwards for
+  # another semicolon or a statement keyword. If the latter is found first,
+  # its line is used as the reference line for indenting the current line
+  # instead of L.
+  #
+  #  Example:
+  #
+  #  if cond:
+  #    draw if a: z0 else: z1 fi
+  #        shifted S
+  #        scaled T;      % L
+  #
+  #    for i = 1 upto 3:  % <-- Current line: this gets the same indent as `draw ...`
+  #
+  # NOTE: we get here only if L does not contain a statement (among those
+  # listed in g:MP_STATEMENT).
+  if ValidMatchEnd(prev_text, ';' .. EOL, 0) >= 0 # L ends with a semicolon
+    var stm_lnum = PrevNonBlankNonComment(lnum)
     while stm_lnum > 0
-      let prev_text = getline(stm_lnum)
-      let sc_pos = s:LastValidMatchEnd(prev_text, ';', 0)
-      let stm_pos = s:ValidMatchEnd(prev_text, g:mp_statement, sc_pos)
+      prev_text = getline(stm_lnum)
+      var sc_pos = LastValidMatchEnd(prev_text, ';', 0)
+      var stm_pos = ValidMatchEnd(prev_text, MP_STATEMENT, sc_pos)
       if stm_pos > sc_pos
-        let lnum = stm_lnum
+        lnum = stm_lnum
         break
       elseif sc_pos > stm_pos
         break
       endif
-      let stm_lnum = s:PrevNonBlankNonComment(stm_lnum)
+      stm_lnum = PrevNonBlankNonComment(stm_lnum)
     endwhile
   endif
 
-  return s:DecreaseIndentOnClosingTag(indent(lnum))
-endfunction
-" }}}
+  return DecreaseIndentOnClosingTag(indent(lnum))
+enddef
+# }}}
 
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim:sw=2:fdm=marker
+# vim: sw=2 fdm=marker

runtime/indent/racket.vim

@@ -0,0 +1,60 @@
+" Vim indent file
+" Language:             Racket
+" Maintainer:           D. Ben Knoble <ben.knoble+github@gmail.com>
+" Previous Maintainer:  Will Langstroth <will@langstroth.com>
+" URL:                  https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+if exists("b:did_indent")
+   finish
+endif
+let b:did_indent = 1
+
+setlocal lisp autoindent nosmartindent
+
+setlocal lispwords+=module,module*,module+,parameterize,let-values,let*-values,letrec-values,local
+setlocal lispwords+=define/contract
+setlocal lispwords+=λ
+setlocal lispwords+=with-handlers
+setlocal lispwords+=define-values,opt-lambda,case-lambda,syntax-rules,with-syntax,syntax-case,syntax-parse
+setlocal lispwords+=define-for-syntax,define-syntax-parser,define-syntax-parse-rule,define-syntax-class,define-splicing-syntax-class
+setlocal lispwords+=define-signature,unit,unit/sig,compund-unit/sig,define-values/invoke-unit/sig
+setlocal lispwords+=define-opt/c,define-syntax-rule
+setlocal lispwords+=define-test-suite
+setlocal lispwords+=struct
+setlocal lispwords+=with-input-from-file,with-output-to-file
+
+" Racket OOP
+" TODO missing a lot of define-like forms here (e.g., define/augment, etc.)
+setlocal lispwords+=class,class*,mixin,interface,class/derived
+setlocal lispwords+=define/public,define/pubment,define/public-final
+setlocal lispwords+=define/override,define/overment,define/override-final
+setlocal lispwords+=define/augment,define/augride,define/augment-final
+setlocal lispwords+=define/private
+
+" kanren
+setlocal lispwords+=fresh,run,run*,project,conde,condu
+
+" loops
+setlocal lispwords+=for,for/list,for/fold,for*,for*/list,for*/fold,for/or,for/and,for*/or,for*/and
+setlocal lispwords+=for/hash,for/hasheq,for/hasheqv,for/sum,for/flvector,for*/flvector,for/vector,for*/vector,for*/sum,for*/hash,for*/hasheq,for*/hasheqv
+setlocal lispwords+=for/async
+setlocal lispwords+=for/set,for*/set
+setlocal lispwords+=for/first,for*/first
+
+setlocal lispwords+=match,match*,match/values,define/match,match-lambda,match-lambda*,match-lambda**
+setlocal lispwords+=match-let,match-let*,match-let-values,match-let*-values
+setlocal lispwords+=match-letrec,match-define,match-define-values
+
+setlocal lispwords+=let/cc,let/ec
+
+" qi
+setlocal lispwords+=define-flow,define-switch,flow-lambda,switch-lambda,on,switch,π,λ01
+setlocal lispwords+=define-qi-syntax,define-qi-syntax-parser,define-qi-syntax-rule
+
+" gui-easy
+setlocal lispwords+=if-view,case-view,cond-view,list-view,dyn-view
+setlocal lispwords+=case/dep
+setlocal lispwords+=define/obs
+
+let b:undo_indent = "setlocal lisp< ai< si< lw<"

runtime/indent/testdir/html.in

@@ -1,7 +1,7 @@
-" vim: set ft=html sw=4 ts=8 :
+% vim: set ft=html sw=4 ts=8 :
 
 
-" START_INDENT
+% START_INDENT
 <html>
     <body>
 <style>
@@ -50,7 +50,7 @@ text
     </body>
 </html>
 
-" END_INDENT
+% END_INDENT
 
 % START_INDENT
 % INDENT_EXE let g:html_indent_style1 = "inc"

runtime/indent/testdir/html.ok

@@ -1,7 +1,7 @@
-" vim: set ft=html sw=4 ts=8 :
+% vim: set ft=html sw=4 ts=8 :
 
 
-" START_INDENT
+% START_INDENT
 <html>
     <body>
 	<style>
@@ -50,7 +50,7 @@ div#d2 { color: green; }
     </body>
 </html>
 
-" END_INDENT
+% END_INDENT
 
 % START_INDENT
 % INDENT_EXE let g:html_indent_style1 = "inc"

runtime/indent/testdir/python.in

@@ -1,6 +1,32 @@
-" vim: set ft=python sw=4 et:
+# vim: set ft=python sw=4 et:
 
-" START_INDENT
+# START_INDENT
+dict = {
+'a': 1,
+'b': 2,
+'c': 3,
+}
+# END_INDENT
+
+# START_INDENT
+# INDENT_EXE let [g:python_indent.open_paren, g:python_indent.closed_paren_align_last_line] = ['shiftwidth()', v:false]
+dict = {
+'a': 1,
+'b': 2,
+'c': 3,
+}
+# END_INDENT
+
+# START_INDENT
+# INDENT_EXE let g:python_indent.open_paren = 'shiftwidth() * 2'
+# INDENT_EXE syntax match pythonFoldMarkers /{{{\d*/ contained containedin=pythonComment
+# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx {{{1
+
+if True:
+pass
+# END_INDENT
+
+# START_INDENT
 open_paren_not_at_EOL(100,
 (200,
 300),
@@ -65,4 +91,4 @@ open_paren_not_at_EOL(100,
 open_paren_at_EOL(
 100, 200, 300, 400)
 
-" END_INDENT
+# END_INDENT

runtime/indent/testdir/python.ok

@@ -1,6 +1,32 @@
-" vim: set ft=python sw=4 et:
+# vim: set ft=python sw=4 et:
 
-" START_INDENT
+# START_INDENT
+dict = {
+        'a': 1,
+        'b': 2,
+        'c': 3,
+        }
+# END_INDENT
+
+# START_INDENT
+# INDENT_EXE let [g:python_indent.open_paren, g:python_indent.closed_paren_align_last_line] = ['shiftwidth()', v:false]
+dict = {
+    'a': 1,
+    'b': 2,
+    'c': 3,
+}
+# END_INDENT
+
+# START_INDENT
+# INDENT_EXE let g:python_indent.open_paren = 'shiftwidth() * 2'
+# INDENT_EXE syntax match pythonFoldMarkers /{{{\d*/ contained containedin=pythonComment
+# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx {{{1
+
+if True:
+    pass
+# END_INDENT
+
+# START_INDENT
 open_paren_not_at_EOL(100,
                       (200,
                        300),
@@ -65,4 +91,4 @@ open_paren_not_at_EOL(100,
 open_paren_at_EOL(
         100, 200, 300, 400)
 
-" END_INDENT
+# END_INDENT

runtime/plugin/matchparen.vim

@@ -5,8 +5,7 @@
 " Exit quickly when:
 " - this plugin was already loaded (or disabled)
 " - when 'compatible' is set
-" - the "CursorMoved" autocmd event is not available.
-if exists("g:loaded_matchparen") || &cp || !exists("##CursorMoved")
+if exists("g:loaded_matchparen") || &cp
   finish
 endif
 let g:loaded_matchparen = 1
@@ -20,7 +19,7 @@ endif
 
 augroup matchparen
   " Replace all matchparen autocommands
-  autocmd! CursorMoved,CursorMovedI,WinEnter * call s:Highlight_Matching_Pair()
+  autocmd! CursorMoved,CursorMovedI,WinEnter,WinScrolled * call s:Highlight_Matching_Pair()
   autocmd! WinLeave * call s:Remove_Matches()
   if exists('##TextChanged')
     autocmd! TextChanged,TextChangedI * call s:Highlight_Matching_Pair()

runtime/syntax/README.txt

@@ -13,6 +13,9 @@ synload.vim	Contains autocommands to load a language file when a certain
 nosyntax.vim	Used for the ":syntax off" command.  Undo the loading of
 		synload.vim.
 
+The "shared" directory contains generated files and what is used by more than
+one syntax.
+
 
 A few special files:
 

runtime/syntax/context.vim

@@ -1,141 +1,144 @@
-" Vim syntax file
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2016 Oct 16
+vim9script
+
+# Vim syntax file
+# Language:           ConTeXt typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision:    2022 Aug 12
 
 if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/plaintex.vim
-unlet b:current_syntax
+# Dictionary of (filetype, group) pairs to highlight between \startGROUP \stopGROUP.
+var context_include = get(b:, 'context_include', get(g:, 'context_include', {'xml': 'XML'}))
 
-let s:cpo_save = &cpo
-set cpo&vim
-
-" Dictionary of (filetype, group) pairs to highlight between \startGROUP \stopGROUP.
-let s:context_include = get(b:, 'context_include', get(g:, 'context_include', {'xml': 'XML'}))
-
-" For backward compatibility (g:context_include used to be a List)
-if type(s:context_include) ==# type([])
-  let g:context_metapost = (index(s:context_include, 'mp') != -1)
-  let s:context_include = filter(
-        \ {'c': 'C', 'javascript': 'JS', 'ruby': 'Ruby', 'xml': 'XML'},
-        \ { k,_ -> index(s:context_include, k) != -1 }
-        \ )
+# Deprecation warning
+if type(context_include) ==# type([])
+  echomsg "[ConTeXt] b:context_include/g:context_include must be Dictionaries."
+  context_include = {'xml': 'XML'}
 endif
 
-syn iskeyword @,48-57,a-z,A-Z,192-255
+syn iskeyword @,48-57,_,!,?,a-z,A-Z,192-255
 
-syn spell   toplevel
+syn spell toplevel
 
-" ConTeXt options, i.e., [...] blocks
-syn region  contextOptions    matchgroup=contextDelimiter start='\['  end=']\|\ze\\stop' skip='\\\[\|\\\]' contains=ALLBUT,contextBeginEndLua,@Spell
+runtime! syntax/shared/context-data-context.vim
+runtime! syntax/shared/context-data-interfaces.vim
+runtime! syntax/shared/context-data-tex.vim
 
-" Highlight braces
+syn match contextCommand '\\\k\+\>' display contains=@NoSpell
+
+# ConTeXt options, i.e., [...] blocks
+syn region  contextOptions    matchgroup=contextDelimiter start='\[' end=']\|\ze\\stop' skip='\\\[\|\\\]' contains=TOP,@Spell
+
+# Highlight braces
 syn match   contextDelimiter  '[{}]'
 
-" Comments
-syn match   contextComment '\\\@<!\%(\\\\\)*\zs%.*$' display contains=initexTodo
-syn match   contextComment '^\s*%[CDM].*$'           display contains=initexTodo
+# Comments
+syn match   contextComment    '\%(\_^\|[^\\]\)\%(\\\\\)*\zs%.*$' display contains=contextTodo,contextMagicLine
+syn match   contextComment    '^\s*%[CDM].*$'                    display contains=contextTodo,contextMagicLine
+syn keyword contextTodo       TODO FIXME XXX NOTE                contained
+syn match   contextMagicLine  '^\s*%\s*!TEX.*$'                  contained
 
-syn match   contextBlockDelim '\\\%(start\|stop\)\a\+' contains=@NoSpell
+syn match   contextBlockDelim '\\\%(start\|stop\)\k\+' contains=@NoSpell
 
 syn region  contextEscaped    matchgroup=contextPreProc start='\\type\%(\s*\|\n\)*\z([^A-Za-z%]\)' end='\z1'
 syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s\|\n\)*{' end='}'
 syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s*\|\n\)*<<' end='>>'
 syn region  contextEscaped    matchgroup=contextPreProc
                               \ start='\\start\z(\a*\%(typing\|typen\)\)'
-                              \ end='\\stop\z1' contains=plaintexComment keepend
+                              \ end='\\stop\z1' contains=contextComment keepend
 syn region  contextEscaped    matchgroup=contextPreProc start='\\\h\+Type\%(\s\|\n\)*{' end='}'
 syn region  contextEscaped    matchgroup=contextPreProc start='\\Typed\h\+\%(\s\|\n\)*{' end='}'
 
-syn match   contextBuiltin    display contains=@NoSpell
-      \ '\\\%(unprotect\|protect\|unexpanded\)\>'
+syn match   contextBuiltin    '\\unexpanded\>' display contains=@NoSpell
 
-syn match   contextPreProc    '^\s*\\\%(start\|stop\)\=\%(component\|environment\|project\|product\)\>'
-                              \ contains=@NoSpell
+# \unprotect... \protect regions
+syn region  contextUnprotect  matchgroup=contextBuiltin start='\\unprotect' end='\\protect' contains=TOP
+syn match   contextSequence   '\\[a-zA-Z]*[@_!?]\+[a-zA-Z@_!?]*' contains=@NoSpell contained containedin=contextUnprotect
 
-if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
-  let b:mp_metafun_macros = 1 " Highlight MetaFun keywords
-  syn include @mpTop          syntax/mp.vim
+# Math
+syn match  contextMathCmd '\\m\%(ath\%(ematics\)\=\)\=\>'
+syn region contextInlineMath matchgroup=contextMathDelim start='\$' skip='\\\\\|\\\$' end='\$'
+syn region contextDisplayMath matchgroup=contextMathDelim start='\$\$' skip='\\\\\|\\\$' end='\$\$' keepend
+syn region contextDisplayMath matchgroup=contextBlockDelim start='\\startformula' end='\\stopformula' contains=TOP
+
+# MetaFun
+b:mp_metafun = 1
+syn include @mpTop syntax/mp.vim
+unlet b:current_syntax
+
+syn region  contextMPGraphic  matchgroup=contextBlockDelim
+      \ start='\\start\z(MP\%(clip\|code\|definitions\|drawing\|environment\|extensions\|inclusions\|initializations\|page\|\)\)\>.*$'
+      \ end='\\stop\z1'
+      \ contains=@mpTop,@NoSpell
+syn region  contextMPGraphic  matchgroup=contextBlockDelim
+      \ start='\\start\z(\%(\%[re]usable\|use\|unique\|static\)MPgraphic\|staticMPfigure\|uniqueMPpagegraphic\)\>.*$'
+      \ end='\\stop\z1'
+      \ contains=@mpTop,@NoSpell
+
+# Lua
+syn include @luaTop syntax/lua.vim
+unlet b:current_syntax
+
+syn region  contextLuaCode    matchgroup=contextBlockDelim
+      \ start='\\startluacode\>'
+      \ end='\\stopluacode\>' keepend
+      \ contains=@luaTop,@NoSpell
+syn match   contextDirectLua  "\\\%(directlua\|ctxlua\)\>\%(\s*%.*$\)\="
+      \ nextgroup=contextBeginEndLua skipwhite skipempty
+      \ contains=contextComment
+syn region  contextBeginEndLua matchgroup=contextSpecial
+      \ start="{" end="}" skip="\\[{}]"
+      \ contained contains=@luaTop,@NoSpell
+
+for synname in keys(context_include)
+  execute 'syn include @' .. synname .. 'Top' 'syntax/' .. synname .. '.vim'
   unlet b:current_syntax
-
-  syn region  contextMPGraphic  matchgroup=contextBlockDelim
-                                \ start='\\start\z(MP\%(clip\|code\|definitions\|drawing\|environment\|extensions\|inclusions\|initializations\|page\|\)\)\>.*$'
-                                \ end='\\stop\z1'
-                                \ contains=@mpTop,@NoSpell
-  syn region  contextMPGraphic  matchgroup=contextBlockDelim
-                                \ start='\\start\z(\%(\%[re]usable\|use\|unique\|static\)MPgraphic\|staticMPfigure\|uniqueMPpagegraphic\)\>.*$'
-                                \ end='\\stop\z1'
-                                \ contains=@mpTop,@NoSpell
-endif
-
-if get(b:, 'context_lua', get(g:, 'context_lua', 1))
-  syn include @luaTop          syntax/lua.vim
-  unlet b:current_syntax
-
-  syn region  contextLuaCode    matchgroup=contextBlockDelim
-                                \ start='\\startluacode\>'
-                                \ end='\\stopluacode\>' keepend
-                                \ contains=@luaTop,@NoSpell
-
-  syn match   contextDirectLua  "\\\%(directlua\|ctxlua\)\>\%(\s*%.*$\)\="
-                                \ nextgroup=contextBeginEndLua skipwhite skipempty
-                                \ contains=initexComment
-  syn region  contextBeginEndLua matchgroup=contextSpecial
-                                \ start="{" end="}" skip="\\[{}]"
-                                \ contained contains=@luaTop,@NoSpell
-endif
-
-for synname in keys(s:context_include)
-  execute 'syn include @' . synname . 'Top' 'syntax/' . synname . '.vim'
-  unlet b:current_syntax
-  execute 'syn region context' . s:context_include[synname] . 'Code'
+  execute 'syn region context' .. context_include[synname] .. 'Code'
         \ 'matchgroup=contextBlockDelim'
-        \ 'start=+\\start' . s:context_include[synname] . '+'
-        \ 'end=+\\stop' . s:context_include[synname] . '+'
-        \ 'contains=@' . synname . 'Top,@NoSpell'
+        \ 'start=+\\start' .. context_include[synname] .. '\w*+'
+        \ 'end=+\\stop' .. context_include[synname] .. '\w*+'
+        \ 'contains=@' .. synname .. 'Top,@NoSpell'
 endfor
 
-syn match   contextSectioning '\\\%(start\|stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>'
-                              \ contains=@NoSpell
+syn match   contextSectioning '\\\%(start\|stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>' contains=@NoSpell
 
-syn match   contextSpecial    '\\crlf\>\|\\par\>\|-\{2,3}\||[<>/]\=|'
-                              \ contains=@NoSpell
+syn match   contextSpecial    '\\par\>\|-\{2,3}\||[<>/]\=|'                     contains=@NoSpell
 syn match   contextSpecial    /\\[`'"]/
-syn match   contextSpecial    +\\char\%(\d\{1,3}\|'\o\{1,3}\|"\x\{1,2}\)\>+
-                              \ contains=@NoSpell
+syn match   contextSpecial    +\\char\%(\d\{1,3}\|'\o\{1,3}\|"\x\{1,2}\)\>+     contains=@NoSpell
 syn match   contextSpecial    '\^\^.'
 syn match   contextSpecial    '`\%(\\.\|\^\^.\|.\)'
 
-syn match   contextStyle      '\\\%(em\|ss\|hw\|cg\|mf\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(CAP\|Cap\|cap\|Caps\|kap\|nocap\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(Word\|WORD\|Words\|WORDS\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(vi\{1,3}\|ix\|xi\{0,2}\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(tf\|b[si]\|s[cl]\|os\)\%(xx\|[xabcd]\)\=\>'
-                              \ contains=@NoSpell
+syn match   contextStyle      '\\\%(em\|ss\|hw\|cg\|mf\)\>'                     contains=@NoSpell
+syn match   contextFont       '\\\%(CAP\|Cap\|cap\|Caps\|kap\|nocap\)\>'        contains=@NoSpell
+syn match   contextFont       '\\\%(Word\|WORD\|Words\|WORDS\)\>'               contains=@NoSpell
+syn match   contextFont       '\\\%(vi\{1,3}\|ix\|xi\{0,2}\)\>'                 contains=@NoSpell
+syn match   contextFont       '\\\%(tf\|b[si]\|s[cl]\|os\)\%(xx\|[xabcd]\)\=\>' contains=@NoSpell
 
-hi def link contextOptions    Typedef
-hi def link contextComment    Comment
 hi def link contextBlockDelim Keyword
 hi def link contextBuiltin    Keyword
+hi def link contextCommand    Keyword
+hi def link contextComment    Comment
 hi def link contextDelimiter  Delimiter
+hi def link contextDirectLua  Keyword
 hi def link contextEscaped    String
+hi def link contextFont       contextType
+hi def link contextKeyword    Keyword
+hi def link contextInlineMath String
+hi def link contextMagicLine  PreProc
+hi def link contextMathCmd    Identifier
+hi def link contextMathDelim  Delimiter
+hi def link contextOptions    Typedef
 hi def link contextPreProc    PreProc
 hi def link contextSectioning PreProc
+hi def link contextSequence   Identifier
 hi def link contextSpecial    Special
-hi def link contextType       Type
 hi def link contextStyle      contextType
-hi def link contextFont       contextType
-hi def link contextDirectLua  Keyword
+hi def link contextTodo       Todo
+hi def link contextType       Type
 
-let b:current_syntax = "context"
+b:current_syntax = 'context'
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
+# vim: sw=2 fdm=marker

runtime/syntax/gdresource.vim

@@ -0,0 +1,64 @@
+" Vim syntax file for Godot resource (scenes)
+" Language:     gdresource
+" Maintainer:   Maxim Kim <habamax@gmail.com>
+" Filenames:    *.tscn, *.tres
+
+if exists("b:current_syntax")
+    finish
+endif
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+syn match gdResourceNumber "\<0x\%(_\=\x\)\+\>"
+syn match gdResourceNumber "\<0b\%(_\=[01]\)\+\>"
+syn match gdResourceNumber "\<\d\%(_\=\d\)*\>"
+syn match gdResourceNumber "\<\d\%(_\=\d\)*\%(e[+-]\=\d\%(_\=\d\)*\)\=\>"
+syn match gdResourceNumber "\<\d\%(_\=\d\)*\.\%(e[+-]\=\d\%(_\=\d\)*\)\=\%(\W\|$\)\@="
+syn match gdResourceNumber "\%(^\|\W\)\@1<=\%(\d\%(_\=\d\)*\)\=\.\d\%(_\=\d\)*\%(e[+-]\=\d\%(_\=\d\)*\)\=\>"
+
+syn keyword gdResourceKeyword true false
+
+syn region gdResourceString
+      \ start=+[uU]\="+ end='"' skip='\\\\\|\\"'
+      \ contains=@Spell keepend
+
+" Section
+syn region gdResourceSection matchgroup=gdResourceSectionDelimiter
+      \ start='^\[' end=']\s*$'
+      \ oneline keepend
+      \ contains=gdResourceSectionName,gdResourceSectionAttribute
+
+syn match gdResourceSectionName '\[\@<=\S\+' contained skipwhite
+syn match gdResourceSectionAttribute '\S\+\s*=\s*\S\+'
+      \ skipwhite keepend contained
+      \ contains=gdResourceSectionAttributeName,gdResourceSectionAttributeValue
+syn match gdResourceSectionAttributeName '\S\+\ze\(\s*=\)' skipwhite contained
+syn match gdResourceSectionAttributeValue '\(=\s*\)\zs\S\+\ze' skipwhite
+      \ contained
+      \ contains=gdResourceString,gdResourceNumber,gdResourceKeyword
+
+
+" Section body
+syn match gdResourceAttribute '^\s*\S\+\s*=.*$'
+      \ skipwhite keepend
+      \ contains=gdResourceAttributeName,gdResourceAttributeValue
+
+syn match gdResourceAttributeName '\S\+\ze\(\s*=\)' skipwhite contained
+syn match gdResourceAttributeValue '\(=\s*\)\zs.*$' skipwhite
+      \ contained
+      \ contains=gdResourceString,gdResourceNumber,gdResourceKeyword
+
+
+hi def link gdResourceNumber Constant
+hi def link gdResourceKeyword Constant
+hi def link gdResourceSectionName Statement
+hi def link gdResourceSectionDelimiter Delimiter
+hi def link gdResourceSectionAttributeName Type
+hi def link gdResourceAttributeName Identifier
+hi def link gdResourceString String
+
+let b:current_syntax = "gdresource"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo

runtime/syntax/gdscript.vim

@@ -0,0 +1,104 @@
+" Vim syntax file for Godot gdscript
+" Language:     gdscript
+" Maintainer:   Maxim Kim <habamax@gmail.com>
+" Filenames:    *.gd
+
+if exists("b:current_syntax")
+    finish
+endif
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+syntax sync maxlines=100
+
+syn keyword gdscriptConditional if else elif match
+syn keyword gdscriptRepeat for while break continue
+
+syn keyword gdscriptOperator is as not and or in
+
+syn match gdscriptClass "\v<\u\w+>"
+syn match gdscriptConstant "\<[_A-Z]\+[0-9_A-Z]*\>"
+syn match gdscriptBlockStart ":\s*$"
+
+syn keyword gdscriptKeyword null self owner parent tool
+syn keyword gdscriptBoolean false true
+
+syn keyword gdscriptStatement remote master puppet remotesync mastersync puppetsync sync
+syn keyword gdscriptStatement return pass
+syn keyword gdscriptStatement static const enum
+syn keyword gdscriptStatement breakpoint assert
+syn keyword gdscriptStatement onready
+syn keyword gdscriptStatement class_name extends
+
+syn keyword gdscriptType void bool int float String contained
+
+syn keyword gdscriptStatement var nextgroup=gdscriptTypeDecl skipwhite
+syn keyword gdscriptStatement const nextgroup=gdscriptTypeDecl skipwhite
+syn match gdscriptTypeDecl "\h\w*\s*:\s*\h\w*" contains=gdscriptOperator,gdscriptType,gdscriptClass contained skipwhite
+syn match gdscriptTypeDecl "->\s*\h\w*" contains=gdscriptOperator,gdscriptType,gdscriptClass skipwhite
+
+syn keyword gdscriptStatement export nextgroup=gdscriptExportTypeDecl skipwhite
+syn match gdscriptExportTypeDecl "(.\{-}[,)]" contains=gdscriptOperator,gdscriptType,gdscriptClass contained skipwhite
+
+syn keyword gdscriptStatement setget nextgroup=gdscriptSetGet,gdscriptSetGetSeparator skipwhite
+syn match gdscriptSetGet "\h\w*" nextgroup=gdscriptSetGetSeparator display contained skipwhite
+syn match gdscriptSetGetSeparator "," nextgroup=gdscriptSetGet display contained skipwhite
+
+syn keyword gdscriptStatement class func signal nextgroup=gdscriptFunctionName skipwhite
+syn match gdscriptFunctionName "\h\w*" nextgroup=gdscriptFunctionParams display contained skipwhite
+syn match gdscriptFunctionParams "(.*)" contains=gdscriptTypeDecl display contained skipwhite
+
+syn match gdscriptNode "\$\h\w*\%(/\h\w*\)*"
+
+syn match gdscriptComment "#.*$" contains=@Spell,gdscriptTodo
+
+syn region gdscriptString matchgroup=gdscriptQuotes
+      \ start=+[uU]\=\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1"
+      \ contains=gdscriptEscape,@Spell
+
+syn region gdscriptString matchgroup=gdscriptTripleQuotes
+      \ start=+[uU]\=\z('''\|"""\)+ end="\z1" keepend
+      \ contains=gdscriptEscape,@Spell
+
+syn match gdscriptEscape +\\[abfnrtv'"\\]+ contained
+syn match gdscriptEscape "\\$"
+
+" Numbers
+syn match gdscriptNumber "\<0x\%(_\=\x\)\+\>"
+syn match gdscriptNumber "\<0b\%(_\=[01]\)\+\>"
+syn match gdscriptNumber "\<\d\%(_\=\d\)*\>"
+syn match gdscriptNumber "\<\d\%(_\=\d\)*\%(e[+-]\=\d\%(_\=\d\)*\)\=\>"
+syn match gdscriptNumber "\<\d\%(_\=\d\)*\.\%(e[+-]\=\d\%(_\=\d\)*\)\=\%(\W\|$\)\@="
+syn match gdscriptNumber "\%(^\|\W\)\@1<=\%(\d\%(_\=\d\)*\)\=\.\d\%(_\=\d\)*\%(e[+-]\=\d\%(_\=\d\)*\)\=\>"
+
+" XXX, TODO, etc
+syn keyword gdscriptTodo TODO XXX FIXME HACK NOTE BUG contained
+
+hi def link gdscriptStatement Statement
+hi def link gdscriptKeyword Keyword
+hi def link gdscriptConditional Conditional
+hi def link gdscriptBoolean Boolean
+hi def link gdscriptOperator Operator
+hi def link gdscriptRepeat Repeat
+hi def link gdscriptSetGet Function
+hi def link gdscriptFunctionName Function
+hi def link gdscriptClass Type
+hi def link gdscriptConstant Constant
+hi def link gdscriptBuiltinStruct Typedef
+hi def link gdscriptComment Comment
+hi def link gdscriptString String
+hi def link gdscriptQuotes String
+hi def link gdscriptTripleQuotes String
+hi def link gdscriptEscape Special
+hi def link gdscriptNode PreProc
+hi def link gdscriptType Type
+hi def link gdscriptNumber Number
+hi def link gdscriptBlockStart Special
+hi def link gdscriptTodo Todo
+
+
+let b:current_syntax = "gdscript"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo

runtime/syntax/gdshader.vim

@@ -0,0 +1,57 @@
+" Vim syntax file for Godot shading language
+" Language:     gdshader
+" Maintainer:   Maxim Kim <habamax@gmail.com>
+" Filenames:    *.gdshader
+
+if exists("b:current_syntax")
+    finish
+endif
+
+syn keyword gdshaderConditional if else switch case default
+syn keyword gdshaderRepeat for while do
+syn keyword gdshaderStatement return discard
+syn keyword gdshaderBoolean true false
+
+syn keyword gdshaderKeyword shader_type render_mode
+syn keyword gdshaderKeyword in out inout
+syn keyword gdshaderKeyword lowp mediump highp
+syn keyword gdshaderKeyword uniform varying const
+syn keyword gdshaderKeyword flat smooth
+
+syn keyword gdshaderType float vec2 vec3 vec4
+syn keyword gdshaderType uint uvec2 uvec3 uvec4
+syn keyword gdshaderType int ivec2 ivec3 ivec4
+syn keyword gdshaderType void bool
+syn keyword gdshaderType bvec2 bvec3 bvec4
+syn keyword gdshaderType mat2 mat3 mat4
+syn keyword gdshaderType sampler2D isampler2D usampler2D samplerCube
+
+syn match gdshaderMember "\v<(\.)@<=[a-z_]+\w*>"
+syn match gdshaderBuiltin "\v<[A-Z_]+[A-Z0-9_]*>"
+syn match gdshaderFunction "\v<\w*>(\()@="
+
+syn match gdshaderNumber "\v<\d+(\.)@!>"
+syn match gdshaderFloat "\v<\d*\.\d+(\.)@!>"
+syn match gdshaderFloat "\v<\d*\.=\d+(e-=\d+)@="
+syn match gdshaderExponent "\v(\d*\.=\d+)@<=e-=\d+>"
+
+syn match gdshaderComment "\v//.*$" contains=@Spell
+syn region gdshaderComment start="/\*" end="\*/" contains=@Spell
+syn keyword gdshaderTodo TODO FIXME XXX NOTE BUG HACK OPTIMIZE containedin=gdshaderComment
+
+hi def link gdshaderConditional Conditional
+hi def link gdshaderRepeat Repeat
+hi def link gdshaderStatement Statement
+hi def link gdshaderBoolean Boolean
+hi def link gdshaderKeyword Keyword
+hi def link gdshaderMember Identifier
+hi def link gdshaderBuiltin Identifier
+hi def link gdshaderFunction Function
+hi def link gdshaderType Type
+hi def link gdshaderNumber Number
+hi def link gdshaderFloat Float
+hi def link gdshaderExponent Special
+hi def link gdshaderComment Comment
+hi def link gdshaderTodo Todo
+
+let b:current_syntax = "gdshader"

runtime/syntax/mf.vim

@@ -1,26 +1,39 @@
-" Vim syntax file
-" Language:           METAFONT
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Andreas Scherer <andreas.scherer@pobox.com>
-" Last Change:        2016 Oct 1
+vim9script
+
+# Vim syntax file
+# Language:           METAFONT
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Andreas Scherer <andreas.scherer@pobox.com>
+# Latest Revision:    2022 Aug 12
 
 if exists("b:current_syntax")
   finish
 endif
 
+# Deprecation warnings: to be removed eventually
+if exists("g:plain_mf_macros")
+  echomsg "[mf] g:plain_mf_macros is deprecated: use g:mf_plain_macros instead."
+endif
+if exists("g:plain_mf_modes")
+  echomsg "[mf] g:plain_mf_modes is deprecated: use g:mf_plain_modes instead."
+endif
+if exists("g:other_mf_macros")
+  echomsg "[mf] g:other_mf_macros is deprecated: use g:mf_other_macros instead."
+endif
+
 syn iskeyword @,_
 
-" METAFONT 'primitives' as defined in chapter 25 of 'The METAFONTbook'
-" Page 210: 'boolean expressions'
+# METAFONT 'primitives' as defined in chapter 25 of 'The METAFONTbook'
+# Page 210: 'boolean expressions'
 syn keyword mfBoolExp        and charexists false known not odd or true unknown
 
-" Page 210: 'numeric expression'
+# Page 210: 'numeric expression'
 syn keyword mfNumExp         ASCII angle cosd directiontime floor hex length
 syn keyword mfNumExp         mexp mlog normaldeviate oct sind sqrt totalweight
 syn keyword mfNumExp         turningnumber uniformdeviate xpart xxpart xypart
 syn keyword mfNumExp         ypart yxpart yypart
 
-" Page 211: 'internal quantities'
+# Page 211: 'internal quantities'
 syn keyword mfInternal       autorounding boundarychar charcode chardp chardx
 syn keyword mfInternal       chardy charext charht charic charwd day designsize
 syn keyword mfInternal       fillin fontmaking granularity hppp jobname month
@@ -32,25 +45,25 @@ syn keyword mfInternal       tracingrestores tracingspecs tracingstats
 syn keyword mfInternal       tracingtitles turningcheck vppp warningcheck
 syn keyword mfInternal       xoffset year yoffset
 
-" Page 212: 'pair expressions'
+# Page 212: 'pair expressions'
 syn keyword mfPairExp        of penoffset point postcontrol precontrol rotated
 syn keyword mfPairExp        scaled shifted slanted transformed xscaled yscaled
 syn keyword mfPairExp        zscaled
 
-" Page 213: 'path expressions'
+# Page 213: 'path expressions'
 syn keyword mfPathExp        atleast controls curl cycle makepath reverse
 syn keyword mfPathExp        subpath tension
 
-" Page 214: 'pen expressions'
+# Page 214: 'pen expressions'
 syn keyword mfPenExp         makepen nullpen pencircle
 
-" Page 214: 'picture expressions'
+# Page 214: 'picture expressions'
 syn keyword mfPicExp         nullpicture
 
-" Page 214: 'string expressions'
+# Page 214: 'string expressions'
 syn keyword mfStringExp      char decimal readstring str substring
 
-" Page 217: 'commands and statements'
+# Page 217: 'commands and statements'
 syn keyword mfCommand        addto also at batchmode contour cull delimiters
 syn keyword mfCommand        display doublepath dropping dump end errhelp
 syn keyword mfCommand        errmessage errorstopmode everyjob from interim
@@ -60,36 +73,36 @@ syn keyword mfCommand        save scrollmode shipout show showdependencies
 syn keyword mfCommand        showstats showtoken showvariable special to withpen
 syn keyword mfCommand        withweight
 
-" Page 56: 'types'
+# Page 56: 'types'
 syn keyword mfType           boolean numeric pair path pen picture string
 syn keyword mfType           transform
 
-" Page 155: 'grouping'
+# Page 155: 'grouping'
 syn keyword mfStatement      begingroup endgroup
 
-" Page 165: 'definitions'
+# Page 165: 'definitions'
 syn keyword mfDefinition     def enddef expr primary primarydef secondary
 syn keyword mfDefinition     secondarydef suffix tertiary tertiarydef text
 syn keyword mfDefinition     vardef
 
-" Page 169: 'conditions and loops'
+# Page 169: 'conditions and loops'
 syn keyword mfCondition      else elseif endfor exitif fi for forever
 syn keyword mfCondition      forsuffixes if step until
 
-" Other primitives listed in the index
+# Other primitives listed in the index
 syn keyword mfPrimitive      charlist endinput expandafter extensible fontdimen
 syn keyword mfPrimitive      headerbyte inner input intersectiontimes kern
 syn keyword mfPrimitive      ligtable quote scantokens skipto
 
-" Implicit suffix parameters
+# Implicit suffix parameters
 syn match   mfSuffixParam    "@#\|#@\|@"
 
-" These are just tags, but given their special status, we
-" highlight them as variables
+# These are just tags, but given their special status, we
+# highlight them as variables
 syn keyword mfVariable       x y
 
-" Keywords defined by plain.mf (defined on pp.262-278)
-if get(g:, "plain_mf_macros", 1)
+# Keywords defined by plain.mf (defined on pp.262-278)
+if get(g:, "mf_plain_macros", get(g:, "plain_mf_macros", 1))
   syn keyword mfDef          addto_currentpicture beginchar capsule_def
   syn keyword mfDef          change_width clear_pen_memory clearit clearpen
   syn keyword mfDef          clearxy culldraw cullit cutdraw
@@ -117,8 +130,8 @@ if get(g:, "plain_mf_macros", 1)
   syn keyword mfVardef       bot byte ceiling counterclockwise cutoff decr dir
   syn keyword mfVardef       direction directionpoint grayfont hround incr
   syn keyword mfVardef       interpath inverse labelfont labels lft magstep
-  " Note: nodot is not a vardef, it is used as in makelabel.lft.nodot("5",z5)
-  " (METAFONT only)
+  # Note: nodot is not a vardef, it is used as in makelabel.lft.nodot("5",z5)
+  # (METAFONT only)
   syn keyword mfVardef       makelabel max min nodot penlabels penpos
   syn keyword mfVardef       proofrulethickness round rt savepen slantfont solve
   syn keyword mfVardef       tensepath titlefont top unitvector vround whatever
@@ -130,24 +143,24 @@ if get(g:, "plain_mf_macros", 1)
   syn keyword mfNewInternal  infinity join_radius number_of_modes o_correction
   syn keyword mfNewInternal  pen_bot pen_lft pen_rt pen_top pixels_per_inch
   syn keyword mfNewInternal  screen_cols screen_rows tolerance
-  " Predefined constants
+  # Predefined constants
   syn keyword mfConstant     base_name base_version blankpicture ditto down
   syn keyword mfConstant     fullcircle halfcircle identity left lowres origin
   syn keyword mfConstant     penspeck proof quartercircle right rulepen smoke
   syn keyword mfConstant     unitpixel unitsquare up
-  " Other predefined variables
+  # Other predefined variables
   syn keyword mfVariable     aspect_ratio currentpen extra_beginchar
   syn keyword mfVariable     extra_endchar currentpen_path currentpicture
   syn keyword mfVariable     currenttransform d extra_setup h localfont mag mode
   syn keyword mfVariable     mode_name w
-  " let statements:
+  # let statements:
   syn keyword mfnumExp       abs
   syn keyword mfPairExp      rotatedabout
   syn keyword mfCommand      bye relax
 endif
 
-" By default, METAFONT loads modes.mf, too
-if get(g:, "plain_mf_modes", 1)
+# By default, METAFONT loads modes.mf, too
+if get(g:, "plain_mf_modes", get(g:, "mf_plain_modes", 1))
   syn keyword mfConstant     APSSixMed AgfaFourZeroZero AgfaThreeFourZeroZero
   syn keyword mfConstant     AtariNineFive AtariNineSix AtariSLMEightZeroFour
   syn keyword mfConstant     AtariSMOneTwoFour CItohEightFiveOneZero
@@ -228,36 +241,36 @@ if get(g:, "plain_mf_modes", 1)
   syn keyword mfNewInternal  blacker_min
 endif
 
-" Some other basic macro names, e.g., from cmbase, logo, etc.
-if get(g:, "other_mf_macros", 1)
+# Some other basic macro names, e.g., from cmbase, logo, etc.
+if get(g:, "mf_other_macros", get(g:, "other_mf_macros", 1))
   syn keyword mfDef          beginlogochar
   syn keyword mfDef          font_setup
   syn keyword mfPrimitive    generate
 endif
 
-" Numeric tokens
+# Numeric tokens
 syn match     mfNumeric      "[-]\=\d\+"
 syn match     mfNumeric      "[-]\=\.\d\+"
 syn match     mfNumeric      "[-]\=\d\+\.\d\+"
 
-" METAFONT lengths
+# METAFONT lengths
 syn match     mfLength       "\<\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\>"
 syn match     mfLength       "[-]\=\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\="
 syn match     mfLength       "[-]\=\.\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\="
 syn match     mfLength       "[-]\=\d\+\.\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\="
 
-" String constants
+# String constants
 syn match     mfOpenString   /"[^"]*/
 syn region    mfString       oneline keepend start=+"+ end=+"+
 
-" Comments:
+# Comments:
 syn keyword   mfTodoComment  contained TODO FIXME XXX DEBUG NOTE
 syn match     mfComment      "%.*$" contains=mfTodoComment,@Spell
 
-" synchronizing
-syn sync maxlines=50
+# synchronizing
+syn sync maxlines=100
 
-" Define the default highlighting
+# Define the default highlighting
 hi def link mfBoolExp      Statement
 hi def link mfNumExp       Statement
 hi def link mfPairExp      Statement
@@ -290,6 +303,6 @@ hi def link mfVariable     Identifier
 hi def link mfConstant     Constant
 hi def link mfTodoComment  Todo
 
-let b:current_syntax = "mf"
+b:current_syntax = "mf"
 
-" vim:sw=2
+# vim: sw=2 fdm=marker

runtime/syntax/mp.vim

@@ -1,109 +1,106 @@
-" Vim syntax file
-" Language:           MetaPost
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Andreas Scherer <andreas.scherer@pobox.com>
-" Last Change:        2016 Oct 14
+vim9script
+
+# Vim syntax file
+# Language:           MetaPost
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Andreas Scherer <andreas.scherer@pobox.com>
+# Latest Revision:    2022 Aug 12
 
 if exists("b:current_syntax")
   finish
 endif
 
-let s:cpo_sav = &cpo
-set cpo&vim
-
-if exists("g:plain_mf_macros")
-  let s:plain_mf_macros = g:plain_mf_macros
+# Deprecation warnings: to be removed eventually
+if exists("g:plain_mp_macros")
+  echomsg "[mp] g:plain_mp_macros is deprecated: use g:mp_plain_macros instead."
 endif
-if exists("g:plain_mf_modes")
-  let s:plain_mf_modes = g:plain_mf_modes
+if exists("mfplain_mp_macros")
+  echomsg "[mp] g:mfplain_mp_macros is deprecated: use g:mp_mfplain_macros instead."
 endif
-if exists("g:other_mf_macros")
-  let s:other_mf_macros = g:other_mf_macros
+if exists("other_mp_macros")
+  echomsg "[mp] g:other_mp_macros is deprecated: use g:mp_other_macros instead."
 endif
 
-let g:plain_mf_macros = 0 " plain.mf has no special meaning for MetaPost
-let g:plain_mf_modes  = 0 " No METAFONT modes
-let g:other_mf_macros = 0 " cmbase.mf, logo.mf, ... neither
+# Store the current values of METAFONT global options
+const mf_plain_macros = get(g:, "mf_plain_macros", get(g:, "plain_mf_macros", -1))
+const mf_plain_modes  = get(g:, "mf_plain_modes",  get(g:, "plain_mf_modes",  -1))
+const mf_other_macros = get(g:, "mf_other_macros", get(g:, "other_mf_macros", -1))
 
-" Read the METAFONT syntax to start with
+g:mf_plain_macros = 0 # plain.mf has no special meaning for MetaPost
+g:mf_plain_modes  = 0 # No METAFONT modes
+g:mf_other_macros = 0 # cmbase.mf, logo.mf, ... neither
+
+# Read the METAFONT syntax to start with
 runtime! syntax/mf.vim
-unlet b:current_syntax " Necessary for syn include below
+unlet b:current_syntax # Necessary for syn include below
 
-" Restore the value of existing global variables
-if exists("s:plain_mf_macros")
-  let g:plain_mf_macros = s:plain_mf_macros
+# Restore the value of existing global variables
+if mf_plain_macros == -1
+  unlet g:mf_plain_macros
 else
-  unlet g:plain_mf_macros
+  g:plain_mf_macros = mf_plain_macros
 endif
-if exists("s:plain_mf_modes")
-  let g:plain_mf_modes = s:plain_mf_modes
+if mf_plain_modes == -1
+  unlet g:mf_plain_modes
 else
-  unlet g:plain_mf_modes
+  g:mf_plain_modes = mf_plain_modes
 endif
-if exists("s:other_mf_macros")
-  let g:other_mf_macros = s:other_mf_macros
+if mf_other_macros == -1
+  unlet g:mf_other_macros
 else
-  unlet g:other_mf_macros
+  g:mf_other_macros = mf_other_macros
 endif
 
-" Use TeX highlighting inside verbatimtex/btex... etex
+# Use TeX highlighting inside verbatimtex/btex... etex
 syn include @MPTeX syntax/tex.vim
 unlet b:current_syntax
-" These are defined as keywords rather than using matchgroup
-" in order to make them available to syntaxcomplete.
+# These are defined as keywords rather than using matchgroup
+# in order to make them available to syntaxcomplete.
 syn keyword mpTeXdelim       btex etex verbatimtex contained
-syn region mpTeXinsert
-      \ start=/\<verbatimtex\>\|\<btex\>/rs=e+1
-      \ end=/\<etex\>/re=s-1 keepend
-      \ contains=@MPTeX,mpTeXdelim
+syn region mpTeXinsert matchgroup=mpTeXdelim start=/\<verbatimtex\>\|\<btex\>/ end=/\<etex\>/ keepend contains=@MPTeX,mpTeXdelim
 
-" iskeyword must be set after the syn include above, because tex.vim sets `syn
-" iskeyword`. Note that keywords do not contain numbers (numbers are
-" subscripts)
+# iskeyword must be set after the syn include above, because tex.vim sets `syn
+# iskeyword`. Note that keywords do not contain numbers (numbers are
+# subscripts)
 syntax iskeyword @,_
 
-" MetaPost primitives not found in METAFONT
+# MetaPost primitives not found in METAFONT
 syn keyword mpBoolExp        bounded clipped filled stroked textual arclength
 syn keyword mpNumExp         arctime blackpart bluepart colormodel cyanpart
 syn keyword mpNumExp         fontsize greenpart greypart magentapart redpart
 syn keyword mpPairExp        yellowpart llcorner lrcorner ulcorner urcorner
-" envelope is seemingly undocumented, but it exists since mpost 1.003.
-" The syntax is: envelope <polygonal pen> of <path primary>. For example,
-"     path p;
-"     p := envelope pensquare of (up--left);
-" (Thanks to Daniel H. Luecking for the example!)
 syn keyword mpPathExp        envelope pathpart
 syn keyword mpPenExp         penpart
 syn keyword mpPicExp         dashpart glyph infont
 syn keyword mpStringExp      fontpart readfrom textpart
 syn keyword mpType           cmykcolor color rgbcolor
-" Other MetaPost primitives listed in the manual
+# Other MetaPost primitives listed in the manual
 syn keyword mpPrimitive      mpxbreak within
-" Internal quantities not found in METAFONT
-" (Table 6 in MetaPost: A User's Manual)
+# Internal quantities not found in METAFONT
+# (Table 6 in MetaPost: A User's Manual)
 syn keyword mpInternal       defaultcolormodel hour minute linecap linejoin
 syn keyword mpInternal       miterlimit mpprocset mpversion numberprecision
 syn keyword mpInternal       numbersystem outputfilename outputformat
 syn keyword mpInternal       outputformatoptions outputtemplate prologues
 syn keyword mpInternal       restoreclipcolor tracinglostchars troffmode
 syn keyword mpInternal       truecorners
-" List of commands not found in METAFONT (from MetaPost: A User's Manual)
+# List of commands not found in METAFONT (from MetaPost: A User's Manual)
 syn keyword mpCommand        clip closefrom dashed filenametemplate fontmapfile
 syn keyword mpCommand        fontmapline setbounds withcmykcolor withcolor
 syn keyword mpCommand        withgreyscale withoutcolor withpostscript
 syn keyword mpCommand        withprescript withrgbcolor write
-" METAFONT internal variables not found in MetaPost
+# METAFONT internal variables not found in MetaPost
 syn keyword notDefined       autorounding chardx chardy fillin granularity
 syn keyword notDefined       proofing smoothing tracingedges tracingpens
 syn keyword notDefined       turningcheck xoffset yoffset
-" Suffix defined only in METAFONT:
+# Suffix defined only in METAFONT:
 syn keyword notDefined       nodot
-" Other not implemented primitives (see MetaPost: A User's Manual, §C.1)
+# Other not implemented primitives (see MetaPost: A User's Manual, §C.1)
 syn keyword notDefined       cull display openwindow numspecial totalweight
 syn keyword notDefined       withweight
 
-" Keywords defined by plain.mp
-if get(g:, "plain_mp_macros", 1) || get(g:, "mp_metafun_macros", 0)
+# Keywords defined by plain.mp
+if get(g:, "mp_plain_macros", get(g:, "plain_mp_macros", 1)) || get(b:, "mp_metafun", get(g:, "mp_metafun", 0))
   syn keyword mpDef          beginfig clear_pen_memory clearit clearpen clearpen
   syn keyword mpDef          clearxy colorpart cutdraw downto draw drawarrow
   syn keyword mpDef          drawdblarrow drawdot drawoptions endfig erase
@@ -126,33 +123,30 @@ if get(g:, "plain_mp_macros", 1) || get(g:, "mp_metafun_macros", 0)
   syn keyword mpNewInternal  defaultscale dotlabeldiam eps epsilon infinity
   syn keyword mpNewInternal  join_radius labeloffset mitered pen_bot pen_lft
   syn keyword mpNewInternal  pen_rt pen_top rounded squared tolerance
-  " Predefined constants
+  # Predefined constants
   syn keyword mpConstant     EOF background base_name base_version black
   syn keyword mpConstant     blankpicture blue ditto down evenly fullcircle
   syn keyword mpConstant     green halfcircle identity left origin penrazor
   syn keyword mpConstant     penspeck pensquare quartercircle red right
   syn keyword mpConstant     unitsquare up white withdots
-  " Other predefined variables
+  # Other predefined variables
   syn keyword mpVariable     currentpen currentpen_path currentpicture cuttings
   syn keyword mpVariable     defaultfont extra_beginfig extra_endfig
-  syn match   mpVariable     /\<\%(laboff\|labxf\|labyf\)\>/
-  syn match   mpVariable     /\<\%(laboff\|labxf\|labyf\)\.\%(lft\|rt\|bot\|top\|ulft\|urt\|llft\|lrt\)\>/
-  " let statements:
+  syn keyword mpVariable     laboff labxf labyf laboff labxf labyf
+  syn match   mpVariable     /\.\%(lft\|rt\|bot\|top\|ulft\|urt\|llft\|lrt\)\>/
+  # let statements:
   syn keyword mpnumExp       abs
   syn keyword mpDef          rotatedabout
   syn keyword mpCommand      bye relax
-  " on and off are not technically keywords, but it is nice to highlight them
-  " inside dashpattern().
+  # on and off are not technically keywords, but it is nice to highlight them
+  # inside dashpattern().
   syn keyword mpOnOff        off on contained
   syn keyword mpDash         dashpattern contained
-  syn region  mpDashPattern
-        \ start="dashpattern\s*"
-        \ end=")"he=e-1
-        \ contains=mfNumeric,mfLength,mpOnOff,mpDash
+  syn region  mpDashPattern start="dashpattern\s*" end=")"he=e-1 contains=mfNumeric,mfLength,mpOnOff,mpDash
 endif
 
-" Keywords defined by mfplain.mp
-if get(g:, "mfplain_mp_macros", 0)
+# Keywords defined by mfplain.mp
+if get(g:, "mp_mfplain_macros", get(g:, "mfplain_mp_macros", 0))
   syn keyword mpDef          beginchar capsule_def change_width
   syn keyword mpDef          define_blacker_pixels define_corrected_pixels
   syn keyword mpDef          define_good_x_pixels define_good_y_pixels
@@ -169,15 +163,15 @@ if get(g:, "mfplain_mp_macros", 0)
   syn keyword mpVardef       hround proofrulethickness vround
   syn keyword mpNewInternal  blacker o_correction
   syn keyword mpVariable     extra_beginchar extra_endchar extra_setup rulepen
-  " plus some no-ops, also from mfplain.mp
+  # plus some no-ops, also from mfplain.mp
   syn keyword mpDef          cull cullit gfcorners imagerules nodisplays
   syn keyword mpDef          notransforms openit proofoffset screenchars
   syn keyword mpDef          screenrule screenstrokes showit
   syn keyword mpVardef       grayfont slantfont titlefont
   syn keyword mpVariable     currenttransform
   syn keyword mpConstant     unitpixel
-  " These are not listed in the MetaPost manual, and some are ignored by
-  " MetaPost, but are nonetheless defined in mfplain.mp
+  # These are not listed in the MetaPost manual, and some are ignored by
+  # MetaPost, but are nonetheless defined in mfplain.mp
   syn keyword mpDef          killtext
   syn match   mpVardef       "\<good\.\%(x\|y\|lft\|rt\|top\|bot\)\>"
   syn keyword mpVariable     aspect_ratio localfont mag mode mode_name
@@ -187,25 +181,25 @@ if get(g:, "mfplain_mp_macros", 0)
   syn keyword mpNewInternal  number_of_modes proofing smoothing turningcheck
 endif
 
-" Keywords defined by all base macro packages:
-" - (r)boxes.mp
-" - format.mp
-" - graph.mp
-" - marith.mp
-" - sarith.mp
-" - string.mp
-" - TEX.mp
-if get(g:, "other_mp_macros", 1)
-  " boxes and rboxes
+# Keywords defined by all base macro packages:
+# - (r)boxes.mp
+# - format.mp
+# - graph.mp
+# - marith.mp
+# - sarith.mp
+# - string.mp
+# - TEX.mp
+if get(g:, "mp_other_macros", get(g:, "other_mp_macros", 1))
+  # boxes and rboxes
   syn keyword mpDef          boxjoin drawboxed drawboxes drawunboxed
   syn keyword mpNewInternal  circmargin defaultdx defaultdy rbox_radius
   syn keyword mpVardef       boxit bpath circleit fixpos fixsize generic_declare
   syn keyword mpVardef       generic_redeclare generisize pic rboxit str_prefix
-  " format
+  # format
   syn keyword mpVardef       Mformat format init_numbers roundd
   syn keyword mpVariable     Fe_base Fe_plus
   syn keyword mpConstant     Ten_to
-  " graph
+  # graph
   syn keyword mpDef          Gfor Gxyscale OUT auto begingraph endgraph gdata
   syn keyword mpDef          gdraw gdrawarrow gdrawdblarrow gfill plot
   syn keyword mpVardef       augment autogrid frame gdotlabel glabel grid itick
@@ -215,528 +209,41 @@ if get(g:, "other_mp_macros", 1)
   syn keyword mpVariable     Autoform Gemarks Glmarks Gumarks
   syn keyword mpConstant     Gtemplate
   syn match   mpVariable     /Gmargin\.\%(low\|high\)/
-  " marith
+  # marith
   syn keyword mpVardef       Mabs Meform Mexp Mexp_str Mlog Mlog_Str Mlog_str
   syn keyword mpPrimaryDef   Mdiv Mmul
   syn keyword mpSecondaryDef Madd Msub
   syn keyword mpTertiaryDef  Mleq
   syn keyword mpNewInternal  Mten Mzero
-  " sarith
+  # sarith
   syn keyword mpVardef       Sabs Scvnum
   syn keyword mpPrimaryDef   Sdiv Smul
   syn keyword mpSecondaryDef Sadd Ssub
   syn keyword mpTertiaryDef  Sleq Sneq
-  " string
+  # string
   syn keyword mpVardef       cspan isdigit loptok
-  " TEX
+  # TEX
   syn keyword mpVardef       TEX TEXPOST TEXPRE
 endif
 
-" Up to date as of 23-Sep-2016.
-if get(b:, 'mp_metafun_macros', get(g:, 'mp_metafun_macros', 0))
-  " Highlight TeX keywords (for use in ConTeXt documents)
+if get(b:, "mp_metafun", get(g:, "mp_metafun", 0))
+  # MetaFun additions to MetaPost base file
+  syn keyword mpConstant cyan magenta yellow
+  syn keyword mpConstant penspec
+  syn keyword mpNumExp   graypart greycolor graycolor
+
+  # Highlight TeX keywords (for MetaPost embedded in ConTeXt documents)
   syn match   mpTeXKeyword  '\\[a-zA-Z@]\+'
 
-  " These keywords have been added manually.
   syn keyword mpPrimitive runscript
 
-  " The following MetaFun keywords have been extracted automatically from
-  " ConTeXt source code. They include all "public" macros (where a macro is
-  " considered public if and only if it does not start with _, mfun_, mlib_, or
-  " do_, and it does not end with _), all "public" unsaved variables, and all
-  " `let` statements.
+  runtime! syntax/shared/context-data-metafun.vim
 
-  " mp-abck.mpiv
-  syn keyword mpDef          abck_grid_line anchor_box box_found boxfilloptions
-  syn keyword mpDef          boxgridoptions boxlineoptions draw_multi_pars
-  syn keyword mpDef          draw_multi_side draw_multi_side_path freeze_box
-  syn keyword mpDef          initialize_box initialize_box_pos
-  syn keyword mpDef          multi_side_draw_options show_multi_kind
-  syn keyword mpDef          show_multi_pars
-  syn keyword mpVardef       abck_baseline_grid abck_draw_path abck_graphic_grid
-  syn keyword mpVariable     boxdashtype boxfilloffset boxfilltype
-  syn keyword mpVariable     boxgriddirection boxgriddistance boxgridshift
-  syn keyword mpVariable     boxgridtype boxgridwidth boxlineoffset
-  syn keyword mpVariable     boxlineradius boxlinetype boxlinewidth multikind
-  syn keyword mpConstant     context_abck
-  " mp-apos.mpiv
-  syn keyword mpDef          anch_sidebars_draw boxfilloptions boxlineoptions
-  syn keyword mpDef          connect_positions
-  syn keyword mpConstant     context_apos
-  " mp-asnc.mpiv
-  syn keyword mpDef          FlushSyncTasks ProcessSyncTask ResetSyncTasks
-  syn keyword mpDef          SetSyncColor SetSyncThreshold SyncTask
-  syn keyword mpVardef       PrepareSyncTasks SyncBox TheSyncColor
-  syn keyword mpVardef       TheSyncThreshold
-  syn keyword mpVariable     CurrentSyncClass NOfSyncPaths SyncColor
-  syn keyword mpVariable     SyncLeftOffset SyncPaths SyncTasks SyncThreshold
-  syn keyword mpVariable     SyncThresholdMethod SyncWidth
-  syn keyword mpConstant     context_asnc
-  " mp-back.mpiv
-  syn keyword mpDef          some_double_back some_hash
-  syn keyword mpVariable     back_nillcolor
-  syn keyword mpConstant     context_back
-  " mp-bare.mpiv
-  syn keyword mpVardef       colordecimals rawtextext
-  syn keyword mpPrimaryDef   infont
-  syn keyword mpConstant     context_bare
-  " mp-base.mpiv
-  " This is essentially plain.mp with only a few keywords added
-  syn keyword mpNumExp       graypart
-  syn keyword mpType         graycolor greycolor
-  syn keyword mpConstant     cyan magenta yellow
-  " mp-butt.mpiv
-  syn keyword mpDef          predefinedbutton some_button
-  syn keyword mpConstant     context_butt
-  " mp-char.mpiv
-  syn keyword mpDef          flow_begin_chart flow_begin_sub_chart
-  syn keyword mpDef          flow_chart_draw_comment flow_chart_draw_exit
-  syn keyword mpDef          flow_chart_draw_label flow_chart_draw_text
-  syn keyword mpDef          flow_clip_chart flow_collapse_points
-  syn keyword mpDef          flow_connect_bottom_bottom flow_connect_bottom_left
-  syn keyword mpDef          flow_connect_bottom_right flow_connect_bottom_top
-  syn keyword mpDef          flow_connect_left_bottom flow_connect_left_left
-  syn keyword mpDef          flow_connect_left_right flow_connect_left_top
-  syn keyword mpDef          flow_connect_right_bottom flow_connect_right_left
-  syn keyword mpDef          flow_connect_right_right flow_connect_right_top
-  syn keyword mpDef          flow_connect_top_bottom flow_connect_top_left
-  syn keyword mpDef          flow_connect_top_right flow_connect_top_top
-  syn keyword mpDef          flow_draw_connection flow_draw_connection_point
-  syn keyword mpDef          flow_draw_midpoint flow_draw_shape
-  syn keyword mpDef          flow_draw_test_area flow_draw_test_shape
-  syn keyword mpDef          flow_draw_test_shapes flow_end_chart
-  syn keyword mpDef          flow_end_sub_chart flow_flush_connections
-  syn keyword mpDef          flow_flush_picture flow_flush_pictures
-  syn keyword mpDef          flow_flush_shape flow_flush_shapes
-  syn keyword mpDef          flow_initialize_grid flow_new_chart flow_new_shape
-  syn keyword mpDef          flow_scaled_to_grid flow_show_connection
-  syn keyword mpDef          flow_show_connections flow_show_shapes
-  syn keyword mpDef          flow_xy_offset flow_y_pos
-  syn keyword mpVardef       flow_connection_path flow_down_on_grid
-  syn keyword mpVardef       flow_down_to_grid flow_i_point flow_left_on_grid
-  syn keyword mpVardef       flow_left_to_grid flow_offset
-  syn keyword mpVardef       flow_points_initialized flow_right_on_grid
-  syn keyword mpVardef       flow_right_to_grid flow_smooth_connection
-  syn keyword mpVardef       flow_trim_points flow_trimmed flow_up_on_grid
-  syn keyword mpVardef       flow_up_to_grid flow_valid_connection
-  syn keyword mpVardef       flow_x_on_grid flow_xy_bottom flow_xy_left
-  syn keyword mpVardef       flow_xy_on_grid flow_xy_right flow_xy_top
-  syn keyword mpVardef       flow_y_on_grid
-  syn keyword mpVariable     flow_arrowtip flow_chart_background_color
-  syn keyword mpVariable     flow_chart_offset flow_comment_offset
-  syn keyword mpVariable     flow_connection_arrow_size
-  syn keyword mpVariable     flow_connection_dash_size
-  syn keyword mpVariable     flow_connection_line_color
-  syn keyword mpVariable     flow_connection_line_width
-  syn keyword mpVariable     flow_connection_smooth_size flow_connections
-  syn keyword mpVariable     flow_cpath flow_dash_pattern flow_dashline
-  syn keyword mpVariable     flow_exit_offset flow_forcevalid flow_grid_height
-  syn keyword mpVariable     flow_grid_width flow_label_offset flow_max_x
-  syn keyword mpVariable     flow_max_y flow_peepshape flow_reverse_connection
-  syn keyword mpVariable     flow_reverse_y flow_shape_action flow_shape_archive
-  syn keyword mpVariable     flow_shape_decision flow_shape_down
-  syn keyword mpVariable     flow_shape_fill_color flow_shape_height
-  syn keyword mpVariable     flow_shape_left flow_shape_line_color
-  syn keyword mpVariable     flow_shape_line_width flow_shape_loop
-  syn keyword mpVariable     flow_shape_multidocument flow_shape_node
-  syn keyword mpVariable     flow_shape_procedure flow_shape_product
-  syn keyword mpVariable     flow_shape_right flow_shape_singledocument
-  syn keyword mpVariable     flow_shape_subprocedure flow_shape_up
-  syn keyword mpVariable     flow_shape_wait flow_shape_width
-  syn keyword mpVariable     flow_show_all_points flow_show_con_points
-  syn keyword mpVariable     flow_show_mid_points flow_showcrossing flow_smooth
-  syn keyword mpVariable     flow_touchshape flow_xypoint flow_zfactor
-  syn keyword mpConstant     context_flow
-  " mp-chem.mpiv
-  syn keyword mpDef          chem_init_all chem_reset chem_start_structure
-  syn keyword mpDef          chem_transformed
-  syn keyword mpVardef       chem_ad chem_adj chem_align chem_arrow chem_au
-  syn keyword mpVardef       chem_b chem_bb chem_bd chem_bw chem_c chem_cc
-  syn keyword mpVardef       chem_ccd chem_cd chem_crz chem_cz chem_dash chem_db
-  syn keyword mpVardef       chem_diff chem_dir chem_do chem_dr chem_draw
-  syn keyword mpVardef       chem_drawarrow chem_eb chem_ed chem_ep chem_er
-  syn keyword mpVardef       chem_es chem_et chem_fill chem_hb chem_init_some
-  syn keyword mpVardef       chem_label chem_ldb chem_ldd chem_line chem_lr
-  syn keyword mpVardef       chem_lrb chem_lrbd chem_lrd chem_lrh chem_lrn
-  syn keyword mpVardef       chem_lrt chem_lrz chem_lsr chem_lsub chem_mark
-  syn keyword mpVardef       chem_marked chem_mid chem_mids chem_midz chem_mir
-  syn keyword mpVardef       chem_mov chem_move chem_number chem_oe chem_off
-  syn keyword mpVardef       chem_pb chem_pe chem_r chem_r_fragment chem_rb
-  syn keyword mpVardef       chem_rbd chem_rd chem_rdb chem_rdd chem_restore
-  syn keyword mpVardef       chem_rh chem_rm chem_rn chem_rot chem_rr chem_rrb
-  syn keyword mpVardef       chem_rrbd chem_rrd chem_rrh chem_rrn chem_rrt
-  syn keyword mpVardef       chem_rrz chem_rsr chem_rsub chem_rt chem_rz chem_s
-  syn keyword mpVardef       chem_save chem_sb chem_sd chem_set chem_sr chem_ss
-  syn keyword mpVardef       chem_start_component chem_stop_component
-  syn keyword mpVardef       chem_stop_structure chem_sub chem_symbol chem_tb
-  syn keyword mpVardef       chem_text chem_z chem_zln chem_zlt chem_zn chem_zrn
-  syn keyword mpVardef       chem_zrt chem_zt
-  syn keyword mpVariable     chem_mark_pair chem_stack_mirror chem_stack_origin
-  syn keyword mpVariable     chem_stack_p chem_stack_previous
-  syn keyword mpVariable     chem_stack_rotation chem_trace_boundingbox
-  syn keyword mpVariable     chem_trace_nesting chem_trace_text
-  syn keyword mpConstant     context_chem
-  " mp-core.mpiv
-  syn keyword mpDef          FlushSyncTasks ProcessSyncTask
-  syn keyword mpDef          RegisterLocalTextArea RegisterPlainTextArea
-  syn keyword mpDef          RegisterRegionTextArea RegisterTextArea
-  syn keyword mpDef          ResetLocalTextArea ResetSyncTasks ResetTextAreas
-  syn keyword mpDef          SaveTextAreas SetSyncColor SetSyncThreshold
-  syn keyword mpDef          SyncTask anchor_box box_found boxfilloptions
-  syn keyword mpDef          boxgridoptions boxlineoptions collapse_multi_pars
-  syn keyword mpDef          draw_box draw_multi_pars draw_par freeze_box
-  syn keyword mpDef          initialize_area initialize_area_par initialize_box
-  syn keyword mpDef          initialize_box_pos initialize_par
-  syn keyword mpDef          prepare_multi_pars relocate_multipars save_multipar
-  syn keyword mpDef          set_par_line_height show_multi_pars show_par
-  syn keyword mpDef          simplify_multi_pars sort_multi_pars
-  syn keyword mpVardef       InsideSavedTextArea InsideSomeSavedTextArea
-  syn keyword mpVardef       InsideSomeTextArea InsideTextArea PrepareSyncTasks
-  syn keyword mpVardef       SyncBox TextAreaH TextAreaW TextAreaWH TextAreaX
-  syn keyword mpVardef       TextAreaXY TextAreaY TheSyncColor TheSyncThreshold
-  syn keyword mpVardef       baseline_grid graphic_grid multi_par_at_top
-  syn keyword mpVariable     CurrentSyncClass NOfSavedTextAreas
-  syn keyword mpVariable     NOfSavedTextColumns NOfSyncPaths NOfTextAreas
-  syn keyword mpVariable     NOfTextColumns PlainTextArea RegionTextArea
-  syn keyword mpVariable     SavedTextColumns SyncColor SyncLeftOffset SyncPaths
-  syn keyword mpVariable     SyncTasks SyncThreshold SyncThresholdMethod
-  syn keyword mpVariable     SyncWidth TextAreas TextColumns
-  syn keyword mpVariable     auto_multi_par_hsize boxdashtype boxfilloffset
-  syn keyword mpVariable     boxfilltype boxgriddirection boxgriddistance
-  syn keyword mpVariable     boxgridshift boxgridtype boxgridwidth boxlineradius
-  syn keyword mpVariable     boxlinetype boxlinewidth check_multi_par_chain
-  syn keyword mpVariable     compensate_multi_par_topskip
-  syn keyword mpVariable     enable_multi_par_fallback force_multi_par_chain
-  syn keyword mpVariable     ignore_multi_par_page last_multi_par_shift lefthang
-  syn keyword mpVariable     local_multi_par_area multi_column_first_page_hack
-  syn keyword mpVariable     multi_par_pages multiloc multilocs multipar
-  syn keyword mpVariable     multipars multiref multirefs nofmultipars
-  syn keyword mpVariable     obey_multi_par_hang obey_multi_par_more
-  syn keyword mpVariable     one_piece_multi_par par_hang_after par_hang_indent
-  syn keyword mpVariable     par_indent par_left_skip par_line_height
-  syn keyword mpVariable     par_right_skip par_start_pos par_stop_pos
-  syn keyword mpVariable     par_strut_depth par_strut_height ppos righthang
-  syn keyword mpVariable     snap_multi_par_tops somehang span_multi_column_pars
-  syn keyword mpVariable     use_multi_par_region
-  syn keyword mpConstant     context_core
-  syn keyword LET            anchor_area anchor_par draw_area
-  " mp-cows.mpiv
-  syn keyword mpConstant     context_cows cow
-  " mp-crop.mpiv
-  syn keyword mpDef          page_marks_add_color page_marks_add_lines
-  syn keyword mpDef          page_marks_add_marking page_marks_add_number
-  syn keyword mpVardef       crop_color crop_gray crop_marks_cmyk
-  syn keyword mpVardef       crop_marks_cmykrgb crop_marks_gray crop_marks_lines
-  syn keyword mpVariable     crop_colors more page
-  syn keyword mpConstant     context_crop
-  " mp-figs.mpiv
-  syn keyword mpDef          naturalfigure registerfigure
-  syn keyword mpVardef       figuredimensions figureheight figuresize
-  syn keyword mpVardef       figurewidth
-  syn keyword mpConstant     context_figs
-  " mp-fobg.mpiv
-  syn keyword mpDef          DrawFoFrame
-  syn keyword mpVardef       equalpaths
-  syn keyword mpPrimaryDef   inset outset
-  syn keyword mpVariable     FoBackground FoBackgroundColor FoFrame FoLineColor
-  syn keyword mpVariable     FoLineStyle FoLineWidth FoSplit
-  syn keyword mpConstant     FoAll FoBottom FoDash FoDotted FoDouble FoGroove
-  syn keyword mpConstant     FoHidden FoInset FoLeft FoMedium FoNoColor FoNone
-  syn keyword mpConstant     FoOutset FoRidge FoRight FoSolid FoThick FoThin
-  syn keyword mpConstant     FoTop context_fobg
-  " mp-form.mpiv
-  syn keyword mpConstant     context_form
-  " mp-func.mpiv
-  syn keyword mpDef          constructedfunction constructedpairs
-  syn keyword mpDef          constructedpath curvedfunction curvedpairs
-  syn keyword mpDef          curvedpath function pathconnectors straightfunction
-  syn keyword mpDef          straightpairs straightpath
-  syn keyword mpConstant     context_func
-  " mp-grap.mpiv
-  syn keyword mpDef          Gfor OUT auto begingraph circles crosses diamonds
-  syn keyword mpDef          downtriangles endgraph gdata gdraw gdrawarrow
-  syn keyword mpDef          gdrawdblarrow gfill graph_addto
-  syn keyword mpDef          graph_addto_currentpicture graph_comma
-  syn keyword mpDef          graph_coordinate_multiplication graph_draw
-  syn keyword mpDef          graph_draw_label graph_errorbar_text graph_fill
-  syn keyword mpDef          graph_generate_exponents
-  syn keyword mpDef          graph_generate_label_position
-  syn keyword mpDef          graph_generate_numbers graph_label_location
-  syn keyword mpDef          graph_scan_mark graph_scan_marks graph_setbounds
-  syn keyword mpDef          graph_suffix graph_tick_label
-  syn keyword mpDef          graph_with_pen_and_color graph_withlist
-  syn keyword mpDef          graph_xyscale lefttriangles makefunctionpath plot
-  syn keyword mpDef          plotsymbol points rainbow righttriangles smoothpath
-  syn keyword mpDef          squares stars uptriangles witherrorbars
-  syn keyword mpVardef       addtopath augment autogrid constant_fit
-  syn keyword mpVardef       constant_function det escaped_format exp
-  syn keyword mpVardef       exponential_fit exponential_function format
-  syn keyword mpVardef       formatted frame functionpath gaussian_fit
-  syn keyword mpVardef       gaussian_function gdotlabel glabel graph_Feform
-  syn keyword mpVardef       graph_Meform graph_arrowhead_extent graph_bounds
-  syn keyword mpVardef       graph_clear_bounds
-  syn keyword mpVardef       graph_convert_user_path_to_internal graph_cspan
-  syn keyword mpVardef       graph_draw_arrowhead graph_error graph_errorbars
-  syn keyword mpVardef       graph_exp graph_factor_and_exponent_to_string
-  syn keyword mpVardef       graph_gridline_picture graph_is_null
-  syn keyword mpVardef       graph_label_convert_user_to_internal graph_loptok
-  syn keyword mpVardef       graph_match_exponents graph_mlog
-  syn keyword mpVardef       graph_modified_exponent_ypart graph_pair_adjust
-  syn keyword mpVardef       graph_picture_conversion graph_post_draw
-  syn keyword mpVardef       graph_read_line graph_readpath graph_remap
-  syn keyword mpVardef       graph_scan_path graph_select_exponent_mark
-  syn keyword mpVardef       graph_select_mark graph_set_bounds
-  syn keyword mpVardef       graph_set_default_bounds graph_shapesize
-  syn keyword mpVardef       graph_stash_label graph_tick_mark_spacing
-  syn keyword mpVardef       graph_unknown_pair_bbox grid isdigit itick
-  syn keyword mpVardef       linear_fit linear_function ln logten lorentzian_fit
-  syn keyword mpVardef       lorentzian_function otick polynomial_fit
-  syn keyword mpVardef       polynomial_function power_law_fit
-  syn keyword mpVardef       power_law_function powten setcoords setrange
-  syn keyword mpVardef       sortpath strfmt tick varfmt
-  syn keyword mpNewInternal  Mzero doubleinfinity graph_log_minimum
-  syn keyword mpNewInternal  graph_minimum_number_of_marks largestmantissa
-  syn keyword mpNewInternal  linear lntwo log mlogten singleinfinity
-  syn keyword mpVariable     Autoform determinant fit_chi_squared
-  syn keyword mpVariable     graph_errorbar_picture graph_exp_marks
-  syn keyword mpVariable     graph_frame_pair_a graph_frame_pair_b
-  syn keyword mpVariable     graph_lin_marks graph_log_marks graph_modified_bias
-  syn keyword mpVariable     graph_modified_higher graph_modified_lower
-  syn keyword mpVariable     graph_shape r_s resistance_color resistance_name
-  syn keyword mpConstant     context_grap
-  " mp-grid.mpiv
-  syn keyword mpDef          hlingrid hloggrid vlingrid vloggrid
-  syn keyword mpVardef       hlinlabel hlintext hlogtext linlin linlinpath
-  syn keyword mpVardef       linlog linlogpath loglin loglinpath loglog
-  syn keyword mpVardef       loglogpath processpath vlinlabel vlintext vlogtext
-  syn keyword mpVariable     fmt_initialize fmt_pictures fmt_precision
-  syn keyword mpVariable     fmt_separator fmt_zerocheck grid_eps
-  syn keyword mpConstant     context_grid
-  " mp-grph.mpiv
-  syn keyword mpDef          beginfig begingraphictextfig data_mpo_file
-  syn keyword mpDef          data_mpy_file doloadfigure draw endfig
-  syn keyword mpDef          endgraphictextfig fill fixedplace graphictext
-  syn keyword mpDef          loadfigure new_graphictext normalwithshade number
-  syn keyword mpDef          old_graphictext outlinefill protectgraphicmacros
-  syn keyword mpDef          resetfig reversefill withdrawcolor withfillcolor
-  syn keyword mpDef          withshade
-  syn keyword mpVariable     currentgraphictext figureshift
-  syn keyword mpConstant     context_grph
-  " mp-idea.mpiv
-  syn keyword mpVardef       bcomponent ccomponent gcomponent mcomponent
-  syn keyword mpVardef       rcomponent somecolor ycomponent
-  " mp-luas.mpiv
-  syn keyword mpDef          luacall message
-  syn keyword mpVardef       MP lua lualist
-  syn keyword mpConstant     context_luas
-  " mp-mlib.mpiv
-  syn keyword mpDef          autoalign bitmapimage circular_shade cmyk comment
-  syn keyword mpDef          defineshade eofill eofillup externalfigure figure
-  syn keyword mpDef          fillup label linear_shade multitonecolor namedcolor
-  syn keyword mpDef          nofill onlayer passarrayvariable passvariable
-  syn keyword mpDef          plain_label register resolvedcolor scantokens
-  syn keyword mpDef          set_circular_vector set_linear_vector shaded
-  syn keyword mpDef          spotcolor startpassingvariable stoppassingvariable
-  syn keyword mpDef          thelabel transparent[] usemetafunlabels
-  syn keyword mpDef          useplainlabels withcircularshade withlinearshade
-  syn keyword mpDef          withmask withproperties withshadecenter
-  syn keyword mpDef          withshadecolors withshadedirection withshadedomain
-  syn keyword mpDef          withshadefactor withshadefraction withshadeorigin
-  syn keyword mpDef          withshaderadius withshadestep withshadetransform
-  syn keyword mpDef          withshadevector withtransparency
-  syn keyword mpVardef       anchored checkbounds checkedbounds
-  syn keyword mpVardef       define_circular_shade define_linear_shade dotlabel
-  syn keyword mpVardef       escaped_format fmttext fontsize format formatted
-  syn keyword mpVardef       installlabel onetimefmttext onetimetextext
-  syn keyword mpVardef       outlinetext plain_thelabel properties rawfmttext
-  syn keyword mpVardef       rawtexbox rawtextext rule strfmt strut texbox
-  syn keyword mpVardef       textext thefmttext thelabel thetexbox thetextext
-  syn keyword mpVardef       tostring transparency_alternative_to_number
-  syn keyword mpVardef       validtexbox varfmt verbatim
-  syn keyword mpPrimaryDef   asgroup infont normalinfont shadedinto
-  syn keyword mpPrimaryDef   shownshadecenter shownshadedirection
-  syn keyword mpPrimaryDef   shownshadeorigin shownshadevector withshade
-  syn keyword mpPrimaryDef   withshademethod
-  syn keyword mpNewInternal  colorburntransparent colordodgetransparent
-  syn keyword mpNewInternal  colortransparent darkentransparent
-  syn keyword mpNewInternal  differencetransparent exclusiontransparent
-  syn keyword mpNewInternal  hardlighttransparent huetransparent
-  syn keyword mpNewInternal  lightentransparent luminositytransparent
-  syn keyword mpNewInternal  multiplytransparent normaltransparent
-  syn keyword mpNewInternal  overlaytransparent saturationtransparent
-  syn keyword mpNewInternal  screentransparent shadefactor softlighttransparent
-  syn keyword mpNewInternal  textextoffset
-  syn keyword mpType         property transparency
-  syn keyword mpVariable     currentoutlinetext shadeddown shadedleft
-  syn keyword mpVariable     shadedright shadedup shadeoffset trace_shades
-  syn keyword mpConstant     context_mlib
-  " mp-page.mpiv
-  syn keyword mpDef          BoundCoverAreas BoundPageAreas Enlarged FakeRule
-  syn keyword mpDef          FakeWord LoadPageState OverlayBox RuleColor
-  syn keyword mpDef          SetAreaVariables SetPageArea SetPageBackPage
-  syn keyword mpDef          SetPageCoverPage SetPageField SetPageFrontPage
-  syn keyword mpDef          SetPageHsize SetPageHstep SetPageLocation
-  syn keyword mpDef          SetPagePage SetPageSpine SetPageVariables
-  syn keyword mpDef          SetPageVsize SetPageVstep StartCover StartPage
-  syn keyword mpDef          StopCover StopPage SwapPageState innerenlarged
-  syn keyword mpDef          llEnlarged lrEnlarged outerenlarged ulEnlarged
-  syn keyword mpDef          urEnlarged
-  syn keyword mpVardef       BackPageHeight BackPageWidth BackSpace BaseLineSkip
-  syn keyword mpVardef       BodyFontSize BottomDistance BottomHeight
-  syn keyword mpVardef       BottomSpace CoverHeight CoverWidth CurrentColumn
-  syn keyword mpVardef       CurrentHeight CurrentWidth CutSpace EmWidth
-  syn keyword mpVardef       ExHeight FooterDistance FooterHeight
-  syn keyword mpVardef       FrontPageHeight FrontPageWidth HSize HeaderDistance
-  syn keyword mpVardef       HeaderHeight InPageBody InnerEdgeDistance
-  syn keyword mpVardef       InnerEdgeWidth InnerMarginDistance InnerMarginWidth
-  syn keyword mpVardef       InnerSpaceWidth LastPageNumber LayoutColumnDistance
-  syn keyword mpVardef       LayoutColumnWidth LayoutColumns LeftEdgeDistance
-  syn keyword mpVardef       LeftEdgeWidth LeftMarginDistance LeftMarginWidth
-  syn keyword mpVardef       LineHeight MakeupHeight MakeupWidth NOfColumns
-  syn keyword mpVardef       NOfPages OnOddPage OnRightPage OuterEdgeDistance
-  syn keyword mpVardef       OuterEdgeWidth OuterMarginDistance OuterMarginWidth
-  syn keyword mpVardef       OuterSpaceWidth OverlayDepth OverlayHeight
-  syn keyword mpVardef       OverlayLineWidth OverlayOffset OverlayWidth
-  syn keyword mpVardef       PageDepth PageFraction PageNumber PageOffset
-  syn keyword mpVardef       PaperBleed PaperHeight PaperWidth PrintPaperHeight
-  syn keyword mpVardef       PrintPaperWidth RealPageNumber RightEdgeDistance
-  syn keyword mpVardef       RightEdgeWidth RightMarginDistance RightMarginWidth
-  syn keyword mpVardef       SpineHeight SpineWidth StrutDepth StrutHeight
-  syn keyword mpVardef       TextHeight TextWidth TopDistance TopHeight TopSkip
-  syn keyword mpVardef       TopSpace VSize defaultcolormodel
-  syn keyword mpVariable     Area BackPage CoverPage CurrentLayout Field
-  syn keyword mpVariable     FrontPage HorPos Hsize Hstep Location Page
-  syn keyword mpVariable     PageStateAvailable RuleDepth RuleDirection
-  syn keyword mpVariable     RuleFactor RuleH RuleHeight RuleOffset RuleOption
-  syn keyword mpVariable     RuleThickness RuleV RuleWidth Spine VerPos Vsize
-  syn keyword mpVariable     Vstep
-  syn keyword mpConstant     context_page
-  " mp-shap.mpiv
-  syn keyword mpDef          drawline drawshape some_shape
-  syn keyword mpDef          start_predefined_shape_definition
-  syn keyword mpDef          stop_predefined_shape_definition
-  syn keyword mpVardef       drawpredefinedline drawpredefinedshape
-  syn keyword mpVardef       some_shape_path
-  syn keyword mpVariable     predefined_shapes predefined_shapes_xradius
-  syn keyword mpVariable     predefined_shapes_xxradius
-  syn keyword mpVariable     predefined_shapes_yradius
-  syn keyword mpVariable     predefined_shapes_yyradius
-  syn keyword mpConstant     context_shap
-  " mp-step.mpiv
-  syn keyword mpDef          initialize_step_variables midbottomboundary
-  syn keyword mpDef          midtopboundary step_begin_cell step_begin_chart
-  syn keyword mpDef          step_cell_ali step_cell_bot step_cell_top
-  syn keyword mpDef          step_cells step_end_cell step_end_chart
-  syn keyword mpDef          step_text_bot step_text_mid step_text_top
-  syn keyword mpDef          step_texts
-  syn keyword mpVariable     cell_distance_x cell_distance_y cell_fill_color
-  syn keyword mpVariable     cell_line_color cell_line_width cell_offset
-  syn keyword mpVariable     chart_align chart_category chart_vertical
-  syn keyword mpVariable     line_distance line_height line_line_color
-  syn keyword mpVariable     line_line_width line_offset nofcells
-  syn keyword mpVariable     text_distance_set text_fill_color text_line_color
-  syn keyword mpVariable     text_line_width text_offset
-  syn keyword mpConstant     context_cell
-  " mp-symb.mpiv
-  syn keyword mpDef          finishglyph prepareglyph
-  syn keyword mpConstant     lefttriangle midbar onebar righttriangle sidebar
-  syn keyword mpConstant     sublefttriangle subrighttriangle twobar
-  " mp-text.mpiv
-  syn keyword mpDef          build_parshape
-  syn keyword mpVardef       found_point
-  syn keyword mpVariable     trace_parshape
-  syn keyword mpConstant     context_text
-  " mp-tool.mpiv
-  syn keyword mpCommand      dump
-  syn keyword mpDef          addbackground b_color beginglyph break centerarrow
-  syn keyword mpDef          clearxy condition data_mpd_file detaileddraw
-  syn keyword mpDef          detailpaths dowithpath draw drawboundary
-  syn keyword mpDef          drawboundingbox drawcontrollines drawcontrolpoints
-  syn keyword mpDef          drawfill draworigin drawpath drawpathonly
-  syn keyword mpDef          drawpathwithpoints drawpoint drawpointlabels
-  syn keyword mpDef          drawpoints drawticks drawwholepath drawxticks
-  syn keyword mpDef          drawyticks endglyph fill finishsavingdata g_color
-  syn keyword mpDef          inner_boundingbox job_name leftarrow loadmodule
-  syn keyword mpDef          midarrowhead naturalizepaths newboolean newcolor
-  syn keyword mpDef          newnumeric newpair newpath newpicture newstring
-  syn keyword mpDef          newtransform normalcolors normaldraw normalfill
-  syn keyword mpDef          normalwithcolor outer_boundingbox pop_boundingbox
-  syn keyword mpDef          popboundingbox popcurrentpicture push_boundingbox
-  syn keyword mpDef          pushboundingbox pushcurrentpicture r_color readfile
-  syn keyword mpDef          recolor redraw refill register_dirty_chars
-  syn keyword mpDef          remapcolor remapcolors remappedcolor reprocess
-  syn keyword mpDef          resetarrows resetcolormap resetdrawoptions
-  syn keyword mpDef          resolvedcolor restroke retext rightarrow savedata
-  syn keyword mpDef          saveoptions scale_currentpicture set_ahlength
-  syn keyword mpDef          set_grid showgrid startplaincompatibility
-  syn keyword mpDef          startsavingdata stopplaincompatibility
-  syn keyword mpDef          stopsavingdata stripe_path_a stripe_path_n undashed
-  syn keyword mpDef          undrawfill untext visualizeddraw visualizedfill
-  syn keyword mpDef          visualizepaths withcolor withgray
-  syn keyword mpDef          xscale_currentpicture xshifted
-  syn keyword mpDef          xyscale_currentpicture yscale_currentpicture
-  syn keyword mpDef          yshifted
-  syn keyword mpVardef       acos acosh anglebetween area arrowhead
-  syn keyword mpVardef       arrowheadonpath arrowpath asciistring asin asinh
-  syn keyword mpVardef       atan basiccolors bbheight bbwidth bcomponent
-  syn keyword mpVardef       blackcolor bottomboundary boundingbox c_phantom
-  syn keyword mpVardef       ccomponent center cleanstring colorcircle
-  syn keyword mpVardef       colordecimals colordecimalslist colorlike colorpart
-  syn keyword mpVardef       colortype complementary complemented copylist cos
-  syn keyword mpVardef       cosh cot cotd curved ddddecimal dddecimal ddecimal
-  syn keyword mpVardef       decorated drawarrowpath epsed exp freedotlabel
-  syn keyword mpVardef       freelabel gcomponent getunstringed grayed greyed
-  syn keyword mpVardef       hsvtorgb infinite innerboundingbox interpolated inv
-  syn keyword mpVardef       invcos inverted invsin invtan laddered leftboundary
-  syn keyword mpVardef       leftpath leftrightpath listsize listtocurves
-  syn keyword mpVardef       listtolines ln log mcomponent new_on_grid
-  syn keyword mpVardef       outerboundingbox paired pen_size penpoint phantom
-  syn keyword mpVardef       pointarrow pow punked rangepath rcomponent
-  syn keyword mpVardef       redecorated repathed rightboundary rightpath
-  syn keyword mpVardef       rotation roundedsquare set_inner_boundingbox
-  syn keyword mpVardef       set_outer_boundingbox setunstringed shapedlist
-  syn keyword mpVardef       simplified sin sinh sortlist sqr straightpath tan
-  syn keyword mpVardef       tand tanh tensecircle thefreelabel topboundary
-  syn keyword mpVardef       tripled undecorated unitvector unspiked unstringed
-  syn keyword mpVardef       whitecolor ycomponent
-  syn keyword mpPrimaryDef   along blownup bottomenlarged cornered crossed
-  syn keyword mpPrimaryDef   enlarged enlonged leftenlarged llenlarged llmoved
-  syn keyword mpPrimaryDef   lrenlarged lrmoved on paralleled randomized
-  syn keyword mpPrimaryDef   randomizedcontrols randomshifted rightenlarged
-  syn keyword mpPrimaryDef   shortened sized smoothed snapped softened squeezed
-  syn keyword mpPrimaryDef   stretched superellipsed topenlarged ulenlarged
-  syn keyword mpPrimaryDef   ulmoved uncolored urenlarged urmoved xsized
-  syn keyword mpPrimaryDef   xstretched xyscaled xysized ysized ystretched zmod
-  syn keyword mpSecondaryDef anglestriped intersection_point numberstriped
-  syn keyword mpSecondaryDef peepholed
-  syn keyword mpTertiaryDef  cutends
-  syn keyword mpNewInternal  ahdimple ahvariant anglelength anglemethod
-  syn keyword mpNewInternal  angleoffset charscale cmykcolormodel graycolormodel
-  syn keyword mpNewInternal  greycolormodel maxdimensions metapostversion
-  syn keyword mpNewInternal  nocolormodel rgbcolormodel striped_normal_inner
-  syn keyword mpNewInternal  striped_normal_outer striped_reverse_inner
-  syn keyword mpNewInternal  striped_reverse_outer
-  syn keyword mpType         grayscale greyscale quadruplet triplet
-  syn keyword mpVariable     ahfactor collapse_data color_map drawoptionsfactor
-  syn keyword mpVariable     freedotlabelsize freelabeloffset grid grid_full
-  syn keyword mpVariable     grid_h grid_left grid_nx grid_ny grid_w grid_x
-  syn keyword mpVariable     grid_y intersection_found originlength
-  syn keyword mpVariable     plain_compatibility_data pointlabelfont
-  syn keyword mpVariable     pointlabelscale refillbackground savingdata
-  syn keyword mpVariable     savingdatadone swappointlabels ticklength tickstep
-  syn keyword mpConstant     CRLF DQUOTE PERCENT SPACE bcircle context_tool crlf
-  syn keyword mpConstant     darkblue darkcyan darkgray darkgreen darkmagenta
-  syn keyword mpConstant     darkred darkyellow downtriangle dquote freesquare
-  syn keyword mpConstant     fulldiamond fullsquare fulltriangle lcircle
-  syn keyword mpConstant     lefttriangle lightgray llcircle lltriangle lrcircle
-  syn keyword mpConstant     lrtriangle mpversion nocolor noline oddly
-  syn keyword mpConstant     originpath percent rcircle righttriangle space
-  syn keyword mpConstant     tcircle triangle ulcircle ultriangle unitcircle
-  syn keyword mpConstant     unitdiamond unittriangle uptriangle urcircle
-  syn keyword mpConstant     urtriangle
-endif " MetaFun macros
+  hi def link metafunCommands   Statement
+  hi def link metafunInternals  Identifier
+endif
 
-" Define the default highlighting
+# Define the default highlighting
 hi def link mpTeXdelim     mpPrimitive
 hi def link mpBoolExp      mfBoolExp
 hi def link mpNumExp       mfNumExp
@@ -761,9 +268,6 @@ hi def link mpOnOff        mpPrimitive
 hi def link mpDash         mpPrimitive
 hi def link mpTeXKeyword   Identifier
 
-let b:current_syntax = "mp"
+b:current_syntax = "mp"
 
-let &cpo = s:cpo_sav
-unlet! s:cpo_sav
-
-" vim:sw=2
+# vim: sw=2 fdm=marker

runtime/syntax/plsql.vim

@@ -4,12 +4,13 @@
 " Previous Maintainer: Jeff Lanzarotta (jefflanzarotta at yahoo dot com)
 " Previous Maintainer: C. Laurence Gonsalves (clgonsal@kami.com)
 " URL: https://github.com/lee-lindley/vim_plsql_syntax
-" Last Change: April 28, 2022   
+" Last Change: Aug 21, 2022   
 " History  Lee Lindley (lee dot lindley at gmail dot com)
+"               use get with default 0 instead of exists per Bram suggestion
+"               make procedure folding optional
 "               updated to 19c keywords. refined quoting. 
 "               separated reserved, non-reserved keywords and functions
-"               revised folding, giving up on procedure folding due to issue
-"               with multiple ways to enter <begin>.
+"               revised folding
 "          Eugene Lysyonok (lysyonok at inbox ru)
 "               Added folding.
 "          Geoff Evans & Bill Pribyl (bill at plnet dot org)
@@ -23,12 +24,19 @@
 " To enable folding (It does setlocal foldmethod=syntax)
 " let plsql_fold = 1
 "
+" To disable folding procedure/functions (recommended if you habitually
+"  do not put the method name on the END statement)
+" let plsql_disable_procedure_fold = 1
+"
 "     From my vimrc file -- turn syntax and syntax folding on,
 "     associate file suffixes as plsql, open all the folds on file open
+" syntax enable
 " let plsql_fold = 1
 " au BufNewFile,BufRead *.sql,*.pls,*.tps,*.tpb,*.pks,*.pkb,*.pkg,*.trg set filetype=plsql
 " au BufNewFile,BufRead *.sql,*.pls,*.tps,*.tpb,*.pks,*.pkb,*.pkg,*.trg syntax on
 " au Syntax plsql normal zR
+" au Syntax plsql set foldcolumn=2 "optional if you want to see choosable folds on the left
+
 
 if exists("b:current_syntax")
   finish
@@ -49,12 +57,12 @@ syn match   plsqlIdentifier "[a-z][a-z0-9$_#]*"
 syn match   plsqlHostIdentifier ":[a-z][a-z0-9$_#]*"
 
 " When wanted, highlight the trailing whitespace.
-if exists("plsql_space_errors")
-  if !exists("plsql_no_trail_space_error")
+if get(g:,"plsql_space_errors",0) == 1
+  if get(g:,"plsql_no_trail_space_error",0) == 0
     syn match plsqlSpaceError "\s\+$"
   endif
 
-  if !exists("plsql_no_tab_space_error")
+  if get(g:,"plsql_no_tab_space_error",0) == 0
     syn match plsqlSpaceError " \+\t"me=e-1
   endif
 endif
@@ -134,7 +142,8 @@ syn keyword plsqlKeyword CPU_TIME CRASH CREATE_FILE_DEST CREATE_STORED_OUTLINES
 syn keyword plsqlKeyword CREDENTIALS CRITICAL CROSS CROSSEDITION CSCONVERT CUBE CUBE_AJ CUBE_GB CUBE_SJ
 syn keyword plsqlKeyword CUME_DIST CUME_DISTM CURRENT CURRENTV CURRENT_DATE CURRENT_INSTANCE CURRENT_PARTSET_KEY
 syn keyword plsqlKeyword CURRENT_SCHEMA CURRENT_SHARD_KEY CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER
-syn keyword plsqlKeyword CURSOR CURSOR_SHARING_EXACT CURSOR_SPECIFIC_SEGMENT CV CYCLE DAGG_OPTIM_GSETS
+syn match plsqlKeyword "\<CURSOR\>"
+syn keyword plsqlKeyword CURSOR_SHARING_EXACT CURSOR_SPECIFIC_SEGMENT CV CYCLE DAGG_OPTIM_GSETS
 syn keyword plsqlKeyword DANGLING DATA DATABASE DATABASES DATAFILE DATAFILES DATAMOVEMENT DATAOBJNO
 syn keyword plsqlKeyword DATAOBJ_TO_MAT_PARTITION DATAOBJ_TO_PARTITION DATAPUMP DATASTORE DATA_LINK_DML
 syn keyword plsqlKeyword DATA_SECURITY_REWRITE_LIMIT DATA_VALIDATE DATE_MODE DAYS DBA DBA_RECYCLEBIN
@@ -515,7 +524,7 @@ syn match   plsqlFunction "\.DELETE\>"hs=s+1
 syn match   plsqlFunction "\.PREV\>"hs=s+1
 syn match   plsqlFunction "\.NEXT\>"hs=s+1
 
-if exists("plsql_legacy_sql_keywords")
+if get(g:,"plsql_legacy_sql_keywords",0) == 1
     " Some of Oracle's SQL keywords.
     syn keyword plsqlSQLKeyword ABORT ACCESS ACCESSED ADD AFTER ALL ALTER AND ANY
     syn keyword plsqlSQLKeyword ASC ATTRIBUTE AUDIT AUTHORIZATION AVG BASE_TABLE
@@ -565,7 +574,7 @@ syn keyword plsqlException SUBSCRIPT_OUTSIDE_LIMIT SYS_INVALID_ROWID
 syn keyword plsqlException TIMEOUT_ON_RESOURCE TOO_MANY_ROWS VALUE_ERROR
 syn keyword plsqlException ZERO_DIVIDE
 
-if exists("plsql_highlight_triggers")
+if get(g:,"plsql_highlight_triggers",0) == 1
     syn keyword plsqlTrigger INSERTING UPDATING DELETING
 endif
 
@@ -576,7 +585,7 @@ syn match plsqlISAS "\<\(IS\|AS\)\>"
 
 " Various types of comments.
 syntax region plsqlCommentL start="--" skip="\\$" end="$" keepend extend contains=@plsqlCommentGroup,plsqlSpaceError
-if exists("plsql_fold")
+if get(g:,"plsql_fold",0) == 1
     syntax region plsqlComment
         \ start="/\*" end="\*/"
         \ extend
@@ -612,7 +621,7 @@ syn region plsqlQuotedIdentifier	matchgroup=plsqlOperator start=+n\?"+     end=+
 syn cluster plsqlIdentifiers contains=plsqlIdentifier,plsqlQuotedIdentifier
 
 " quoted string literals
-if exists("plsql_fold")
+if get(g:,"plsql_fold",0) == 1
     syn region plsqlStringLiteral	matchgroup=plsqlOperator start=+n\?'+  skip=+''+    end=+'+ fold keepend extend
     syn region plsqlStringLiteral	matchgroup=plsqlOperator start=+n\?q'\z([^[(<{]\)+    end=+\z1'+ fold keepend extend
     syn region plsqlStringLiteral	matchgroup=plsqlOperator start=+n\?q'<+   end=+>'+ fold keepend extend
@@ -639,10 +648,10 @@ syn match plsqlAttribute "%\(BULK_EXCEPTIONS\|BULK_ROWCOUNT\|ISOPEN\|FOUND\|NOTF
 " This'll catch mis-matched close-parens.
 syn cluster plsqlParenGroup contains=plsqlParenError,@plsqlCommentGroup,plsqlCommentSkip,plsqlIntLiteral,plsqlFloatLiteral,plsqlNumbersCom
 
-if exists("plsql_bracket_error")
+if get(g:,"plsql_bracket_error",0) == 1
     " I suspect this code was copied from c.vim and never properly considered. Do
     " we even use braces or brackets in sql or pl/sql?
-    if exists("plsql_fold")
+    if get(g:,"plsql_fold",0) == 1
         syn region plsqlParen start='(' end=')' contains=ALLBUT,@plsqlParenGroup,plsqlErrInBracket fold keepend extend transparent
     else
         syn region plsqlParen transparent start='(' end=')' contains=ALLBUT,@plsqlParenGroup,plsqlErrInBracket
@@ -652,7 +661,7 @@ if exists("plsql_bracket_error")
     syn region plsqlBracket transparent start='\[' end=']' contains=ALLBUT,@plsqlParenGroup,plsqlErrInParen
     syn match plsqlErrInBracket contained "[);{}]"
 else
-    if exists("plsql_fold")
+    if get(g:,"plsql_fold",0) == 1
         syn region plsqlParen start='(' end=')' contains=ALLBUT,@plsqlParenGroup,plsqlErrInParen fold keepend extend transparent
     else
         syn region plsqlParen transparent start='(' end=')' contains=ALLBUT,@plsqlParenGroup,plsqlErrInParen
@@ -673,12 +682,12 @@ syn match plsqlConditional "\<END\>\_s\+\<IF\>"
 syn match plsqlCase "\<END\>\_s\+\<CASE\>"
 syn match plsqlCase "\<CASE\>"
 
-if exists("plsql_fold")
+if get(g:,"plsql_fold",0) == 1
     setlocal foldmethod=syntax
     syn sync fromstart
 
     syn cluster plsqlProcedureGroup contains=plsqlProcedure
-    syn cluster plsqlOnlyGroup contains=@plsqlProcedure,plsqlConditionalBlock,plsqlLoopBlock,plsqlBlock
+    syn cluster plsqlOnlyGroup contains=@plsqlProcedure,plsqlConditionalBlock,plsqlLoopBlock,plsqlBlock,plsqlCursor
 
     syntax region plsqlUpdateSet
         \ start="\(\<update\>\_s\+\(\<set\>\)\@![a-z][a-z0-9$_#]*\_s\+\(\(\<set\>\)\@![a-z][a-z0-9$_#]*\_s\+\)\?\)\|\(\<when\>\_s\+\<matched\>\_s\+\<then\>\_s\+\<update\>\_s\+\)\<set\>"
@@ -698,24 +707,40 @@ if exists("plsql_fold")
         \ transparent
         \ contains=ALLBUT,@plsqlOnlyGroup,plsqlUpdateSet
 
-    " this is brute force and requires you have the procedure/function name in the END
-    " statement. ALthough Oracle makes it optional, we cannot. If you do not
-    " have it, then you can fold the BEGIN/END block of the procedure but not
-    " the specification of it (other than a paren group). You also cannot fold
-    " BEGIN/END blocks in the procedure body. Local procedures will fold as
-    " long as the END statement includes the procedure/function name.
-    " As for why we cannot make it work any other way, I don't know. It is
-    " something to do with both plsqlBlock and plsqlProcedure both consuming BEGIN and END,
-    " even if we use a lookahead for one of them.
-    syntax region plsqlProcedure
-        "\ start="\(create\(\_s\+or\_s\+replace\)\?\_s\+\)\?\<\(procedure\|function\)\>\_s\+\z([a-z][a-z0-9$_#]*\)"
-        \ start="\<\(procedure\|function\)\>\_s\+\(\z([a-z][a-z0-9$_#]*\)\)\([^;]\|\n\)\{-}\<\(is\|as\)\>\_.\{-}\(\<end\>\_s\+\2\_s*;\)\@="
-        \ end="\<end\>\_s\+\z1\_s*;"
+    if get(g:,"plsql_disable_procedure_fold",0) == 0
+        " this is brute force and requires you have the procedure/function name in the END
+        " statement. ALthough Oracle makes it optional, we cannot. If you do not
+        " have it, then you can fold the BEGIN/END block of the procedure but not
+        " the specification of it (other than a paren group). You also cannot fold
+        " BEGIN/END blocks in the procedure body. Local procedures will fold as
+        " long as the END statement includes the procedure/function name.
+        " As for why we cannot make it work any other way, I don't know. It is
+        " something to do with both plsqlBlock and plsqlProcedure both consuming BEGIN and END,
+        " even if we use a lookahead for one of them.
+        "
+        " If you habitualy do not put the method name in the END statement,
+        " this can be expensive because it searches to end of file on every
+        " procedure/function declaration
+        "
+            "\ start="\(create\(\_s\+or\_s\+replace\)\?\_s\+\)\?\<\(procedure\|function\)\>\_s\+\z([a-z][a-z0-9$_#]*\)"
+        syntax region plsqlProcedure
+            \ start="\<\(procedure\|function\)\>\_s\+\(\z([a-z][a-z0-9$_#]*\)\)\([^;]\|\n\)\{-}\<\(is\|as\)\>\_.\{-}\(\<end\>\_s\+\2\_s*;\)\@="
+            \ end="\<end\>\_s\+\z1\_s*;"
+            \ fold
+            \ keepend 
+            \ extend
+            \ transparent
+            \ contains=ALLBUT,plsqlBlock
+    endif
+
+    syntax region plsqlCursor
+        \ start="\<cursor\>\_s\+[a-z][a-z0-9$_#]*\(\_s*([^)]\+)\)\?\(\_s\+return\_s\+\S\+\)\?\_s\+is"
+        \ end=";"
         \ fold
         \ keepend 
         \ extend
         \ transparent
-        \ contains=ALLBUT,plsqlBlock
+        \ contains=ALLBUT,@plsqlOnlyGroup
 
     syntax region plsqlBlock
         \ start="\<begin\>"
@@ -802,7 +827,7 @@ hi def link plsqlTrigger	        Function
 hi def link plsqlTypeAttribute      StorageClass
 hi def link plsqlTodo		        Todo
 " to be able to change them after loading, need override whether defined or not
-if exists("plsql_legacy_sql_keywords")
+if get(g:,"plsql_legacy_sql_keywords",0) == 1
     hi link plsqlSQLKeyword         Function
     hi link plsqlSymbol	            Normal
     hi link plsqlParen	            Normal

runtime/syntax/racket.vim

@@ -0,0 +1,656 @@
+" Vim syntax file
+" Language:             Racket
+" Maintainer:           D. Ben Knoble <ben.knoble+github@gmail.com>
+" Previous Maintainer:  Will Langstroth <will@langstroth.com>
+" URL:                  https://github.com/benknoble/vim-racket
+" Description:          Contains all of the keywords in #lang racket
+" Last Change: 2022 Aug 12
+
+" Initializing:
+if exists("b:current_syntax")
+  finish
+endif
+
+" Highlight unmatched parens
+syntax match racketError ,[]})],
+
+if version < 800
+  set iskeyword=33,35-39,42-58,60-90,94,95,97-122,126,_
+else
+  " syntax iskeyword 33,35-39,42-58,60-90,94,95,97-122,126,_
+  " converted from decimal to char
+  " :s/\d\+/\=submatch(0)->str2nr()->nr2char()/g
+  " but corrected to remove duplicate _, move ^ to end
+  syntax iskeyword @,!,#-',*-:,<-Z,a-z,~,_,^
+  " expanded
+  " syntax iskeyword !,#,$,%,&,',*,+,,,-,.,/,0-9,:,<,=,>,?,@,A-Z,_,a-z,~,^
+endif
+
+" Forms in order of appearance at
+" http://docs.racket-lang.org/reference/index.html
+"
+syntax keyword racketSyntax module module* module+ require provide quote
+syntax keyword racketSyntax #%datum #%expression #%top #%variable-reference #%app
+syntax keyword racketSyntax lambda case-lambda let let* letrec
+syntax keyword racketSyntax let-values let*-values let-syntax letrec-syntax
+syntax keyword racketSyntax let-syntaxes letrec-syntaxes letrec-syntaxes+values
+syntax keyword racketSyntax local shared
+syntax keyword racketSyntax if cond and or case define else =>
+syntax keyword racketSyntax define define-values define-syntax define-syntaxes
+syntax keyword racketSyntax define-for-syntax define-require-syntax define-provide-syntax
+syntax keyword racketSyntax define-syntax-rule
+syntax keyword racketSyntax define-record-type
+syntax keyword racketSyntax begin begin0
+syntax keyword racketSyntax begin-for-syntax
+syntax keyword racketSyntax when unless
+syntax keyword racketSyntax set! set!-values
+syntax keyword racketSyntax for for/list for/vector for/hash for/hasheq for/hasheqv
+syntax keyword racketSyntax for/and for/or for/lists for/first
+syntax keyword racketSyntax for/last for/fold
+syntax keyword racketSyntax for* for*/list for*/vector for*/hash for*/hasheq for*/hasheqv
+syntax keyword racketSyntax for*/and for*/or for*/lists for*/first
+syntax keyword racketSyntax for*/last for*/fold
+syntax keyword racketSyntax for/fold/derived for*/fold/derived
+syntax keyword racketSyntax define-sequence-syntax :do-in do
+syntax keyword racketSyntax with-continuation-mark
+syntax keyword racketSyntax quasiquote unquote unquote-splicing quote-syntax
+syntax keyword racketSyntax #%top-interaction
+syntax keyword racketSyntax define-package open-package package-begin
+syntax keyword racketSyntax define* define*-values define*-syntax define*-syntaxes open*-package
+syntax keyword racketSyntax package? package-exported-identifiers package-original-identifiers
+syntax keyword racketSyntax block #%stratified-body
+
+" 8 Contracts
+" 8.2 Function contracts
+syntax keyword racketSyntax -> ->* ->i ->d case-> dynamic->* unconstrained-domain->
+
+" 8.6.1 Nested Contract Boundaries
+syntax keyword racketSyntax with-contract define/contract define-struct/contract
+syntax keyword racketSyntax invariant-assertion current-contract-region
+
+" 9 Pattern Matching
+syntax keyword racketSyntax match match* match/values define/match
+syntax keyword racketSyntax match-lambda match-lambda* match-lambda**
+syntax keyword racketSyntax match-let match-let* match-let-values match-let*-values
+syntax keyword racketSyntax match-letrec match-define match-define-values
+
+" 10.2.3 Handling Exceptions
+syntax keyword racketSyntax with-handlers with-handlers*
+
+" 10.4 Continuations
+syntax keyword racketSyntax let/cc let/ec
+
+" 10.4.1 Additional Control Operators
+syntax keyword racketSyntax % prompt control prompt-at control-at reset shift
+syntax keyword racketSyntax reset-at shift-at prompt0 reset0 control0 shift0
+syntax keyword racketSyntax prompt0-at reset0-at control0-at shift0-at
+syntax keyword racketSyntax set cupto
+
+" 11.3.2 Parameters
+syntax keyword racketSyntax parameterize parameterize*
+
+" 12.5 Writing
+syntax keyword racketSyntax write display displayln print
+syntax keyword racketSyntax fprintf printf eprintf format
+syntax keyword racketSyntax print-pair-curly-braces print-mpair-curly-braces print-unreadable
+syntax keyword racketSyntax print-graph print-struct print-box print-vector-length print-hash-table
+syntax keyword racketSyntax print-boolean-long-form print-reader-abbreviations print-as-expression print-syntax-width
+syntax keyword racketSyntax current-write-relative-directory port-write-handler port-display-handler
+syntax keyword racketSyntax port-print-handler global-port-print-handler
+
+" 13.7 Custodians
+syntax keyword racketSyntax custodian? custodian-memory-accounting-available? custodian-box?
+syntax keyword racketSyntax make-custodian custodian-shutdown-all current-custodian custodian-managed-list
+syntax keyword racketSyntax custodian-require-memory custodian-limit-memory
+syntax keyword racketSyntax make-custodian-box custodian-box-value
+
+" lambda sign
+syntax match racketSyntax /\<[\u03bb]\>/
+
+
+" Functions ==================================================================
+
+syntax keyword racketFunc boolean? not equal? eqv? eq? equal?/recur immutable?
+syntax keyword racketFunc true false symbol=? boolean=? false?
+syntax keyword racketFunc number? complex? real? rational? integer?
+syntax keyword racketFunc exact-integer? exact-nonnegative-integer?
+syntax keyword racketFunc exact-positive-integer? inexact-real?
+syntax keyword racketFunc fixnum? flonum? zero? positive? negative?
+syntax keyword racketFunc even? odd? exact? inexact?
+syntax keyword racketFunc inexact->exact exact->inexact
+
+" 3.2.2 General Arithmetic
+
+" 3.2.2.1 Arithmetic
+syntax keyword racketFunc + - * / quotient remainder quotient/remainder modulo
+syntax keyword racketFunc add1 sub1 abs max min gcd lcm round exact-round floor
+syntax keyword racketFunc ceiling truncate numerator denominator rationalize
+
+" 3.2.2.2 Number Comparison
+syntax keyword racketFunc = < <= > >=
+
+" 3.2.2.3 Powers and Roots
+syntax keyword racketFunc sqrt integer-sqrt integer-sqrt/remainder
+syntax keyword racketFunc expt exp log
+
+" 3.2.2.3 Trigonometric Functions
+syntax keyword racketFunc sin cos tan asin acos atan
+
+" 3.2.2.4 Complex Numbers
+syntax keyword racketFunc make-rectangular make-polar
+syntax keyword racketFunc real-part imag-part magnitude angle
+syntax keyword racketFunc bitwise-ior bitwise-and bitwise-xor bitwise-not
+syntax keyword racketFunc bitwise-bit-set? bitwise-bit-field arithmetic-shift
+syntax keyword racketFunc integer-length
+
+" 3.2.2.5 Random Numbers
+syntax keyword racketFunc random random-seed
+syntax keyword racketFunc make-pseudo-random-generator pseudo-random-generator?
+syntax keyword racketFunc current-pseudo-random-generator pseudo-random-generator->vector
+syntax keyword racketFunc vector->pseudo-random-generator vector->pseudo-random-generator!
+
+" 3.2.2.8 Number-String Conversions
+syntax keyword racketFunc number->string string->number real->decimal-string
+syntax keyword racketFunc integer->integer-bytes
+syntax keyword racketFunc floating-point-bytes->real real->floating-point-bytes
+syntax keyword racketFunc system-big-endian?
+
+" 3.2.2.9 Extra Constants and Functions
+syntax keyword racketFunc pi sqr sgn conjugate sinh cosh tanh order-of-magnitude
+
+" 3.2.3 Flonums
+
+" 3.2.3.1 Flonum Arithmetic
+syntax keyword racketFunc fl+ fl- fl* fl/ flabs
+syntax keyword racketFunc fl= fl< fl> fl<= fl>= flmin flmax
+syntax keyword racketFunc flround flfloor flceiling fltruncate
+syntax keyword racketFunc flsin flcos fltan flasin flacos flatan
+syntax keyword racketFunc fllog flexp flsqrt
+syntax keyword racketFunc ->fl fl->exact-integer make-flrectangular
+syntax keyword racketFunc flreal-part flimag-part
+
+" 3.2.3.2 Flonum Vectors
+syntax keyword racketFunc flvector? flvector make-flvector flvector-length
+syntax keyword racketFunc flvector-ref flvector-set! flvector-copy in-flvector
+syntax keyword racketFunc shared-flvector make-shared-flvector
+syntax keyword racketSyntax for/flvector for*/flvector
+
+" 3.2.4 Fixnums
+syntax keyword racketFunc fx+ fx- fx* fxquotient fxremainder fxmodulo fxabs
+syntax keyword racketFunc fxand fxior fxxor fxnot fxlshift fxrshift
+syntax keyword racketFunc fx= fx< fx> fx<= fx>= fxmin fxmax fx->fl fl->fx
+
+" 3.2.4.2 Fixnum Vectors
+syntax keyword racketFunc fxvector? fxvector make-fxvector fxvector-length
+syntax keyword racketFunc fxvector-ref fxvector-set! fxvector-copy in-fxvector
+syntax keyword racketFunc for/fxvector for*/fxvector
+syntax keyword racketFunc shared-fxvector make-shared-fxvector
+
+" 3.3 Strings
+syntax keyword racketFunc string? make-string string string->immutable-string string-length
+syntax keyword racketFunc string-ref string-set! substring string-copy string-copy!
+syntax keyword racketFunc string-fill! string-append string->list list->string
+syntax keyword racketFunc build-string string=? string<? string<=? string>? string>=?
+syntax keyword racketFunc string-ci=? string-ci<? string-ci<=? string-ci>? string-ci>=?
+syntax keyword racketFunc string-upcase string-downcase string-titlecase string-foldcase
+syntax keyword racketFunc string-normalize-nfd string-normalize-nfc string-normalize-nfkc
+syntax keyword racketFunc string-normalize-spaces string-trim
+syntax keyword racketFunc string-locale=? string-locale>? string-locale<?
+syntax keyword racketFunc string-locale-ci=? string-locale<=?
+syntax keyword racketFunc string-locale-upcase string-locale-downcase
+syntax keyword racketFunc string-append* string-join
+
+" 3.4 Bytestrings
+syntax keyword racketFunc bytes? make-bytes bytes bytes->immutable-bytes byte?
+syntax keyword racketFunc bytes-length bytes-ref bytes-set! subbytes bytes-copy
+syntax keyword racketFunc bytes-copy! bytes-fill! bytes-append bytes->list list->bytes
+syntax keyword racketFunc make-shared-bytes shared-bytes
+syntax keyword racketFunc bytes=? bytes<? bytes>?
+syntax keyword racketFunc bytes->string/utf-8 bytes->string/latin-1
+syntax keyword racketFunc string->bytes/locale string->bytes/latin-1 string->bytes/utf-8
+syntax keyword racketFunc string-utf-8-length bytes-utf8-ref bytes-utf-8-index
+syntax keyword racketFunc bytes-open-converter bytes-close-converter
+syntax keyword racketFunc bytes-convert bytes-convert-end bytes-converter?
+syntax keyword racketFunc locale-string-encoding
+
+" 3.5 Characters
+syntax keyword racketFunc char? char->integer integer->char
+syntax keyword racketFunc char=? char<? char<=? char>? char>=?
+syntax keyword racketFunc char-ci=? char-ci<? char-ci<=? char-ci>? char-ci>=?
+syntax keyword racketFunc char-alphabetic? char-lower-case? char-upper-case? char-title-case?
+syntax keyword racketFunc char-numeric? char-symbolic? char-punctuation? char-graphic?
+syntax keyword racketFunc char-whitespace? char-blank?
+syntax keyword racketFunc char-iso-control? char-general-category
+syntax keyword racketFunc make-known-char-range-list
+syntax keyword racketFunc char-upcase char-downcase char-titlecase char-foldcase
+
+" 3.6 Symbols
+syntax keyword racketFunc symbol? symbol-interned? symbol-unreadable?
+syntax keyword racketFunc symbol->string string->symbol
+syntax keyword racketFunc string->uninterned-symbol string->unreadable-symbol
+syntax keyword racketFunc gensym
+
+" 3.7 Regular Expressions
+syntax keyword racketFunc regexp? pregexp? byte-regexp? byte-pregexp?
+syntax keyword racketFunc regexp pregexp byte-regexp byte-pregexp
+syntax keyword racketFunc regexp-quote regexp-match regexp-match*
+syntax keyword racketFunc regexp-try-match regexp-match-positions
+syntax keyword racketFunc regexp-match-positions* regexp-match?
+syntax keyword racketFunc regexp-match-peek-positions regexp-match-peek-immediate
+syntax keyword racketFunc regexp-match-peek regexp-match-peek-positions*
+syntax keyword racketFunc regexp-match/end regexp-match-positions/end
+syntax keyword racketFunc regexp-match-peek-positions-immediat/end
+syntax keyword racketFunc regexp-split regexp-replace regexp-replace*
+syntax keyword racketFunc regexp-replace-quote
+
+" 3.8 Keywords
+syntax keyword racketFunc keyword? keyword->string string->keyword keyword<?
+
+" 3.9 Pairs and Lists
+syntax keyword racketFunc pair? null? cons car cdr null
+syntax keyword racketFunc list? list list* build-list length
+syntax keyword racketFunc list-ref list-tail append reverse map andmap ormap
+syntax keyword racketFunc for-each foldl foldr filter remove remq remv remove*
+syntax keyword racketFunc remq* remv* sort member memv memq memf
+syntax keyword racketFunc findf assoc assv assq assf
+syntax keyword racketFunc caar cadr cdar cddr caaar caadr cadar caddr cdaar
+syntax keyword racketFunc cddar cdddr caaaar caaadr caadar caaddr cadadr caddar
+syntax keyword racketFunc cadddr cdaaar cdaadr cdadar cddaar cdddar cddddr
+
+" 3.9.7 Additional List Functions and Synonyms
+" (require racket/list)
+syntax keyword racketFunc empty cons? empty? first rest
+syntax keyword racketFunc second third fourth fifth sixth seventh eighth ninth tenth
+syntax keyword racketFunc last last-pair make-list take drop split-at
+syntax keyword racketFunc take-right drop-right split-at-right add-between
+syntax keyword racketFunc append* flatten remove-duplicates filter-map
+syntax keyword racketFunc count partition append-map filter-not shuffle
+syntax keyword racketFunc argmin argmax make-reader-graph placeholder? make-placeholder
+syntax keyword racketFunc placeholder-set! placeholder-get hash-placeholder?
+syntax keyword racketFunc make-hash-placeholder make-hasheq-placeholder
+syntax keyword racketFunc make-hasheqv-placeholder make-immutable-hasheqv
+
+" 3.10 Mutable Pairs and Lists
+syntax keyword racketFunc mpair? mcons mcar mcdr
+
+" 3.11 Vectors
+syntax keyword racketFunc vector?  make-vector vector vector-immutable vector-length
+syntax keyword racketFunc vector-ref vector-set!  vector->list list->vector
+syntax keyword racketFunc vector->immutable-vector vector-fill!  vector-copy!
+syntax keyword racketFunc vector->values build-vector vector-set*!  vector-map
+syntax keyword racketFunc vector-map!  vector-append vector-take vector-take-right
+syntax keyword racketFunc vector-drop vector-drop-right vector-split-at
+syntax keyword racketFunc vector-split-at-right vector-copy vector-filter
+syntax keyword racketFunc vector-filter-not vector-count vector-argmin vector-argmax
+syntax keyword racketFunc vector-member vector-memv vector-memq
+
+" 3.12 Boxes
+syntax keyword racketFunc box?  box box-immutable unbox set-box!
+
+" 3.13 Hash Tables
+syntax keyword racketFunc hash? hash-equal? hash-eqv? hash-eq? hash-weak? hash
+syntax keyword racketFunc hasheq hasheqv
+syntax keyword racketFunc make-hash make-hasheqv make-hasheq make-weak-hash make-weak-hasheqv
+syntax keyword racketFunc make-weak-hasheq make-immutable-hash make-immutable-hasheqv
+syntax keyword racketFunc make-immutable-hasheq
+syntax keyword racketFunc hash-set! hash-set*! hash-set hash-set* hash-ref hash-ref!
+syntax keyword racketFunc hash-has-key? hash-update! hash-update hash-remove!
+syntax keyword racketFunc hash-remove hash-map hash-keys hash-values
+syntax keyword racketFunc hash->list hash-for-each hash-count
+syntax keyword racketFunc hash-iterate-first hash-iterate-next hash-iterate-key
+syntax keyword racketFunc hash-iterate-value hash-copy eq-hash-code eqv-hash-code
+syntax keyword racketFunc equal-hash-code equal-secondary-hash-code
+
+" 3.15 Dictionaries
+syntax keyword racketFunc dict? dict-mutable? dict-can-remove-keys? dict-can-functional-set?
+syntax keyword racketFunc dict-set! dict-set*! dict-set dict-set* dict-has-key? dict-ref
+syntax keyword racketFunc dict-ref! dict-update! dict-update dict-remove! dict-remove
+syntax keyword racketFunc dict-map dict-for-each dict-count dict-iterate-first dict-iterate-next
+syntax keyword racketFunc dict-iterate-key dict-iterate-value in-dict in-dict-keys
+syntax keyword racketFunc in-dict-values in-dict-pairs dict-keys dict-values
+syntax keyword racketFunc dict->list prop: dict prop: dict/contract dict-key-contract
+syntax keyword racketFunc dict-value-contract dict-iter-contract make-custom-hash
+syntax keyword racketFunc make-immutable-custom-hash make-weak-custom-hash
+
+" 3.16 Sets
+syntax keyword racketFunc set seteqv seteq set-empty? set-count set-member?
+syntax keyword racketFunc set-add set-remove set-union set-intersect set-subtract
+syntax keyword racketFunc set-symmetric-difference set=? subset? proper-subset?
+syntax keyword racketFunc set-map set-for-each set? set-equal? set-eqv? set-eq?
+syntax keyword racketFunc set/c in-set for/set for/seteq for/seteqv for*/set
+syntax keyword racketFunc for*/seteq for*/seteqv list->set list->seteq
+syntax keyword racketFunc list->seteqv set->list
+
+" 3.17 Procedures
+syntax keyword racketFunc procedure? apply compose compose1 procedure-rename procedure->method
+syntax keyword racketFunc keyword-apply procedure-arity procedure-arity?
+syntax keyword racketFunc procedure-arity-includes? procedure-reduce-arity
+syntax keyword racketFunc procedure-keywords make-keyword-procedure
+syntax keyword racketFunc procedure-reduce-keyword-arity procedure-struct-type?
+syntax keyword racketFunc procedure-extract-target checked-procedure-check-and-extract
+syntax keyword racketFunc primitive? primitive-closure? primitive-result-arity
+syntax keyword racketFunc identity const thunk thunk* negate curry curryr
+
+" 3.18 Void
+syntax keyword racketFunc void void?
+
+" 4.1 Defining Structure Types
+syntax keyword racketFunc struct struct-field-index define-struct define-struct define-struct/derived
+
+" 4.2 Creating Structure Types
+syntax keyword racketFunc make-struct-type make-struct-field-accessor make-struct-field-mutator
+
+" 4.3 Structure Type Properties
+syntax keyword racketFunc make-struct-type-property struct-type-property? struct-type-property-accessor-procedure?
+
+" 4.4 Copying and Updating Structures
+syntax keyword racketFunc struct-copy
+
+" 4.5 Structure Utilities
+syntax keyword racketFunc struct->vector struct? struct-type?
+syntax keyword racketFunc struct-constructor-procedure? struct-predicate-procedure? struct-accessor-procedure? struct-mutator-procedure?
+syntax keyword racketFunc prefab-struct-key make-prefab-struct prefab-key->struct-type
+
+" 4.6 Structure Type Transformer Binding
+syntax keyword racketFunc struct-info? check-struct-info? make-struct-info extract-struct-info
+syntax keyword racketFunc struct-auto-info? struct-auto-info-lists
+
+" 5.1 Creating Interfaces
+syntax keyword racketFunc interface interface*
+
+" 5.2 Creating Classes
+syntax keyword racketFunc class* class inspect
+syntax keyword racketFunc init init-field field inherit field init-rest
+syntax keyword racketFunc public public* pubment pubment* public-final public-final*
+syntax keyword racketFunc override override* overment overment* override-final override-final*
+syntax keyword racketFunc augride augride* augment augment* augment-final augment-final*
+syntax keyword racketFunc abstract inherit inherit/super inherit/inner
+syntax keyword racketFunc rename-inner rename-super
+syntax keyword racketFunc define/public define/pubment define/public-final
+syntax keyword racketFunc define/override define/overment define/override-final
+syntax keyword racketFunc define/augride define/augment define/augment-final
+syntax keyword racketFunc private* define/private
+
+" 5.2.3 Methods
+syntax keyword racketFunc class/derived
+syntax keyword racketFunc super inner define-local-member-name define-member-name
+syntax keyword racketFunc member-name-key generate-member-key member-name-key?
+syntax keyword racketFunc member-name-key=? member-name-key-hash-code
+
+" 5.3 Creating Objects
+syntax keyword racketFunc make-object instantiate new
+syntax keyword racketFunc super-make-object super-instantiate super-new
+
+"5.4 Field and Method Access
+syntax keyword racketFunc method-id send send/apply send/keyword-apply dynamic-send send*
+syntax keyword racketFunc get-field set-field! field-bound?
+syntax keyword racketFunc class-field-accessor class-field-mutator
+
+"5.4.3 Generics
+syntax keyword racketFunc generic send-generic make-generic
+
+" 8.1 Data-strucure contracts
+syntax keyword racketFunc flat-contract-with-explanation flat-named-contract
+" TODO where do any/c and none/c `value`s go?
+syntax keyword racketFunc or/c first-or/c and/c not/c =/c </c >/c <=/c >=/c
+syntax keyword racketFunc between/c real-in integer-in char-in natural-number/c
+syntax keyword racketFunc string-len/c printable/c one-of/c symbols vectorof
+syntax keyword racketFunc vector-immutableof vector/c box/c box-immutable/c listof
+syntax keyword racketFunc non-empty-listof list*of cons/c cons/dc list/c *list/c
+syntax keyword racketFunc syntax/c struct/c struct/dc parameter/c
+syntax keyword racketFunc procedure-arity-includes/c hash/c hash/dc channel/c
+syntax keyword racketFunc prompt-tag/c continuation-mark-key/c evt/c promise/c
+syntax keyword racketFunc flat-contract flat-contract-predicate suggest/c
+
+" 9.1 Multiple Values
+syntax keyword racketFunc values call-with-values
+
+" 10.2.2 Raising Exceptions
+syntax keyword racketFunc raise error raise-user-error raise-argument-error
+syntax keyword racketFunc raise-result-error raise-argument-error raise-range-error
+syntax keyword racketFunc raise-type-error raise-mismatch-error raise-arity-error
+syntax keyword racketFunc raise-syntax-error
+
+" 10.2.3 Handling Exceptions
+syntax keyword racketFunc call-with-exception-handler uncaught-exception-handler
+
+" 10.2.4 Configuring Default Handlers
+syntax keyword racketFunc error-escape-handler error-display-handler error-print-width
+syntax keyword racketFunc error-print-context-length error-values->string-handler
+syntax keyword racketFunc error-print-source-location
+
+" 10.2.5 Built-in Exception Types
+syntax keyword racketFunc exn exn:fail exn:fail:contract exn:fail:contract:arity
+syntax keyword racketFunc exn:fail:contract:divide-by-zero exn:fail:contract:non-fixnum-result
+syntax keyword racketFunc exn:fail:contract:continuation exn:fail:contract:variable
+syntax keyword racketFunc exn:fail:syntax exn:fail:syntax:unbound exn:fail:syntax:missing-module
+syntax keyword racketFunc exn:fail:read exn:fail:read:eof exn:fail:read:non-char
+syntax keyword racketFunc exn:fail:filesystem exn:fail:filesystem:exists
+syntax keyword racketFunc exn:fail:filesystem:version exn:fail:filesystem:errno
+syntax keyword racketFunc exn:fail:filesystem:missing-module
+syntax keyword racketFunc exn:fail:network exn:fail:network:errno exn:fail:out-of-memory
+syntax keyword racketFunc exn:fail:unsupported exn:fail:user
+syntax keyword racketFunc exn:break exn:break:hang-up exn:break:terminate
+
+" 10.3 Delayed Evaluation
+syntax keyword racketFunc promise? delay lazy force promise-forced? promise-running?
+
+" 10.3.1 Additional Promise Kinds
+syntax keyword racketFunc delay/name promise/name delay/strict delay/sync delay/thread delay/idle
+
+" 10.4 Continuations
+syntax keyword racketFunc call-with-continuation-prompt abort-current-continuation make-continuation-prompt-tag
+syntax keyword racketFunc default-continuation-prompt-tag call-with-current-continuation call/cc
+syntax keyword racketFunc call-with-composable-continuation call-with-escape-continuation call/ec
+syntax keyword racketFunc call-with-continuation-barrier continuation-prompt-available
+syntax keyword racketFunc continuation? continuation-prompt-tag dynamic-wind
+
+" 10.4.1 Additional Control Operators
+syntax keyword racketFunc call/prompt abort/cc call/comp abort fcontrol spawn splitter new-prompt
+
+" 11.3.2 Parameters
+syntax keyword racketFunc make-parameter make-derived-parameter parameter?
+syntax keyword racketFunc parameter-procedure=? current-parameterization
+syntax keyword racketFunc call-with-parameterization parameterization?
+
+" 14.1.1 Manipulating Paths
+syntax keyword racketFunc path? path-string? path-for-some-system? string->path path->string path->bytes
+syntax keyword racketFunc string->path-element bytes->path-element path-element->string path-element->bytes
+syntax keyword racketFunc path-convention-type system-path-convention-type build-type
+syntax keyword racketFunc build-type/convention-type
+syntax keyword racketFunc absolute-path? relative-path? complete-path?
+syntax keyword racketFunc path->complete-path path->directory-path
+syntax keyword racketFunc resolve-path cleanse-path expand-user-path simplify-path normal-case-path split-path
+syntax keyword racketFunc path-replace-suffix path-add-suffix
+
+" 14.1.2 More Path Utilities
+syntax keyword racketFunc explode-path file-name-from-path filename-extension find-relative-path normalize-path
+syntax keyword racketFunc path-element? path-only simple-form-path some-simple-path->string string->some-system-path
+
+" 15.6 Time
+syntax keyword racketFunc current-seconds current-inexact-milliseconds
+syntax keyword racketFunc seconds->date current-milliseconds
+
+
+syntax match racketDelimiter !\<\.\>!
+
+syntax cluster racketTop contains=racketSyntax,racketFunc,racketDelimiter
+
+syntax match racketConstant  ,\<\*\k\+\*\>,
+syntax match racketConstant  ,\<<\k\+>\>,
+
+" Non-quoted lists, and strings
+syntax region racketStruc matchgroup=racketParen start="("rs=s+1 end=")"re=e-1 contains=@racketTop
+syntax region racketStruc matchgroup=racketParen start="#("rs=s+2 end=")"re=e-1 contains=@racketTop
+syntax region racketStruc matchgroup=racketParen start="{"rs=s+1 end="}"re=e-1 contains=@racketTop
+syntax region racketStruc matchgroup=racketParen start="#{"rs=s+2 end="}"re=e-1 contains=@racketTop
+syntax region racketStruc matchgroup=racketParen start="\["rs=s+1 end="\]"re=e-1 contains=@racketTop
+syntax region racketStruc matchgroup=racketParen start="#\["rs=s+2 end="\]"re=e-1 contains=@racketTop
+
+for lit in ['hash', 'hasheq', 'hasheqv']
+  execute printf('syntax match racketLit "\<%s\>" nextgroup=@racketParen containedin=ALLBUT,.*String,.*Comment', '#'.lit)
+endfor
+
+for lit in ['rx', 'rx#', 'px', 'px#']
+  execute printf('syntax match racketRe "\<%s\>" nextgroup=@racketString containedin=ALLBUT,.*String,.*Comment,', '#'.lit)
+endfor
+
+unlet lit
+
+" Simple literals
+
+" Strings
+
+syntax match racketStringEscapeError "\\." contained display
+
+syntax match racketStringEscape "\\[abtnvfre'"\\]"        contained display
+syntax match racketStringEscape "\\$"                     contained display
+syntax match racketStringEscape "\\\o\{1,3}\|\\x\x\{1,2}" contained display
+
+syntax match racketUStringEscape "\\u\x\{1,4}\|\\U\x\{1,8}" contained display
+syntax match racketUStringEscape "\\u\x\{4}\\u\x\{4}"       contained display
+
+syntax region racketString start=/\%(\\\)\@<!"/ skip=/\\[\\"]/ end=/"/ contains=racketStringEscapeError,racketStringEscape,racketUStringEscape
+syntax region racketString start=/#"/           skip=/\\[\\"]/ end=/"/ contains=racketStringEscapeError,racketStringEscape
+
+if exists("racket_no_string_fold")
+  syn region racketString start=/#<<\z(.*\)$/ end=/^\z1$/
+else
+  syn region racketString start=/#<<\z(.*\)$/ end=/^\z1$/ fold
+endif
+
+
+syntax cluster racketTop  add=racketError,racketConstant,racketStruc,racketString
+
+" Numbers
+
+" anything which doesn't match the below rules, but starts with a #d, #b, #o,
+" #x, #i, or #e, is an error
+syntax match racketNumberError         "\<#[xdobie]\k*"
+
+syntax match racketContainedNumberError   "\<#o\k*[^-+0-7delfinas#./@]\>"
+syntax match racketContainedNumberError   "\<#b\k*[^-+01delfinas#./@]\>"
+syntax match racketContainedNumberError   "\<#[ei]#[ei]"
+syntax match racketContainedNumberError   "\<#[xdob]#[xdob]"
+
+" start with the simpler sorts
+syntax match racketNumber    "\<\(#[dobie]\)\{0,2}[-+]\?\(\d\+\|\d\+#*\.\|\d*\.\d\+\)#*\(/\d\+#*\)\?\([sdlef][-+]\?\d\+#*\)\?\>" contains=racketContainedNumberError
+syntax match racketNumber    "\<\(#[dobie]\)\{0,2}[-+]\?\d\+/\d\+\>" contains=racketContainedNumberError
+syntax match racketNumber    "\<\(#[dobie]\)\{0,2}[-+]\?\d\+/\d\+[-+]\d\+\(/\d\+\)\?i\>" contains=racketContainedNumberError
+
+" different possible ways of expressing complex values
+syntax match racketNumber    "\<\(#[dobie]\)\{0,2}[-+]\(\d\+\|\d\+#*\.\|\d*\.\d\+\)#*\(/\d\+#*\)\?\([sdlef][-+]\?\d\+#*\)\?i\>" contains=racketContainedNumberError
+syntax match racketNumber    "\<\(#[dobie]\)\{0,2}[-+]\?\(\d\+\|\d\+#*\.\|\d*\.\d\+\)#*\(/\d\+#*\)\?\([sdlef][-+]\?\d\+#*\)\?[-+]\(\d\+\|\d\+#*\.\|\d*\.\d\+\)#*\(/\d\+#*\)\?\([sdlef][-+]\?\d\+#*\)\?i\>" contains=racketContainedNumberError
+syntax match racketNumber    "\<\(#[dobie]\)\{0,2}[-+]\(inf\|nan\)\.[0f][-+]\(\d\+\|\d\+#*\.\|\d*\.\d\+\)#*\(/\d\+#*\)\?\([sdlef][-+]\?\d\+#*\)\?i\>" contains=racketContainedNumberError
+syntax match racketNumber    "\<\(#[dobie]\)\{0,2}[-+]\?\(\d\+\|\d\+#*\.\|\d*\.\d\+\)#*\(/\d\+#*\)\?\([sdlef][-+]\?\d\+#*\)\?[-+]\(inf\|nan\)\.[0f]i\>" contains=racketContainedNumberError
+syntax match racketNumber    "\<\(#[dobie]\)\{0,2}[-+]\?\(\d\+\|\d\+#*\.\|\d*\.\d\+\)#*\(/\d\+#*\)\?\([sdlef][-+]\?\d\+#*\)\?@[-+]\?\(\d\+\|\d\+#*\.\|\d*\.\d\+\)#*\(/\d\+#*\)\?\([sdlef][-+]\?\d\+#*\)\?\>" contains=racketContainedNumberError
+syntax match racketNumber    "\<\(#[dobie]\)\{0,2}[-+]\(inf\|nan\)\.[0f]@[-+]\?\(\d\+\|\d\+#*\.\|\d*\.\d\+\)#*\(/\d\+#*\)\?\([sdlef][-+]\?\d\+#*\)\?\>" contains=racketContainedNumberError
+syntax match racketNumber    "\<\(#[dobie]\)\{0,2}[-+]\?\(\d\+\|\d\+#*\.\|\d*\.\d\+\)#*\(/\d\+#*\)\?\([sdlef][-+]\?\d\+#*\)\?@[-+]\(inf\|nan\)\.[0f]\>" contains=racketContainedNumberError
+
+" hex versions of the above (separate because of the different possible exponent markers)
+syntax match racketNumber    "\<\(#x\|#[ei]#x\|#x#[ei]\)[-+]\?\(\x\+\|\x\+#*\.\|\x*\.\x\+\)#*\(/\x\+#*\)\?\([sl][-+]\?\x\+#*\)\?\>"
+syntax match racketNumber    "\<\(#x\|#[ei]#x\|#x#[ei]\)[-+]\?\x\+/\x\+\>"
+syntax match racketNumber    "\<\(#x\|#[ei]#x\|#x#[ei]\)[-+]\?\x\+/\x\+[-+]\x\+\(/\x\+\)\?i\>"
+
+syntax match racketNumber    "\<\(#x\|#[ei]#x\|#x#[ei]\)[-+]\(\x\+\|\x\+#*\.\|\x*\.\x\+\)#*\(/\x\+#*\)\?\([sl][-+]\?\x\+#*\)\?i\>"
+syntax match racketNumber    "\<\(#x\|#[ei]#x\|#x#[ei]\)[-+]\?\(\x\+\|\x\+#*\.\|\x*\.\x\+\)#*\(/\x\+#*\)\?\([sl][-+]\?\x\+#*\)\?[-+]\(\x\+\|\x\+#*\.\|\x*\.\x\+\)#*\(/\x\+#*\)\?\([sl][-+]\?\x\+#*\)\?i\>"
+syntax match racketNumber    "\<\(#x\|#[ei]#x\|#x#[ei]\)[-+]\(inf\|nan\)\.[0f][-+]\(\x\+\|\x\+#*\.\|\x*\.\x\+\)#*\(/\x\+#*\)\?\([sl][-+]\?\x\+#*\)\?i\>"
+syntax match racketNumber    "\<\(#x\|#[ei]#x\|#x#[ei]\)[-+]\?\(\x\+\|\x\+#*\.\|\x*\.\x\+\)#*\(/\x\+#*\)\?\([sl][-+]\?\x\+#*\)\?[-+]\(inf\|nan\)\.[0f]i\>"
+syntax match racketNumber    "\<\(#x\|#[ei]#x\|#x#[ei]\)[-+]\?\(\x\+\|\x\+#*\.\|\x*\.\x\+\)#*\(/\x\+#*\)\?\([sl][-+]\?\x\+#*\)\?@[-+]\?\(\x\+\|\x\+#*\.\|\x*\.\x\+\)#*\(/\x\+#*\)\?\([sl][-+]\?\x\+#*\)\?\>"
+syntax match racketNumber    "\<\(#x\|#[ei]#x\|#x#[ei]\)[-+]\(inf\|nan\)\.[0f]@[-+]\?\(\x\+\|\x\+#*\.\|\x*\.\x\+\)#*\(/\x\+#*\)\?\([sl][-+]\?\x\+#*\)\?\>"
+syntax match racketNumber    "\<\(#x\|#[ei]#x\|#x#[ei]\)[-+]\?\(\x\+\|\x\+#*\.\|\x*\.\x\+\)#*\(/\x\+#*\)\?\([sl][-+]\?\x\+#*\)\?@[-+]\(inf\|nan\)\.[0f]\>"
+
+" these work for any radix
+syntax match racketNumber    "\<\(#[xdobie]\)\{0,2}[-+]\(inf\|nan\)\.[0f]i\?\>" contains=racketContainedNumberError
+syntax match racketNumber    "\<\(#[xdobie]\)\{0,2}[-+]\(inf\|nan\)\.[0f][-+]\(inf\|nan\)\.[0f]i\>" contains=racketContainedNumberError
+syntax match racketNumber    "\<\(#[xdobie]\)\{0,2}[-+]\(inf\|nan\)\.[0f]@[-+]\(inf\|nan\)\.[0f]\>" contains=racketContainedNumberError
+
+syntax keyword racketBoolean  #t #f #true #false #T #F
+
+syntax match racketError   "\<#\\\k*\>"
+
+syntax match racketChar    "\<#\\.\w\@!"
+syntax match racketChar    "\<#\\space\>"
+syntax match racketChar    "\<#\\newline\>"
+syntax match racketChar    "\<#\\return\>"
+syntax match racketChar    "\<#\\null\?\>"
+syntax match racketChar    "\<#\\backspace\>"
+syntax match racketChar    "\<#\\tab\>"
+syntax match racketChar    "\<#\\linefeed\>"
+syntax match racketChar    "\<#\\vtab\>"
+syntax match racketChar    "\<#\\page\>"
+syntax match racketChar    "\<#\\rubout\>"
+syntax match racketChar    "\<#\\\o\{1,3}\>"
+syntax match racketChar    "\<#\\x\x\{1,2}\>"
+syntax match racketChar    "\<#\\u\x\{1,6}\>"
+
+syntax cluster racketTop  add=racketNumber,racketBoolean,racketChar
+
+" Command-line parsing
+syntax keyword racketExtFunc command-line current-command-line-arguments once-any help-labels multi once-each
+
+syntax match racketSyntax    "#lang "
+syntax match racketExtSyntax "#:\k\+"
+
+syntax cluster racketTop  add=racketExtFunc,racketExtSyntax
+
+" syntax quoting, unquoting and quasiquotation
+syntax match racketQuote "#\?['`]"
+
+syntax match racketUnquote "#,"
+syntax match racketUnquote "#,@"
+syntax match racketUnquote ","
+syntax match racketUnquote ",@"
+
+" Comments
+syntax match racketSharpBang "\%^#![ /].*" display
+syntax match racketComment /;.*$/ contains=racketTodo,racketNote,@Spell
+syntax region racketMultilineComment start=/#|/ end=/|#/ contains=racketMultilineComment,racketTodo,racketNote,@Spell
+syntax match racketFormComment "#;" nextgroup=@racketTop
+
+syntax match racketTodo /\C\<\(FIXME\|TODO\|XXX\)\ze:\?\>/ contained
+syntax match racketNote /\CNOTE\ze:\?/ contained
+
+syntax cluster racketTop  add=racketQuote,racketUnquote,racketComment,racketMultilineComment,racketFormComment
+
+" Synchronization and the wrapping up...
+syntax sync match matchPlace grouphere NONE "^[^ \t]"
+" ... i.e. synchronize on a line that starts at the left margin
+
+" Define the default highlighting.
+highlight default link racketSyntax Statement
+highlight default link racketFunc Function
+
+highlight default link racketString String
+highlight default link racketStringEscape Special
+highlight default link racketUStringEscape Special
+highlight default link racketStringEscapeError Error
+highlight default link racketChar Character
+highlight default link racketBoolean Boolean
+
+highlight default link racketNumber Number
+highlight default link racketNumberError Error
+highlight default link racketContainedNumberError Error
+
+highlight default link racketQuote SpecialChar
+highlight default link racketUnquote SpecialChar
+
+highlight default link racketDelimiter Delimiter
+highlight default link racketParen Delimiter
+highlight default link racketConstant Constant
+
+highlight default link racketLit Type
+highlight default link racketRe Type
+
+highlight default link racketComment Comment
+highlight default link racketMultilineComment Comment
+highlight default link racketFormComment SpecialChar
+highlight default link racketSharpBang Comment
+highlight default link racketTodo Todo
+highlight default link racketNote SpecialComment
+highlight default link racketError Error
+
+highlight default link racketExtSyntax Type
+highlight default link racketExtFunc PreProc
+
+let b:current_syntax = "racket"

runtime/syntax/shared/README.txt

@@ -0,0 +1,2 @@
+This directory "runtime/syntax/shared" contains Vim script files that are
+generated or used by more then one syntax file.

runtime/syntax/shared/context-data-context.vim

@@ -0,0 +1,345 @@
+vim9script
+
+# Vim syntax file
+# Language: ConTeXt
+# Automatically generated by mtx-interface (2022-08-12 10:49)
+
+syn keyword contextConstants zerocount minusone minustwo plusone plustwo contained
+syn keyword contextConstants plusthree plusfour plusfive plussix plusseven contained
+syn keyword contextConstants pluseight plusnine plusten pluseleven plustwelve contained
+syn keyword contextConstants plussixteen plusfifty plushundred plusonehundred plustwohundred contained
+syn keyword contextConstants plusfivehundred plusthousand plustenthousand plustwentythousand medcard contained
+syn keyword contextConstants maxcard maxcardminusone zeropoint onepoint halfapoint contained
+syn keyword contextConstants onebasepoint maxcount maxdimen scaledpoint thousandpoint contained
+syn keyword contextConstants points halfpoint zeroskip centeringskip stretchingskip contained
+syn keyword contextConstants shrinkingskip centeringfillskip stretchingfillskip shrinkingfillskip zeromuskip contained
+syn keyword contextConstants onemuskip pluscxxvii pluscxxviii pluscclv pluscclvi contained
+syn keyword contextConstants normalpagebox binaryshiftedten binaryshiftedtwenty binaryshiftedthirty thickermuskip contained
+syn keyword contextConstants directionlefttoright directionrighttoleft endoflinetoken outputnewlinechar emptytoks contained
+syn keyword contextConstants empty undefined prerollrun voidbox emptybox contained
+syn keyword contextConstants emptyvbox emptyhbox bigskipamount medskipamount smallskipamount contained
+syn keyword contextConstants fmtname fmtversion texengine texenginename texengineversion contained
+syn keyword contextConstants texenginefunctionality luatexengine pdftexengine xetexengine unknownengine contained
+syn keyword contextConstants contextformat contextversion contextlmtxmode contextmark mksuffix contained
+syn keyword contextConstants activecatcode bgroup egroup endline conditionaltrue contained
+syn keyword contextConstants conditionalfalse attributeunsetvalue statuswrite uprotationangle rightrotationangle contained
+syn keyword contextConstants downrotationangle leftrotationangle inicatcodes ctxcatcodes texcatcodes contained
+syn keyword contextConstants notcatcodes txtcatcodes vrbcatcodes prtcatcodes nilcatcodes contained
+syn keyword contextConstants luacatcodes tpacatcodes tpbcatcodes xmlcatcodes ctdcatcodes contained
+syn keyword contextConstants rlncatcodes escapecatcode begingroupcatcode endgroupcatcode mathshiftcatcode contained
+syn keyword contextConstants alignmentcatcode endoflinecatcode parametercatcode superscriptcatcode subscriptcatcode contained
+syn keyword contextConstants ignorecatcode spacecatcode lettercatcode othercatcode activecatcode contained
+syn keyword contextConstants commentcatcode invalidcatcode tabasciicode newlineasciicode formfeedasciicode contained
+syn keyword contextConstants endoflineasciicode endoffileasciicode commaasciicode spaceasciicode periodasciicode contained
+syn keyword contextConstants hashasciicode dollarasciicode commentasciicode ampersandasciicode colonasciicode contained
+syn keyword contextConstants backslashasciicode circumflexasciicode underscoreasciicode leftbraceasciicode barasciicode contained
+syn keyword contextConstants rightbraceasciicode tildeasciicode delasciicode leftparentasciicode rightparentasciicode contained
+syn keyword contextConstants lessthanasciicode morethanasciicode doublecommentsignal atsignasciicode exclamationmarkasciicode contained
+syn keyword contextConstants questionmarkasciicode doublequoteasciicode singlequoteasciicode forwardslashasciicode primeasciicode contained
+syn keyword contextConstants hyphenasciicode percentasciicode leftbracketasciicode rightbracketasciicode hsizefrozenparcode contained
+syn keyword contextConstants skipfrozenparcode hangfrozenparcode indentfrozenparcode parfillfrozenparcode adjustfrozenparcode contained
+syn keyword contextConstants protrudefrozenparcode tolerancefrozenparcode stretchfrozenparcode loosenessfrozenparcode lastlinefrozenparcode contained
+syn keyword contextConstants linepenaltyfrozenparcode clubpenaltyfrozenparcode widowpenaltyfrozenparcode displaypenaltyfrozenparcode brokenpenaltyfrozenparcode contained
+syn keyword contextConstants demeritsfrozenparcode shapefrozenparcode linefrozenparcode hyphenationfrozenparcode shapingpenaltyfrozenparcode contained
+syn keyword contextConstants orphanpenaltyfrozenparcode allfrozenparcode mathpenaltyfrozenparcode activemathcharcode activetabtoken contained
+syn keyword contextConstants activeformfeedtoken activeendoflinetoken batchmodecode nonstopmodecode scrollmodecode contained
+syn keyword contextConstants errorstopmodecode bottomlevelgroupcode simplegroupcode hboxgroupcode adjustedhboxgroupcode contained
+syn keyword contextConstants vboxgroupcode vtopgroupcode aligngroupcode noaligngroupcode outputgroupcode contained
+syn keyword contextConstants mathgroupcode discretionarygroupcode insertgroupcode vadjustgroupcode vcentergroupcode contained
+syn keyword contextConstants mathabovegroupcode mathchoicegroupcode alsosimplegroupcode semisimplegroupcode mathshiftgroupcode contained
+syn keyword contextConstants mathleftgroupcode localboxgroupcode splitoffgroupcode splitkeepgroupcode preamblegroupcode contained
+syn keyword contextConstants alignsetgroupcode finrowgroupcode discretionarygroupcode markautomigrationcode insertautomigrationcode contained
+syn keyword contextConstants adjustautomigrationcode preautomigrationcode postautomigrationcode charnodecode hlistnodecode contained
+syn keyword contextConstants vlistnodecode rulenodecode insertnodecode marknodecode adjustnodecode contained
+syn keyword contextConstants ligaturenodecode discretionarynodecode whatsitnodecode mathnodecode gluenodecode contained
+syn keyword contextConstants kernnodecode penaltynodecode unsetnodecode mathsnodecode charifcode contained
+syn keyword contextConstants catifcode numifcode dimifcode oddifcode vmodeifcode contained
+syn keyword contextConstants hmodeifcode mmodeifcode innerifcode voidifcode hboxifcode contained
+syn keyword contextConstants vboxifcode xifcode eofifcode trueifcode falseifcode contained
+syn keyword contextConstants caseifcode definedifcode csnameifcode fontcharifcode overrulemathcontrolcode contained
+syn keyword contextConstants underrulemathcontrolcode radicalrulemathcontrolcode fractionrulemathcontrolcode accentskewhalfmathcontrolcode accentskewapplymathcontrolcode contained
+syn keyword contextConstants applyordinarykernpairmathcontrolcode applyverticalitalickernmathcontrolcode applyordinaryitalickernmathcontrolcode applycharitalickernmathcontrolcode reboxcharitalickernmathcontrolcode contained
+syn keyword contextConstants applyboxeditalickernmathcontrolcode staircasekernmathcontrolcode applytextitalickernmathcontrolcode applyscriptitalickernmathcontrolcode checkspaceitalickernmathcontrolcode contained
+syn keyword contextConstants checktextitalickernmathcontrolcode analyzescriptnucleuscharmathcontrolcode analyzescriptnucleuslistmathcontrolcode analyzescriptnucleusboxmathcontrolcode noligaturingglyphoptioncode contained
+syn keyword contextConstants nokerningglyphoptioncode noexpansionglyphoptioncode noprotrusionglyphoptioncode noleftkerningglyphoptioncode noleftligaturingglyphoptioncode contained
+syn keyword contextConstants norightkerningglyphoptioncode norightligaturingglyphoptioncode noitaliccorrectionglyphoptioncode normalparcontextcode vmodeparcontextcode contained
+syn keyword contextConstants vboxparcontextcode vtopparcontextcode vcenterparcontextcode vadjustparcontextcode insertparcontextcode contained
+syn keyword contextConstants outputparcontextcode alignparcontextcode noalignparcontextcode spanparcontextcode resetparcontextcode contained
+syn keyword contextConstants leftoriginlistanchorcode leftheightlistanchorcode leftdepthlistanchorcode rightoriginlistanchorcode rightheightlistanchorcode contained
+syn keyword contextConstants rightdepthlistanchorcode centeroriginlistanchorcode centerheightlistanchorcode centerdepthlistanchorcode halfwaytotallistanchorcode contained
+syn keyword contextConstants halfwayheightlistanchorcode halfwaydepthlistanchorcode halfwayleftlistanchorcode halfwayrightlistanchorcode negatexlistsigncode contained
+syn keyword contextConstants negateylistsigncode negatelistsigncode fontslantperpoint fontinterwordspace fontinterwordstretch contained
+syn keyword contextConstants fontinterwordshrink fontexheight fontemwidth fontextraspace slantperpoint contained
+syn keyword contextConstants mathexheight mathemwidth interwordspace interwordstretch interwordshrink contained
+syn keyword contextConstants exheight emwidth extraspace mathaxisheight muquad contained
+syn keyword contextConstants startmode stopmode startnotmode stopnotmode startmodeset contained
+syn keyword contextConstants stopmodeset doifmode doifelsemode doifmodeelse doifnotmode contained
+syn keyword contextConstants startmodeset stopmodeset startallmodes stopallmodes startnotallmodes contained
+syn keyword contextConstants stopnotallmodes doifallmodes doifelseallmodes doifallmodeselse doifnotallmodes contained
+syn keyword contextConstants startenvironment stopenvironment environment startcomponent stopcomponent contained
+syn keyword contextConstants component startproduct stopproduct product startproject contained
+syn keyword contextConstants stopproject project starttext stoptext startnotext contained
+syn keyword contextConstants stopnotext startdocument stopdocument documentvariable unexpandeddocumentvariable contained
+syn keyword contextConstants setupdocument presetdocument doifelsedocumentvariable doifdocumentvariableelse doifdocumentvariable contained
+syn keyword contextConstants doifnotdocumentvariable startmodule stopmodule usemodule usetexmodule contained
+syn keyword contextConstants useluamodule setupmodule currentmoduleparameter moduleparameter everystarttext contained
+syn keyword contextConstants everystoptext startTEXpage stopTEXpage enablemode disablemode contained
+syn keyword contextConstants preventmode definemode globalenablemode globaldisablemode globalpreventmode contained
+syn keyword contextConstants pushmode popmode typescriptone typescripttwo typescriptthree contained
+syn keyword contextConstants mathsizesuffix mathordinarycode mathordcode mathoperatorcode mathopcode contained
+syn keyword contextConstants mathbinarycode mathbincode mathrelationcode mathrelcode mathopencode contained
+syn keyword contextConstants mathclosecode mathpunctuationcode mathpunctcode mathovercode mathundercode contained
+syn keyword contextConstants mathinnercode mathradicalcode mathfractioncode mathmiddlecode mathaccentcode contained
+syn keyword contextConstants mathfencedcode mathghostcode mathvariablecode mathactivecode mathvcentercode contained
+syn keyword contextConstants mathconstructcode mathwrappedcode mathbegincode mathendcode mathexplicitcode contained
+syn keyword contextConstants mathdivisioncode mathfactorialcode mathdimensioncode mathexperimentalcode mathtextpunctuationcode contained
+syn keyword contextConstants mathimaginarycode mathdifferentialcode mathexponentialcode mathellipsiscode mathfunctioncode contained
+syn keyword contextConstants mathdigitcode mathalphacode mathboxcode mathchoicecode mathnothingcode contained
+syn keyword contextConstants mathlimopcode mathnolopcode mathunsetcode mathunspacedcode mathallcode contained
+syn keyword contextConstants mathfakecode mathunarycode constantnumber constantnumberargument constantdimen contained
+syn keyword contextConstants constantdimenargument constantemptyargument luastringsep !!bs !!es contained
+syn keyword contextConstants lefttorightmark righttoleftmark lrm rlm bidilre contained
+syn keyword contextConstants bidirle bidipop bidilro bidirlo breakablethinspace contained
+syn keyword contextConstants nobreakspace nonbreakablespace narrownobreakspace zerowidthnobreakspace ideographicspace contained
+syn keyword contextConstants ideographichalffillspace twoperemspace threeperemspace fourperemspace fiveperemspace contained
+syn keyword contextConstants sixperemspace figurespace punctuationspace hairspace enquad contained
+syn keyword contextConstants emquad zerowidthspace zerowidthnonjoiner zerowidthjoiner zwnj contained
+syn keyword contextConstants zwj optionalspace asciispacechar softhyphen Ux contained
+syn keyword contextConstants eUx Umathaccents parfillleftskip parfillrightskip startlmtxmode contained
+syn keyword contextConstants stoplmtxmode startmkivmode stopmkivmode wildcardsymbol normalhyphenationcode contained
+syn keyword contextConstants automatichyphenationcode explicithyphenationcode syllablehyphenationcode uppercasehyphenationcode collapsehyphenationcode contained
+syn keyword contextConstants compoundhyphenationcode strictstarthyphenationcode strictendhyphenationcode automaticpenaltyhyphenationcode explicitpenaltyhyphenationcode contained
+syn keyword contextConstants permitgluehyphenationcode permitallhyphenationcode permitmathreplacehyphenationcode forcecheckhyphenationcode lazyligatureshyphenationcode contained
+syn keyword contextConstants forcehandlerhyphenationcode feedbackcompoundhyphenationcode ignoreboundshyphenationcode partialhyphenationcode completehyphenationcode contained
+syn keyword contextConstants normalizelinenormalizecode parindentskipnormalizecode swaphangindentnormalizecode swapparsshapenormalizecode breakafterdirnormalizecode contained
+syn keyword contextConstants removemarginkernsnormalizecode clipwidthnormalizecode flattendiscretionariesnormalizecode discardzerotabskipsnormalizecode flattenhleadersnormalizecode contained
+syn keyword contextConstants normalizeparnormalizeparcode flattenvleadersnormalizeparcode nopreslackclassoptioncode nopostslackclassoptioncode lefttopkernclassoptioncode contained
+syn keyword contextConstants righttopkernclassoptioncode leftbottomkernclassoptioncode rightbottomkernclassoptioncode lookaheadforendclassoptioncode noitaliccorrectionclassoptioncode contained
+syn keyword contextConstants defaultmathclassoptions checkligatureclassoptioncode checkitaliccorrectionclassoptioncode checkkernpairclassoptioncode flattenclassoptioncode contained
+syn keyword contextConstants omitpenaltyclassoptioncode unpackclassoptioncode raiseprimeclassoptioncode carryoverlefttopkernclassoptioncode carryoverleftbottomkernclassoptioncode contained
+syn keyword contextConstants carryoverrighttopkernclassoptioncode carryoverrightbottomkernclassoptioncode preferdelimiterdimensionsclassoptioncode noligaturingglyphoptioncode nokerningglyphoptioncode contained
+syn keyword contextConstants noleftligatureglyphoptioncode noleftkernglyphoptioncode norightligatureglyphoptioncode norightkernglyphoptioncode noexpansionglyphoptioncode contained
+syn keyword contextConstants noprotrusionglyphoptioncode noitaliccorrectionglyphoptioncode nokerningcode noligaturingcode frozenflagcode contained
+syn keyword contextConstants tolerantflagcode protectedflagcode primitiveflagcode permanentflagcode noalignedflagcode contained
+syn keyword contextConstants immutableflagcode mutableflagcode globalflagcode overloadedflagcode immediateflagcode contained
+syn keyword contextConstants conditionalflagcode valueflagcode instanceflagcode ordmathflattencode binmathflattencode contained
+syn keyword contextConstants relmathflattencode punctmathflattencode innermathflattencode normalworddiscoptioncode preworddiscoptioncode contained
+syn keyword contextConstants postworddiscoptioncode continueifinputfile continuewhenlmtxmode continuewhenmkivmode contained
+syn keyword contextHelpers startsetups stopsetups startxmlsetups stopxmlsetups startluasetups contained
+syn keyword contextHelpers stopluasetups starttexsetups stoptexsetups startrawsetups stoprawsetups contained
+syn keyword contextHelpers startlocalsetups stoplocalsetups starttexdefinition stoptexdefinition starttexcode contained
+syn keyword contextHelpers stoptexcode startcontextcode stopcontextcode startcontextdefinitioncode stopcontextdefinitioncode contained
+syn keyword contextHelpers texdefinition doifelsesetups doifsetupselse doifsetups doifnotsetups contained
+syn keyword contextHelpers setup setups texsetup xmlsetup luasetup contained
+syn keyword contextHelpers directsetup fastsetup copysetups resetsetups doifelsecommandhandler contained
+syn keyword contextHelpers doifcommandhandlerelse doifnotcommandhandler doifcommandhandler newmode setmode contained
+syn keyword contextHelpers resetmode newsystemmode setsystemmode resetsystemmode pushsystemmode contained
+syn keyword contextHelpers popsystemmode globalsetmode globalresetmode globalsetsystemmode globalresetsystemmode contained
+syn keyword contextHelpers booleanmodevalue newcount newdimen newskip newmuskip contained
+syn keyword contextHelpers newbox newtoks newread newwrite newmarks contained
+syn keyword contextHelpers newinsert newattribute newif newlanguage newfamily contained
+syn keyword contextHelpers newfam newhelp then begcsname autorule contained
+syn keyword contextHelpers strippedcsname checkedstrippedcsname nofarguments firstargumentfalse firstargumenttrue contained
+syn keyword contextHelpers secondargumentfalse secondargumenttrue thirdargumentfalse thirdargumenttrue fourthargumentfalse contained
+syn keyword contextHelpers fourthargumenttrue fifthargumentfalse fifthargumenttrue sixthargumentfalse sixthargumenttrue contained
+syn keyword contextHelpers seventhargumentfalse seventhargumenttrue vkern hkern vpenalty contained
+syn keyword contextHelpers hpenalty doglobal dodoglobal redoglobal resetglobal contained
+syn keyword contextHelpers donothing untraceddonothing dontcomplain moreboxtracing lessboxtracing contained
+syn keyword contextHelpers noboxtracing forgetall donetrue donefalse foundtrue contained
+syn keyword contextHelpers foundfalse inlineordisplaymath indisplaymath forcedisplaymath startforceddisplaymath contained
+syn keyword contextHelpers stopforceddisplaymath startpickupmath stoppickupmath reqno forceinlinemath contained
+syn keyword contextHelpers mathortext thebox htdp unvoidbox hfilll contained
+syn keyword contextHelpers vfilll mathbox mathlimop mathnolop mathnothing contained
+syn keyword contextHelpers mathalpha currentcatcodetable defaultcatcodetable catcodetablename newcatcodetable contained
+syn keyword contextHelpers startcatcodetable stopcatcodetable startextendcatcodetable stopextendcatcodetable pushcatcodetable contained
+syn keyword contextHelpers popcatcodetable restorecatcodes setcatcodetable letcatcodecommand defcatcodecommand contained
+syn keyword contextHelpers uedcatcodecommand hglue vglue hfillneg vfillneg contained
+syn keyword contextHelpers hfilllneg vfilllneg ruledhss ruledhfil ruledhfill contained
+syn keyword contextHelpers ruledhfilll ruledhfilneg ruledhfillneg normalhfillneg normalhfilllneg contained
+syn keyword contextHelpers ruledvss ruledvfil ruledvfill ruledvfilll ruledvfilneg contained
+syn keyword contextHelpers ruledvfillneg normalvfillneg normalvfilllneg ruledhbox ruledvbox contained
+syn keyword contextHelpers ruledvtop ruledvcenter ruledmbox ruledhpack ruledvpack contained
+syn keyword contextHelpers ruledtpack ruledhskip ruledvskip ruledkern ruledmskip contained
+syn keyword contextHelpers ruledmkern ruledhglue ruledvglue normalhglue normalvglue contained
+syn keyword contextHelpers ruledpenalty filledhboxb filledhboxr filledhboxg filledhboxc contained
+syn keyword contextHelpers filledhboxm filledhboxy filledhboxk scratchstring scratchstringone contained
+syn keyword contextHelpers scratchstringtwo tempstring scratchcounter globalscratchcounter privatescratchcounter contained
+syn keyword contextHelpers scratchdimen globalscratchdimen privatescratchdimen scratchskip globalscratchskip contained
+syn keyword contextHelpers privatescratchskip scratchmuskip globalscratchmuskip privatescratchmuskip scratchtoks contained
+syn keyword contextHelpers globalscratchtoks privatescratchtoks scratchbox globalscratchbox privatescratchbox contained
+syn keyword contextHelpers scratchmacro scratchmacroone scratchmacrotwo scratchconditiontrue scratchconditionfalse contained
+syn keyword contextHelpers ifscratchcondition scratchconditiononetrue scratchconditiononefalse ifscratchconditionone scratchconditiontwotrue contained
+syn keyword contextHelpers scratchconditiontwofalse ifscratchconditiontwo globalscratchcounterone globalscratchcountertwo globalscratchcounterthree contained
+syn keyword contextHelpers groupedcommand groupedcommandcs triggergroupedcommand triggergroupedcommandcs simplegroupedcommand contained
+syn keyword contextHelpers simplegroupedcommandcs pickupgroupedcommand pickupgroupedcommandcs mathgroupedcommandcs usedbaselineskip contained
+syn keyword contextHelpers usedlineskip usedlineskiplimit availablehsize localhsize setlocalhsize contained
+syn keyword contextHelpers distributedhsize hsizefraction next nexttoken nextbox contained
+syn keyword contextHelpers dowithnextbox dowithnextboxcs dowithnextboxcontent dowithnextboxcontentcs flushnextbox contained
+syn keyword contextHelpers boxisempty boxtostring contentostring prerolltostring givenwidth contained
+syn keyword contextHelpers givenheight givendepth scangivendimensions scratchwidth scratchheight contained
+syn keyword contextHelpers scratchdepth scratchoffset scratchdistance scratchtotal scratchitalic contained
+syn keyword contextHelpers scratchhsize scratchvsize scratchxoffset scratchyoffset scratchhoffset contained
+syn keyword contextHelpers scratchvoffset scratchxposition scratchyposition scratchtopoffset scratchbottomoffset contained
+syn keyword contextHelpers scratchleftoffset scratchrightoffset scratchcounterone scratchcountertwo scratchcounterthree contained
+syn keyword contextHelpers scratchcounterfour scratchcounterfive scratchcountersix scratchdimenone scratchdimentwo contained
+syn keyword contextHelpers scratchdimenthree scratchdimenfour scratchdimenfive scratchdimensix scratchskipone contained
+syn keyword contextHelpers scratchskiptwo scratchskipthree scratchskipfour scratchskipfive scratchskipsix contained
+syn keyword contextHelpers scratchmuskipone scratchmuskiptwo scratchmuskipthree scratchmuskipfour scratchmuskipfive contained
+syn keyword contextHelpers scratchmuskipsix scratchtoksone scratchtokstwo scratchtoksthree scratchtoksfour contained
+syn keyword contextHelpers scratchtoksfive scratchtokssix scratchboxone scratchboxtwo scratchboxthree contained
+syn keyword contextHelpers scratchboxfour scratchboxfive scratchboxsix scratchnx scratchny contained
+syn keyword contextHelpers scratchmx scratchmy scratchunicode scratchmin scratchmax contained
+syn keyword contextHelpers scratchleftskip scratchrightskip scratchtopskip scratchbottomskip doif contained
+syn keyword contextHelpers doifnot doifelse firstinset doifinset doifnotinset contained
+syn keyword contextHelpers doifelseinset doifinsetelse doifelsenextchar doifnextcharelse doifelsenextcharcs contained
+syn keyword contextHelpers doifnextcharcselse doifelsenextoptional doifnextoptionalelse doifelsenextoptionalcs doifnextoptionalcselse contained
+syn keyword contextHelpers doifelsefastoptionalcheck doiffastoptionalcheckelse doifelsefastoptionalcheckcs doiffastoptionalcheckcselse doifelsenextbgroup contained
+syn keyword contextHelpers doifnextbgroupelse doifelsenextbgroupcs doifnextbgroupcselse doifelsenextparenthesis doifnextparenthesiselse contained
+syn keyword contextHelpers doifelseundefined doifundefinedelse doifelsedefined doifdefinedelse doifundefined contained
+syn keyword contextHelpers doifdefined doifelsevalue doifvalue doifnotvalue doifnothing contained
+syn keyword contextHelpers doifsomething doifelsenothing doifnothingelse doifelsesomething doifsomethingelse contained
+syn keyword contextHelpers doifvaluenothing doifvaluesomething doifelsevaluenothing doifvaluenothingelse doifelsedimension contained
+syn keyword contextHelpers doifdimensionelse doifelsenumber doifnumberelse doifnumber doifnotnumber contained
+syn keyword contextHelpers doifelsecommon doifcommonelse doifcommon doifnotcommon doifinstring contained
+syn keyword contextHelpers doifnotinstring doifelseinstring doifinstringelse doifelseassignment doifassignmentelse contained
+syn keyword contextHelpers docheckassignment doifelseassignmentcs doifassignmentelsecs validassignment novalidassignment contained
+syn keyword contextHelpers doiftext doifelsetext doiftextelse doifnottext quitcondition contained
+syn keyword contextHelpers truecondition falsecondition tracingall tracingnone loggingall contained
+syn keyword contextHelpers tracingcatcodes showluatokens aliasmacro removetoks appendtoks contained
+syn keyword contextHelpers prependtoks appendtotoks prependtotoks to endgraf contained
+syn keyword contextHelpers endpar reseteverypar finishpar empty null contained
+syn keyword contextHelpers space quad enspace emspace charspace contained
+syn keyword contextHelpers nbsp crlf obeyspaces obeylines obeytabs contained
+syn keyword contextHelpers obeypages obeyedspace obeyedline obeyedtab obeyedpage contained
+syn keyword contextHelpers normalspace naturalspace controlspace normalspaces ignoretabs contained
+syn keyword contextHelpers ignorelines ignorepages ignoreeofs setcontrolspaces executeifdefined contained
+syn keyword contextHelpers singleexpandafter doubleexpandafter tripleexpandafter dontleavehmode removelastspace contained
+syn keyword contextHelpers removeunwantedspaces keepunwantedspaces removepunctuation ignoreparskip forcestrutdepth contained
+syn keyword contextHelpers onlynonbreakablespace wait writestatus define defineexpandable contained
+syn keyword contextHelpers redefine setmeasure setemeasure setgmeasure setxmeasure contained
+syn keyword contextHelpers definemeasure freezemeasure measure measured directmeasure contained
+syn keyword contextHelpers setquantity setequantity setgquantity setxquantity definequantity contained
+syn keyword contextHelpers freezequantity quantity quantitied directquantity installcorenamespace contained
+syn keyword contextHelpers getvalue getuvalue setvalue setevalue setgvalue contained
+syn keyword contextHelpers setxvalue letvalue letgvalue resetvalue undefinevalue contained
+syn keyword contextHelpers ignorevalue setuvalue setuevalue setugvalue setuxvalue contained
+syn keyword contextHelpers globallet udef ugdef uedef uxdef contained
+syn keyword contextHelpers checked unique getparameters geteparameters getgparameters contained
+syn keyword contextHelpers getxparameters forgetparameters copyparameters getdummyparameters dummyparameter contained
+syn keyword contextHelpers directdummyparameter setdummyparameter letdummyparameter setexpandeddummyparameter usedummystyleandcolor contained
+syn keyword contextHelpers usedummystyleparameter usedummycolorparameter processcommalist processcommacommand quitcommalist contained
+syn keyword contextHelpers quitprevcommalist processaction processallactions processfirstactioninset processallactionsinset contained
+syn keyword contextHelpers unexpanded expanded startexpanded stopexpanded protect contained
+syn keyword contextHelpers unprotect firstofoneargument firstoftwoarguments secondoftwoarguments firstofthreearguments contained
+syn keyword contextHelpers secondofthreearguments thirdofthreearguments firstoffourarguments secondoffourarguments thirdoffourarguments contained
+syn keyword contextHelpers fourthoffourarguments firstoffivearguments secondoffivearguments thirdoffivearguments fourthoffivearguments contained
+syn keyword contextHelpers fifthoffivearguments firstofsixarguments secondofsixarguments thirdofsixarguments fourthofsixarguments contained
+syn keyword contextHelpers fifthofsixarguments sixthofsixarguments firstofoneunexpanded firstoftwounexpanded secondoftwounexpanded contained
+syn keyword contextHelpers firstofthreeunexpanded secondofthreeunexpanded thirdofthreeunexpanded gobbleoneargument gobbletwoarguments contained
+syn keyword contextHelpers gobblethreearguments gobblefourarguments gobblefivearguments gobblesixarguments gobblesevenarguments contained
+syn keyword contextHelpers gobbleeightarguments gobbleninearguments gobbletenarguments gobbleoneoptional gobbletwooptionals contained
+syn keyword contextHelpers gobblethreeoptionals gobblefouroptionals gobblefiveoptionals dorecurse doloop contained
+syn keyword contextHelpers exitloop dostepwiserecurse recurselevel recursedepth dofastloopcs contained
+syn keyword contextHelpers fastloopindex fastloopfinal dowith doloopovermatch doloopovermatched contained
+syn keyword contextHelpers doloopoverlist newconstant setnewconstant setconstant setconstantvalue contained
+syn keyword contextHelpers newconditional settrue setfalse settruevalue setfalsevalue contained
+syn keyword contextHelpers setconditional newmacro setnewmacro newfraction newsignal contained
+syn keyword contextHelpers newboundary dosingleempty dodoubleempty dotripleempty doquadrupleempty contained
+syn keyword contextHelpers doquintupleempty dosixtupleempty doseventupleempty dosingleargument dodoubleargument contained
+syn keyword contextHelpers dotripleargument doquadrupleargument doquintupleargument dosixtupleargument doseventupleargument contained
+syn keyword contextHelpers dosinglegroupempty dodoublegroupempty dotriplegroupempty doquadruplegroupempty doquintuplegroupempty contained
+syn keyword contextHelpers permitspacesbetweengroups dontpermitspacesbetweengroups nopdfcompression maximumpdfcompression normalpdfcompression contained
+syn keyword contextHelpers onlypdfobjectcompression nopdfobjectcompression modulonumber dividenumber getfirstcharacter contained
+syn keyword contextHelpers doifelsefirstchar doiffirstcharelse mathclassvalue startnointerference stopnointerference contained
+syn keyword contextHelpers twodigits threedigits leftorright offinterlineskip oninterlineskip contained
+syn keyword contextHelpers nointerlineskip strut halfstrut quarterstrut depthstrut contained
+syn keyword contextHelpers halflinestrut noheightstrut setstrut strutbox strutht contained
+syn keyword contextHelpers strutdp strutwd struthtdp strutgap begstrut contained
+syn keyword contextHelpers endstrut lineheight leftboundary rightboundary signalcharacter contained
+syn keyword contextHelpers aligncontentleft aligncontentmiddle aligncontentright shiftbox vpackbox contained
+syn keyword contextHelpers hpackbox vpackedbox hpackedbox ordordspacing ordopspacing contained
+syn keyword contextHelpers ordbinspacing ordrelspacing ordopenspacing ordclosespacing ordpunctspacing contained
+syn keyword contextHelpers ordinnerspacing ordfracspacing ordradspacing ordmiddlespacing ordaccentspacing contained
+syn keyword contextHelpers opordspacing opopspacing opbinspacing oprelspacing opopenspacing contained
+syn keyword contextHelpers opclosespacing oppunctspacing opinnerspacing opfracspacing opradspacing contained
+syn keyword contextHelpers opmiddlespacing opaccentspacing binordspacing binopspacing binbinspacing contained
+syn keyword contextHelpers binrelspacing binopenspacing binclosespacing binpunctspacing bininnerspacing contained
+syn keyword contextHelpers binfracspacing binradspacing binmiddlespacing binaccentspacing relordspacing contained
+syn keyword contextHelpers relopspacing relbinspacing relrelspacing relopenspacing relclosespacing contained
+syn keyword contextHelpers relpunctspacing relinnerspacing relfracspacing relradspacing relmiddlespacing contained
+syn keyword contextHelpers relaccentspacing openordspacing openopspacing openbinspacing openrelspacing contained
+syn keyword contextHelpers openopenspacing openclosespacing openpunctspacing openinnerspacing openfracspacing contained
+syn keyword contextHelpers openradspacing openmiddlespacing openaccentspacing closeordspacing closeopspacing contained
+syn keyword contextHelpers closebinspacing closerelspacing closeopenspacing closeclosespacing closepunctspacing contained
+syn keyword contextHelpers closeinnerspacing closefracspacing closeradspacing closemiddlespacing closeaccentspacing contained
+syn keyword contextHelpers punctordspacing punctopspacing punctbinspacing punctrelspacing punctopenspacing contained
+syn keyword contextHelpers punctclosespacing punctpunctspacing punctinnerspacing punctfracspacing punctradspacing contained
+syn keyword contextHelpers punctmiddlespacing punctaccentspacing innerordspacing inneropspacing innerbinspacing contained
+syn keyword contextHelpers innerrelspacing inneropenspacing innerclosespacing innerpunctspacing innerinnerspacing contained
+syn keyword contextHelpers innerfracspacing innerradspacing innermiddlespacing inneraccentspacing fracordspacing contained
+syn keyword contextHelpers fracopspacing fracbinspacing fracrelspacing fracopenspacing fracclosespacing contained
+syn keyword contextHelpers fracpunctspacing fracinnerspacing fracfracspacing fracradspacing fracmiddlespacing contained
+syn keyword contextHelpers fracaccentspacing radordspacing radopspacing radbinspacing radrelspacing contained
+syn keyword contextHelpers radopenspacing radclosespacing radpunctspacing radinnerspacing radfracspacing contained
+syn keyword contextHelpers radradspacing radmiddlespacing radaccentspacing middleordspacing middleopspacing contained
+syn keyword contextHelpers middlebinspacing middlerelspacing middleopenspacing middleclosespacing middlepunctspacing contained
+syn keyword contextHelpers middleinnerspacing middlefracspacing middleradspacing middlemiddlespacing middleaccentspacing contained
+syn keyword contextHelpers accentordspacing accentopspacing accentbinspacing accentrelspacing accentopenspacing contained
+syn keyword contextHelpers accentclosespacing accentpunctspacing accentinnerspacing accentfracspacing accentradspacing contained
+syn keyword contextHelpers accentmiddlespacing accentaccentspacing normalreqno startimath stopimath contained
+syn keyword contextHelpers normalstartimath normalstopimath startdmath stopdmath normalstartdmath contained
+syn keyword contextHelpers normalstopdmath normalsuperscript normalsubscript normalnosuperscript normalnosubscript contained
+syn keyword contextHelpers normalprimescript superscript subscript nosuperscript nosubscript contained
+syn keyword contextHelpers primescript superprescript subprescript nosuperprescript nosubsprecript contained
+syn keyword contextHelpers uncramped cramped mathstyletrigger triggermathstyle triggeredmathstyle contained
+syn keyword contextHelpers mathstylefont mathsmallstylefont mathstyleface mathsmallstyleface mathstylecommand contained
+syn keyword contextHelpers mathpalette mathstylehbox mathstylevbox mathstylevcenter mathstylevcenteredhbox contained
+syn keyword contextHelpers mathstylevcenteredvbox mathtext setmathsmalltextbox setmathtextbox pushmathstyle contained
+syn keyword contextHelpers popmathstyle triggerdisplaystyle triggertextstyle triggerscriptstyle triggerscriptscriptstyle contained
+syn keyword contextHelpers triggeruncrampedstyle triggercrampedstyle triggersmallstyle triggeruncrampedsmallstyle triggercrampedsmallstyle contained
+syn keyword contextHelpers triggerbigstyle triggeruncrampedbigstyle triggercrampedbigstyle luaexpr expelsedoif contained
+syn keyword contextHelpers expdoif expdoifnot expdoifelsecommon expdoifcommonelse expdoifelseinset contained
+syn keyword contextHelpers expdoifinsetelse ctxdirectlua ctxlatelua ctxsprint ctxwrite contained
+syn keyword contextHelpers ctxcommand ctxdirectcommand ctxlatecommand ctxreport ctxlua contained
+syn keyword contextHelpers luacode lateluacode directluacode registerctxluafile ctxloadluafile contained
+syn keyword contextHelpers luaversion luamajorversion luaminorversion ctxluacode luaconditional contained
+syn keyword contextHelpers luaexpanded ctxluamatch startluaparameterset stopluaparameterset luaparameterset contained
+syn keyword contextHelpers definenamedlua obeylualines obeyluatokens startluacode stopluacode contained
+syn keyword contextHelpers startlua stoplua startctxfunction stopctxfunction ctxfunction contained
+syn keyword contextHelpers startctxfunctiondefinition stopctxfunctiondefinition installctxfunction installprotectedctxfunction installprotectedctxscanner contained
+syn keyword contextHelpers installctxscanner resetctxscanner cldprocessfile cldloadfile cldloadviafile contained
+syn keyword contextHelpers cldcontext cldcommand carryoverpar freezeparagraphproperties defrostparagraphproperties contained
+syn keyword contextHelpers setparagraphfreezing forgetparagraphfreezing updateparagraphproperties updateparagraphpenalties updateparagraphdemerits contained
+syn keyword contextHelpers updateparagraphshapes updateparagraphlines lastlinewidth assumelongusagecs Umathbotaccent contained
+syn keyword contextHelpers Umathtopaccent righttolefthbox lefttorighthbox righttoleftvbox lefttorightvbox contained
+syn keyword contextHelpers righttoleftvtop lefttorightvtop rtlhbox ltrhbox rtlvbox contained
+syn keyword contextHelpers ltrvbox rtlvtop ltrvtop autodirhbox autodirvbox contained
+syn keyword contextHelpers autodirvtop leftorrighthbox leftorrightvbox leftorrightvtop lefttoright contained
+syn keyword contextHelpers righttoleft checkedlefttoright checkedrighttoleft synchronizelayoutdirection synchronizedisplaydirection contained
+syn keyword contextHelpers synchronizeinlinedirection dirlre dirrle dirlro dirrlo contained
+syn keyword contextHelpers rtltext ltrtext lesshyphens morehyphens nohyphens contained
+syn keyword contextHelpers dohyphens dohyphencollapsing nohyphencollapsing compounddiscretionary Ucheckedstartdisplaymath contained
+syn keyword contextHelpers Ucheckedstopdisplaymath break nobreak allowbreak goodbreak contained
+syn keyword contextHelpers nospace nospacing dospacing naturalhbox naturalvbox contained
+syn keyword contextHelpers naturalvtop naturalhpack naturalvpack naturaltpack reversehbox contained
+syn keyword contextHelpers reversevbox reversevtop reversehpack reversevpack reversetpack contained
+syn keyword contextHelpers hcontainer vcontainer tcontainer frule compoundhyphenpenalty contained
+syn keyword contextHelpers start stop unsupportedcs openout closeout contained
+syn keyword contextHelpers write openin closein read readline contained
+syn keyword contextHelpers readfromterminal boxlines boxline setboxline copyboxline contained
+syn keyword contextHelpers boxlinewd boxlineht boxlinedp boxlinenw boxlinenh contained
+syn keyword contextHelpers boxlinend boxlinels boxliners boxlinelh boxlinerh contained
+syn keyword contextHelpers boxlinelp boxlinerp boxlinein boxrangewd boxrangeht contained
+syn keyword contextHelpers boxrangedp bitwiseset bitwiseand bitwiseor bitwisexor contained
+syn keyword contextHelpers bitwisenot bitwisenil ifbitwiseand bitwise bitwiseshift contained
+syn keyword contextHelpers bitwiseflip textdir linedir pardir boxdir contained
+syn keyword contextHelpers prelistbox postlistbox prelistcopy postlistcopy setprelistbox contained
+syn keyword contextHelpers setpostlistbox noligaturing nokerning noexpansion noprotrusion contained
+syn keyword contextHelpers noleftkerning noleftligaturing norightkerning norightligaturing noitaliccorrection contained
+syn keyword contextHelpers futureletnexttoken defbackslashbreak letbackslashbreak pushoverloadmode popoverloadmode contained
+syn keyword contextHelpers pushrunstate poprunstate suggestedalias showboxhere discoptioncodestring contained
+syn keyword contextHelpers flagcodestring frozenparcodestring glyphoptioncodestring groupcodestring hyphenationcodestring contained
+syn keyword contextHelpers mathcontrolcodestring mathflattencodestring normalizecodestring parcontextcodestring newlocalcount contained
+syn keyword contextHelpers newlocaldimen newlocalskip newlocalmuskip newlocaltoks newlocalbox contained
+syn keyword contextHelpers newlocalwrite newlocalread setnewlocalcount setnewlocaldimen setnewlocalskip contained
+syn keyword contextHelpers setnewlocalmuskip setnewlocaltoks setnewlocalbox ifexpression contained

runtime/syntax/shared/context-data-metafun.vim

@@ -0,0 +1,117 @@
+vim9script
+
+# Vim syntax file
+# Language: ConTeXt
+# Automatically generated by mtx-interface (2022-08-12 10:49)
+
+syn keyword metafunCommands loadfile loadimage loadmodule dispose nothing
+syn keyword metafunCommands transparency tolist topath tocycle sqr
+syn keyword metafunCommands log ln exp inv pow
+syn keyword metafunCommands pi radian tand cotd sin
+syn keyword metafunCommands cos tan cot atan asin
+syn keyword metafunCommands acos invsin invcos invtan acosh
+syn keyword metafunCommands asinh sinh cosh tanh zmod
+syn keyword metafunCommands paired tripled unitcircle fulldiamond unitdiamond
+syn keyword metafunCommands fullsquare unittriangle fulltriangle unitoctagon fulloctagon
+syn keyword metafunCommands unithexagon fullhexagon llcircle lrcircle urcircle
+syn keyword metafunCommands ulcircle tcircle bcircle lcircle rcircle
+syn keyword metafunCommands lltriangle lrtriangle urtriangle ultriangle uptriangle
+syn keyword metafunCommands downtriangle lefttriangle righttriangle triangle smoothed
+syn keyword metafunCommands cornered superellipsed randomized randomizedcontrols squeezed
+syn keyword metafunCommands enlonged shortened punked curved unspiked
+syn keyword metafunCommands simplified blownup stretched enlarged leftenlarged
+syn keyword metafunCommands topenlarged rightenlarged bottomenlarged crossed laddered
+syn keyword metafunCommands randomshifted interpolated perpendicular paralleled cutends
+syn keyword metafunCommands peepholed llenlarged lrenlarged urenlarged ulenlarged
+syn keyword metafunCommands llmoved lrmoved urmoved ulmoved rightarrow
+syn keyword metafunCommands leftarrow centerarrow drawdoublearrows boundingbox innerboundingbox
+syn keyword metafunCommands outerboundingbox pushboundingbox popboundingbox boundingradius boundingcircle
+syn keyword metafunCommands boundingpoint crossingunder insideof outsideof bottomboundary
+syn keyword metafunCommands leftboundary topboundary rightboundary xsized ysized
+syn keyword metafunCommands xysized sized xyscaled intersection_point intersection_found
+syn keyword metafunCommands penpoint bbwidth bbheight withshade withcircularshade
+syn keyword metafunCommands withlinearshade defineshade shaded shadedinto withshadecolors
+syn keyword metafunCommands withshadedomain withshademethod withshadefactor withshadevector withshadecenter
+syn keyword metafunCommands withshadedirection withshaderadius withshadetransform withshadecenterone withshadecentertwo
+syn keyword metafunCommands withshadestep withshadefraction withshadeorigin shownshadevector shownshadeorigin
+syn keyword metafunCommands shownshadedirection shownshadecenter cmyk spotcolor multitonecolor
+syn keyword metafunCommands namedcolor drawfill undrawfill inverted uncolored
+syn keyword metafunCommands softened grayed greyed onlayer along
+syn keyword metafunCommands graphictext loadfigure externalfigure figure register
+syn keyword metafunCommands outlinetext filloutlinetext drawoutlinetext outlinetexttopath checkedbounds
+syn keyword metafunCommands checkbounds strut rule withmask bitmapimage
+syn keyword metafunCommands colordecimals ddecimal dddecimal ddddecimal colordecimalslist
+syn keyword metafunCommands textext thetextext rawtextext textextoffset texbox
+syn keyword metafunCommands thetexbox rawtexbox istextext infotext rawmadetext
+syn keyword metafunCommands validtexbox onetimetextext rawfmttext thefmttext fmttext
+syn keyword metafunCommands onetimefmttext notcached keepcached verbatim thelabel
+syn keyword metafunCommands label autoalign transparent[] withtransparency withopacity
+syn keyword metafunCommands property properties withproperties asgroup withpattern
+syn keyword metafunCommands withpatternscale withpatternfloat infont space crlf
+syn keyword metafunCommands dquote percent SPACE CRLF DQUOTE
+syn keyword metafunCommands PERCENT grayscale greyscale withgray withgrey
+syn keyword metafunCommands colorpart colorlike readfile clearxy unitvector
+syn keyword metafunCommands center epsed anchored originpath infinite
+syn keyword metafunCommands break xstretched ystretched snapped pathconnectors
+syn keyword metafunCommands function constructedfunction constructedpath constructedpairs straightfunction
+syn keyword metafunCommands straightpath straightpairs curvedfunction curvedpath curvedpairs
+syn keyword metafunCommands evenly oddly condition pushcurrentpicture popcurrentpicture
+syn keyword metafunCommands arrowpath resetarrows tensecircle roundedsquare colortype
+syn keyword metafunCommands whitecolor blackcolor basiccolors complementary complemented
+syn keyword metafunCommands resolvedcolor normalfill normaldraw visualizepaths detailpaths
+syn keyword metafunCommands naturalizepaths drawboundary drawwholepath drawpathonly visualizeddraw
+syn keyword metafunCommands visualizedfill detaileddraw draworigin drawboundingbox drawpath
+syn keyword metafunCommands drawpoint drawpoints drawcontrolpoints drawcontrollines drawpointlabels
+syn keyword metafunCommands drawlineoptions drawpointoptions drawcontroloptions drawlabeloptions draworiginoptions
+syn keyword metafunCommands drawboundoptions drawpathoptions resetdrawoptions undashed pencilled
+syn keyword metafunCommands decorated redecorated undecorated passvariable passarrayvariable
+syn keyword metafunCommands tostring topair format formatted quotation
+syn keyword metafunCommands quote startpassingvariable stoppassingvariable eofill eoclip
+syn keyword metafunCommands nofill dofill fillup eofillup nodraw
+syn keyword metafunCommands dodraw enfill area addbackground shadedup
+syn keyword metafunCommands shadeddown shadedleft shadedright sortlist copylist
+syn keyword metafunCommands shapedlist listtocurves listtolines listsize listlast
+syn keyword metafunCommands uniquelist circularpath squarepath linearpath theoffset
+syn keyword metafunCommands texmode systemmode texvar texstr isarray
+syn keyword metafunCommands prefix dimension getmacro getdimen getcount
+syn keyword metafunCommands gettoks setmacro setdimen setcount settoks
+syn keyword metafunCommands setglobalmacro setglobaldimen setglobalcount setglobaltoks positionpath
+syn keyword metafunCommands positioncurve positionxy positionparagraph positioncolumn positionwhd
+syn keyword metafunCommands positionpage positionregion positionbox positionx positiony
+syn keyword metafunCommands positionanchor positioninregion positionatanchor positioncolumnbox overlaycolumnbox
+syn keyword metafunCommands positioncolumnatx getposboxes getmultipars getpospage getposparagraph
+syn keyword metafunCommands getposcolumn getposregion getposx getposy getposwidth
+syn keyword metafunCommands getposheight getposdepth getposleftskip getposrightskip getposhsize
+syn keyword metafunCommands getposparindent getposhangindent getposhangafter getposxy getposupperleft
+syn keyword metafunCommands getposlowerleft getposupperright getposlowerright getposllx getposlly
+syn keyword metafunCommands getposurx getposury wdpart htpart dppart
+syn keyword metafunCommands texvar texstr inpath pointof leftof
+syn keyword metafunCommands rightof utfnum utflen utfsub newhash
+syn keyword metafunCommands disposehash inhash tohash fromhash isarray
+syn keyword metafunCommands prefix isobject comment report lua
+syn keyword metafunCommands lualist mp MP luacall mirrored
+syn keyword metafunCommands mirroredabout xslanted yslanted scriptindex newscriptindex
+syn keyword metafunCommands newcolor newrgbcolor newcmykcolor newnumeric newboolean
+syn keyword metafunCommands newtransform newpath newpicture newstring newpair
+syn keyword metafunCommands mpvard mpvarn mpvars mpvar withtolerance
+syn keyword metafunCommands hatched withdashes processpath pencilled sortedintersectiontimes
+syn keyword metafunCommands intersectionpath firstintersectionpath secondintersectionpath intersectionsfound cutbeforefirst
+syn keyword metafunCommands cutafterfirst cutbeforelast cutafterlast xnormalized ynormalized
+syn keyword metafunCommands xynormalized phantom scrutinized
+syn keyword metafunInternals nocolormodel greycolormodel graycolormodel rgbcolormodel cmykcolormodel
+syn keyword metafunInternals shadefactor shadeoffset textextoffset textextanchor normaltransparent
+syn keyword metafunInternals multiplytransparent screentransparent overlaytransparent softlighttransparent hardlighttransparent
+syn keyword metafunInternals colordodgetransparent colorburntransparent darkentransparent lightentransparent differencetransparent
+syn keyword metafunInternals exclusiontransparent huetransparent saturationtransparent colortransparent luminositytransparent
+syn keyword metafunInternals ahvariant ahdimple ahfactor ahscale metapostversion
+syn keyword metafunInternals maxdimensions drawoptionsfactor dq sq crossingscale
+syn keyword metafunInternals crossingoption crossingdebug contextlmtxmode metafunversion minifunversion
+syn keyword metafunInternals getparameters presetparameters hasparameter hasoption getparameter
+syn keyword metafunInternals getparameterdefault getparametercount getmaxparametercount getparameterpath getparameterpen
+syn keyword metafunInternals getparametertext applyparameters mergeparameters pushparameters popparameters
+syn keyword metafunInternals setluaparameter definecolor record newrecord setrecord
+syn keyword metafunInternals getrecord cntrecord anchorxy anchorx anchory
+syn keyword metafunInternals anchorht anchordp anchorul anchorll anchorlr
+syn keyword metafunInternals anchorur localanchorbox localanchorcell localanchorspan anchorbox
+syn keyword metafunInternals anchorcell anchorspan matrixbox matrixcell matrixspan
+syn keyword metafunInternals pensilcolor pensilstep

runtime/syntax/shared/context-data-tex.vim

@@ -0,0 +1,225 @@
+vim9script
+
+# Vim syntax file
+# Language: ConTeXt
+# Automatically generated by mtx-interface (2022-08-12 10:49)
+
+syn keyword texAleph Alephminorversion Alephrevision Alephversion contained
+syn keyword texEtex botmarks clubpenalties currentgrouplevel currentgrouptype currentifbranch contained
+syn keyword texEtex currentiflevel currentiftype detokenize dimexpr displaywidowpenalties contained
+syn keyword texEtex everyeof firstmarks fontchardp fontcharht fontcharic contained
+syn keyword texEtex fontcharwd glueexpr glueshrink glueshrinkorder gluestretch contained
+syn keyword texEtex gluestretchorder gluetomu ifcsname ifdefined iffontchar contained
+syn keyword texEtex interactionmode interlinepenalties lastlinefit lastnodetype marks contained
+syn keyword texEtex muexpr mutoglue numexpr pagediscards parshapedimen contained
+syn keyword texEtex parshapeindent parshapelength predisplaydirection protected savinghyphcodes contained
+syn keyword texEtex savingvdiscards scantokens showgroups showifs showtokens contained
+syn keyword texEtex splitbotmarks splitdiscards splitfirstmarks topmarks tracingassigns contained
+syn keyword texEtex tracinggroups tracingifs tracingnesting unexpanded unless contained
+syn keyword texEtex widowpenalties contained
+syn keyword texLuatex Uabove Uabovewithdelims Uatop Uatopwithdelims Uchar contained
+syn keyword texLuatex Udelcode Udelcodenum Udelimiter Udelimiterover Udelimiterunder contained
+syn keyword texLuatex Uhextensible Uleft Umathaccent Umathaccentbasedepth Umathaccentbaseheight contained
+syn keyword texLuatex Umathaccentbottomovershoot Umathaccentbottomshiftdown Umathaccentsuperscriptdrop Umathaccentsuperscriptpercent Umathaccenttopovershoot contained
+syn keyword texLuatex Umathaccenttopshiftup Umathaccentvariant Umathadapttoleft Umathadapttoright Umathaxis contained
+syn keyword texLuatex Umathbotaccentvariant Umathchar Umathcharclass Umathchardef Umathcharfam contained
+syn keyword texLuatex Umathcharnum Umathcharnumdef Umathcharslot Umathclass Umathcode contained
+syn keyword texLuatex Umathcodenum Umathconnectoroverlapmin Umathdegreevariant Umathdelimiterovervariant Umathdelimiterpercent contained
+syn keyword texLuatex Umathdelimitershortfall Umathdelimiterundervariant Umathdenominatorvariant Umathdict Umathdictdef contained
+syn keyword texLuatex Umathextrasubpreshift Umathextrasubprespace Umathextrasubshift Umathextrasubspace Umathextrasuppreshift contained
+syn keyword texLuatex Umathextrasupprespace Umathextrasupshift Umathextrasupspace Umathflattenedaccentbasedepth Umathflattenedaccentbaseheight contained
+syn keyword texLuatex Umathflattenedaccentbottomshiftdown Umathflattenedaccenttopshiftup Umathfractiondelsize Umathfractiondenomdown Umathfractiondenomvgap contained
+syn keyword texLuatex Umathfractionnumup Umathfractionnumvgap Umathfractionrule Umathfractionvariant Umathhextensiblevariant contained
+syn keyword texLuatex Umathlimitabovebgap Umathlimitabovekern Umathlimitabovevgap Umathlimitbelowbgap Umathlimitbelowkern contained
+syn keyword texLuatex Umathlimitbelowvgap Umathlimits Umathnoaxis Umathnolimits Umathnolimitsubfactor contained
+syn keyword texLuatex Umathnolimitsupfactor Umathnumeratorvariant Umathopenupdepth Umathopenupheight Umathoperatorsize contained
+syn keyword texLuatex Umathoverbarkern Umathoverbarrule Umathoverbarvgap Umathoverdelimiterbgap Umathoverdelimitervariant contained
+syn keyword texLuatex Umathoverdelimitervgap Umathoverlayaccentvariant Umathoverlinevariant Umathphantom Umathpresubshiftdistance contained
+syn keyword texLuatex Umathpresupshiftdistance Umathprimeraise Umathprimeraisecomposed Umathprimeshiftdrop Umathprimeshiftup contained
+syn keyword texLuatex Umathprimespaceafter Umathprimevariant Umathprimewidth Umathquad Umathradicaldegreeafter contained
+syn keyword texLuatex Umathradicaldegreebefore Umathradicaldegreeraise Umathradicalkern Umathradicalrule Umathradicalvariant contained
+syn keyword texLuatex Umathradicalvgap Umathruledepth Umathruleheight Umathskeweddelimitertolerance Umathskewedfractionhgap contained
+syn keyword texLuatex Umathskewedfractionvgap Umathsource Umathspaceafterscript Umathspacebeforescript Umathstackdenomdown contained
+syn keyword texLuatex Umathstacknumup Umathstackvariant Umathstackvgap Umathsubscriptvariant Umathsubshiftdistance contained
+syn keyword texLuatex Umathsubshiftdown Umathsubshiftdrop Umathsubsupshiftdown Umathsubsupvgap Umathsubtopmax contained
+syn keyword texLuatex Umathsupbottommin Umathsuperscriptvariant Umathsupshiftdistance Umathsupshiftdrop Umathsupshiftup contained
+syn keyword texLuatex Umathsupsubbottommax Umathtopaccentvariant Umathunderbarkern Umathunderbarrule Umathunderbarvgap contained
+syn keyword texLuatex Umathunderdelimiterbgap Umathunderdelimitervariant Umathunderdelimitervgap Umathunderlinevariant Umathuseaxis contained
+syn keyword texLuatex Umathvextensiblevariant Umathvoid Umathxscale Umathyscale Umiddle contained
+syn keyword texLuatex Unosubprescript Unosubscript Unosuperprescript Unosuperscript Uoperator contained
+syn keyword texLuatex Uover Uoverdelimiter Uoverwithdelims Uprimescript Uradical contained
+syn keyword texLuatex Uright Uroot Ushiftedsubprescript Ushiftedsubscript Ushiftedsuperprescript contained
+syn keyword texLuatex Ushiftedsuperscript Uskewed Uskewedwithdelims Ustack Ustartdisplaymath contained
+syn keyword texLuatex Ustartmath Ustartmathmode Ustopdisplaymath Ustopmath Ustopmathmode contained
+syn keyword texLuatex Ustyle Usubprescript Usubscript Usuperprescript Usuperscript contained
+syn keyword texLuatex Uunderdelimiter Uvextensible adjustspacing adjustspacingshrink adjustspacingstep contained
+syn keyword texLuatex adjustspacingstretch afterassigned aftergrouped aliased alignmark contained
+syn keyword texLuatex alignmentcellsource alignmentwrapsource aligntab allcrampedstyles alldisplaystyles contained
+syn keyword texLuatex allmathstyles allscriptscriptstyles allscriptstyles allsplitstyles alltextstyles contained
+syn keyword texLuatex alluncrampedstyles atendofgroup atendofgrouped attribute attributedef contained
+syn keyword texLuatex automaticdiscretionary automatichyphenpenalty automigrationmode autoparagraphmode begincsname contained
+syn keyword texLuatex beginlocalcontrol beginmathgroup beginsimplegroup boundary boxadapt contained
+syn keyword texLuatex boxanchor boxanchors boxattribute boxdirection boxfreeze contained
+syn keyword texLuatex boxgeometry boxorientation boxrepack boxshift boxsource contained
+syn keyword texLuatex boxtarget boxtotal boxxmove boxxoffset boxymove contained
+syn keyword texLuatex boxyoffset catcodetable clearmarks copymathatomrule copymathparent contained
+syn keyword texLuatex copymathspacing crampeddisplaystyle crampedscriptscriptstyle crampedscriptstyle crampedtextstyle contained
+syn keyword texLuatex csstring currentloopiterator currentloopnesting currentmarks defcsname contained
+syn keyword texLuatex detokenized dimensiondef dimexpression directlua edefcsname contained
+syn keyword texLuatex efcode endlocalcontrol endmathgroup endsimplegroup enforced contained
+syn keyword texLuatex etoks etoksapp etokspre everybeforepar everymathatom contained
+syn keyword texLuatex everytab exceptionpenalty expand expandafterpars expandafterspaces contained
+syn keyword texLuatex expandcstoken expanded expandedafter expandedloop expandtoken contained
+syn keyword texLuatex explicitdiscretionary explicithyphenpenalty firstvalidlanguage flushmarks fontcharta contained
+syn keyword texLuatex fontid fontmathcontrol fontspecdef fontspecid fontspecifiedsize contained
+syn keyword texLuatex fontspecscale fontspecxscale fontspecyscale fonttextcontrol formatname contained
+syn keyword texLuatex frozen futurecsname futuredef futureexpand futureexpandis contained
+syn keyword texLuatex futureexpandisap gdefcsname gleaders glet gletcsname contained
+syn keyword texLuatex glettonothing gluespecdef glyphdatafield glyphoptions glyphscale contained
+syn keyword texLuatex glyphscriptfield glyphscriptscale glyphscriptscriptscale glyphstatefield glyphtextscale contained
+syn keyword texLuatex glyphxoffset glyphxscale glyphxscaled glyphyoffset glyphyscale contained
+syn keyword texLuatex glyphyscaled gtoksapp gtokspre hccode hjcode contained
+syn keyword texLuatex hpack hyphenationmin hyphenationmode ifabsdim ifabsnum contained
+syn keyword texLuatex ifarguments ifboolean ifchkdim ifchknum ifcmpdim contained
+syn keyword texLuatex ifcmpnum ifcondition ifcstok ifdimexpression ifdimval contained
+syn keyword texLuatex ifempty ifflags ifhaschar ifhastok ifhastoks contained
+syn keyword texLuatex ifhasxtoks ifincsname ifinsert ifmathparameter ifmathstyle contained
+syn keyword texLuatex ifnumexpression ifnumval ifparameter ifparameters ifrelax contained
+syn keyword texLuatex iftok ignorearguments ignorepars immediate immutable contained
+syn keyword texLuatex indexofcharacter indexofregister inherited initcatcodetable insertbox contained
+syn keyword texLuatex insertcopy insertdepth insertdistance insertheight insertheights contained
+syn keyword texLuatex insertlimit insertmaxdepth insertmode insertmultiplier insertpenalty contained
+syn keyword texLuatex insertprogress insertstorage insertstoring insertunbox insertuncopy contained
+syn keyword texLuatex insertwidth instance integerdef lastarguments lastatomclass contained
+syn keyword texLuatex lastboundary lastchkdim lastchknum lastleftclass lastloopiterator contained
+syn keyword texLuatex lastnamedcs lastnodesubtype lastpageextra lastparcontext lastrightclass contained
+syn keyword texLuatex leftmarginkern letcharcode letcsname letfrozen letmathatomrule contained
+syn keyword texLuatex letmathparent letmathspacing letprotected lettonothing linebreakcriterium contained
+syn keyword texLuatex linedirection localbrokenpenalty localcontrol localcontrolled localcontrolledloop contained
+syn keyword texLuatex localinterlinepenalty localleftbox localleftboxbox localmiddlebox localmiddleboxbox contained
+syn keyword texLuatex localrightbox localrightboxbox lpcode luabytecode luabytecodecall contained
+syn keyword texLuatex luacopyinputnodes luadef luaescapestring luafunction luafunctioncall contained
+syn keyword texLuatex luatexbanner luatexrevision luatexversion mathaccent mathatom contained
+syn keyword texLuatex mathatomglue mathatomskip mathbackwardpenalties mathbeginclass mathcheckfencesmode contained
+syn keyword texLuatex mathdictgroup mathdictproperties mathdirection mathdisplaymode mathdisplayskipmode contained
+syn keyword texLuatex mathdoublescriptmode mathendclass matheqnogapstep mathfenced mathfontcontrol contained
+syn keyword texLuatex mathforwardpenalties mathfrac mathghost mathgluemode mathgroupingmode contained
+syn keyword texLuatex mathinlinemainstyle mathleftclass mathlimitsmode mathmiddle mathnolimitsmode contained
+syn keyword texLuatex mathpenaltiesmode mathrad mathrightclass mathrulesfam mathrulesmode contained
+syn keyword texLuatex mathscale mathscriptsmode mathslackmode mathspacingmode mathstackstyle contained
+syn keyword texLuatex mathstyle mathstylefontid mathsurroundmode mathsurroundskip maththreshold contained
+syn keyword texLuatex mugluespecdef mutable noaligned noatomruling noboundary contained
+syn keyword texLuatex nohrule norelax normalizelinemode normalizeparmode nospaces contained
+syn keyword texLuatex novrule numericscale numexpression orelse orphanpenalties contained
+syn keyword texLuatex orphanpenalty orunless outputbox overloaded overloadmode contained
+syn keyword texLuatex pageboundary pageextragoal pagevsize parametercount parametermark contained
+syn keyword texLuatex parattribute pardirection permanent pettymuskip postexhyphenchar contained
+syn keyword texLuatex posthyphenchar postinlinepenalty prebinoppenalty predisplaygapfactor preexhyphenchar contained
+syn keyword texLuatex prehyphenchar preinlinepenalty prerelpenalty protrudechars protrusionboundary contained
+syn keyword texLuatex pxdimen quitloop quitvmode resetmathspacing retokenized contained
+syn keyword texLuatex rightmarginkern rpcode savecatcodetable scaledemwidth scaledexheight contained
+syn keyword texLuatex scaledextraspace scaledinterwordshrink scaledinterwordspace scaledinterwordstretch scaledmathstyle contained
+syn keyword texLuatex scaledslantperpoint scantextokens semiexpand semiexpanded semiprotected contained
+syn keyword texLuatex setdefaultmathcodes setfontid setmathatomrule setmathdisplaypostpenalty setmathdisplayprepenalty contained
+syn keyword texLuatex setmathignore setmathoptions setmathpostpenalty setmathprepenalty setmathspacing contained
+syn keyword texLuatex shapingpenaltiesmode shapingpenalty skewed skewedwithdelims snapshotpar contained
+syn keyword texLuatex supmarkmode swapcsvalues tabsize textdirection thewithoutunit contained
+syn keyword texLuatex tinymuskip todimension tohexadecimal tointeger tokenized contained
+syn keyword texLuatex toksapp tokspre tolerant tomathstyle toscaled contained
+syn keyword texLuatex tosparsedimension tosparsescaled tpack tracingadjusts tracingalignments contained
+syn keyword texLuatex tracingexpressions tracingfonts tracingfullboxes tracinghyphenation tracinginserts contained
+syn keyword texLuatex tracinglevels tracingmarks tracingmath tracingnodes tracingpenalties contained
+syn keyword texLuatex uleaders undent unexpandedloop unletfrozen unletprotected contained
+syn keyword texLuatex untraced vpack wordboundary wrapuppar xdefcsname contained
+syn keyword texLuatex xtoks xtoksapp xtokspre contained
+syn keyword texOmega Omegaminorversion Omegarevision Omegaversion contained
+syn keyword texPdftex ifpdfabsdim ifpdfabsnum ifpdfprimitive pdfadjustspacing pdfannot contained
+syn keyword texPdftex pdfcatalog pdfcolorstack pdfcolorstackinit pdfcompresslevel pdfcopyfont contained
+syn keyword texPdftex pdfcreationdate pdfdecimaldigits pdfdest pdfdestmargin pdfdraftmode contained
+syn keyword texPdftex pdfeachlinedepth pdfeachlineheight pdfendlink pdfendthread pdffirstlineheight contained
+syn keyword texPdftex pdffontattr pdffontexpand pdffontname pdffontobjnum pdffontsize contained
+syn keyword texPdftex pdfgamma pdfgentounicode pdfglyphtounicode pdfhorigin pdfignoreddimen contained
+syn keyword texPdftex pdfignoreunknownimages pdfimageaddfilename pdfimageapplygamma pdfimagegamma pdfimagehicolor contained
+syn keyword texPdftex pdfimageresolution pdfincludechars pdfinclusioncopyfonts pdfinclusionerrorlevel pdfinfo contained
+syn keyword texPdftex pdfinfoomitdate pdfinsertht pdflastannot pdflastlinedepth pdflastlink contained
+syn keyword texPdftex pdflastobj pdflastxform pdflastximage pdflastximagepages pdflastxpos contained
+syn keyword texPdftex pdflastypos pdflinkmargin pdfliteral pdfmajorversion pdfmapfile contained
+syn keyword texPdftex pdfmapline pdfminorversion pdfnames pdfnoligatures pdfnormaldeviate contained
+syn keyword texPdftex pdfobj pdfobjcompresslevel pdfomitcharset pdfomitcidset pdfoutline contained
+syn keyword texPdftex pdfoutput pdfpageattr pdfpagebox pdfpageheight pdfpageref contained
+syn keyword texPdftex pdfpageresources pdfpagesattr pdfpagewidth pdfpkfixeddpi pdfpkmode contained
+syn keyword texPdftex pdfpkresolution pdfprimitive pdfprotrudechars pdfpxdimen pdfrandomseed contained
+syn keyword texPdftex pdfrecompress pdfrefobj pdfrefxform pdfrefximage pdfreplacefont contained
+syn keyword texPdftex pdfrestore pdfretval pdfsave pdfsavepos pdfsetmatrix contained
+syn keyword texPdftex pdfsetrandomseed pdfstartlink pdfstartthread pdfsuppressoptionalinfo pdfsuppressptexinfo contained
+syn keyword texPdftex pdftexbanner pdftexrevision pdftexversion pdfthread pdfthreadmargin contained
+syn keyword texPdftex pdftracingfonts pdftrailer pdftrailerid pdfuniformdeviate pdfuniqueresname contained
+syn keyword texPdftex pdfvorigin pdfxform pdfxformattr pdfxformmargin pdfxformname contained
+syn keyword texPdftex pdfxformresources pdfximage contained
+syn keyword texTex   - / above abovedisplayshortskip contained
+syn keyword texTex abovedisplayskip abovewithdelims accent adjdemerits advance contained
+syn keyword texTex afterassignment aftergroup aligncontent atop atopwithdelims contained
+syn keyword texTex badness baselineskip batchmode begingroup belowdisplayshortskip contained
+syn keyword texTex belowdisplayskip binoppenalty botmark box boxmaxdepth contained
+syn keyword texTex brokenpenalty catcode char chardef cleaders contained
+syn keyword texTex clubpenalty copy count countdef cr contained
+syn keyword texTex crcr csname day deadcycles def contained
+syn keyword texTex defaulthyphenchar defaultskewchar delcode delimiter delimiterfactor contained
+syn keyword texTex delimitershortfall dimen dimendef discretionary displayindent contained
+syn keyword texTex displaylimits displaystyle displaywidowpenalty displaywidth divide contained
+syn keyword texTex doublehyphendemerits dp dump edef else contained
+syn keyword texTex emergencystretch end endcsname endgroup endinput contained
+syn keyword texTex endlinechar eqno errhelp errmessage errorcontextlines contained
+syn keyword texTex errorstopmode escapechar everycr everydisplay everyhbox contained
+syn keyword texTex everyjob everymath everypar everyvbox exhyphenchar contained
+syn keyword texTex exhyphenpenalty expandafter fam fi finalhyphendemerits contained
+syn keyword texTex firstmark floatingpenalty font fontdimen fontname contained
+syn keyword texTex fontspecifiedname futurelet gdef global globaldefs contained
+syn keyword texTex glyph halign hangafter hangindent hbadness contained
+syn keyword texTex hbox hfil hfill hfilneg hfuzz contained
+syn keyword texTex holdinginserts holdingmigrations hrule hsize hskip contained
+syn keyword texTex hss ht hyphenation hyphenchar hyphenpenalty contained
+syn keyword texTex if ifcase ifcat ifdim iffalse contained
+syn keyword texTex ifhbox ifhmode ifinner ifmmode ifnum contained
+syn keyword texTex ifodd iftrue ifvbox ifvmode ifvoid contained
+syn keyword texTex ifx ignorespaces indent input inputlineno contained
+syn keyword texTex insert insertpenalties interlinepenalty jobname kern contained
+syn keyword texTex language lastbox lastkern lastpenalty lastskip contained
+syn keyword texTex lccode leaders left lefthyphenmin leftskip contained
+syn keyword texTex leqno let limits linepenalty lineskip contained
+syn keyword texTex lineskiplimit long looseness lower lowercase contained
+syn keyword texTex mark mathbin mathchar mathchardef mathchoice contained
+syn keyword texTex mathclose mathcode mathinner mathop mathopen contained
+syn keyword texTex mathord mathpunct mathrel mathsurround maxdeadcycles contained
+syn keyword texTex maxdepth meaning meaningasis meaningfull meaningless contained
+syn keyword texTex medmuskip message middle mkern month contained
+syn keyword texTex moveleft moveright mskip multiply muskip contained
+syn keyword texTex muskipdef newlinechar noalign noexpand noindent contained
+syn keyword texTex nolimits nonscript nonstopmode nulldelimiterspace nullfont contained
+syn keyword texTex number omit or outer output contained
+syn keyword texTex outputpenalty over overfullrule overline overshoot contained
+syn keyword texTex overwithdelims pagedepth pagefilllstretch pagefillstretch pagefilstretch contained
+syn keyword texTex pagegoal pageshrink pagestretch pagetotal par contained
+syn keyword texTex parfillleftskip parfillskip parindent parinitleftskip parinitrightskip contained
+syn keyword texTex parshape parskip patterns pausing penalty contained
+syn keyword texTex postdisplaypenalty predisplaypenalty predisplaysize pretolerance prevdepth contained
+syn keyword texTex prevgraf radical raise relax relpenalty contained
+syn keyword texTex right righthyphenmin rightskip romannumeral scaledfontdimen contained
+syn keyword texTex scriptfont scriptscriptfont scriptscriptstyle scriptspace scriptstyle contained
+syn keyword texTex scrollmode setbox setlanguage sfcode shipout contained
+syn keyword texTex show showbox showboxbreadth showboxdepth showlists contained
+syn keyword texTex shownodedetails showthe skewchar skip skipdef contained
+syn keyword texTex spacefactor spaceskip span splitbotmark splitfirstmark contained
+syn keyword texTex splitmaxdepth splittopskip srule string tabskip contained
+syn keyword texTex textfont textstyle the thickmuskip thinmuskip contained
+syn keyword texTex time toks toksdef tolerance topmark contained
+syn keyword texTex topskip tracingcommands tracinglostchars tracingmacros tracingonline contained
+syn keyword texTex tracingoutput tracingpages tracingparagraphs tracingrestores tracingstats contained
+syn keyword texTex uccode uchyph unboundary underline unhbox contained
+syn keyword texTex unhcopy unhpack unkern unpenalty unskip contained
+syn keyword texTex unvbox unvcopy unvpack uppercase vadjust contained
+syn keyword texTex valign vbadness vbox vcenter vfil contained
+syn keyword texTex vfill vfilneg vfuzz vrule vsize contained
+syn keyword texTex vskip vsplit vss vtop wd contained
+syn keyword texTex widowpenalty xdef xleaders xspaceskip year contained
+syn keyword texXetex XeTeXversion contained

runtime/syntax/swayconfig.vim

@@ -2,8 +2,8 @@
 " Language: sway window manager config
 " Original Author: James Eapen <james.eapen@vai.org>
 " Maintainer: James Eapen <james.eapen@vai.org>
-" Version: 0.11.0
-" Last Change: 2022 Jun 07
+" Version: 0.11.1
+" Last Change: 2022 Aug 08
 
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
@@ -36,8 +36,8 @@ syn keyword swayConfigBindGestureCommand swipe pinch hold contained
 syn keyword swayConfigBindGestureDirection up down left right next prev contained
 syn keyword swayConfigBindGesturePinchDirection inward outward clockwise counterclockwise contained
 syn match swayConfigBindGestureHold /^\s*\(bindgesture\)\s\+hold\(:[1-5]\)\?\s\+.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
-syn match swayConfigBindGestureSwipe /^\s*\(bindgesture\)\s\+swipe\(:[1-5]\)\?:\(up\|down\|left\|right\)\s\+.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
-syn match swayConfigBindGesturePinch /^\s*\(bindgesture\)\s\+\(pinch\):.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,swayConfigBindGesturePinchDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
+syn match swayConfigBindGestureSwipe /^\s*\(bindgesture\)\s\+swipe\(:[3-5]\)\?:\(up\|down\|left\|right\)\s\+.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
+syn match swayConfigBindGesturePinch /^\s*\(bindgesture\)\s\+pinch\(:[2-5]\)\?:\(up\|down\|left\|right\|inward\|outward\|clockwise\|counterclockwise\)\(+\(up\|down\|left\|right\|inward\|outward\|clockwise\|counterclockwise\)\)\?.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,swayConfigBindGesturePinchDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
 
 " floating
 syn keyword swayConfigFloatingKeyword floating contained

runtime/syntax/typescript.vim

@@ -35,7 +35,7 @@ syntax region typescriptTypeCast matchgroup=typescriptTypeBrackets
 
 """""""""""""""""""""""""""""""""""""""""""""""""""
 " Source the part common with typescriptreact.vim
-source <sfile>:h/typescriptcommon.vim
+source <sfile>:h/shared/typescriptcommon.vim
 
 
 let b:current_syntax = "typescript"

runtime/syntax/typescriptreact.vim

@@ -133,7 +133,7 @@ syntax region tsxEscJs
 
 """""""""""""""""""""""""""""""""""""""""""""""""""
 " Source the part common with typescriptreact.vim
-source <sfile>:h/typescriptcommon.vim
+source <sfile>:h/shared/typescriptcommon.vim
 
 
 syntax cluster typescriptExpression add=tsxRegion,tsxFragment

runtime/syntax/vim.vim

@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Vim 9.0 script
 " Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
-" Last Change:	July 01, 2022
-" Version:	9.0-01
+" Last Change:	August 17, 2022
+" Version:	9.0-02
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM
 " Automatically generated keyword lists: {{{1
 
@@ -78,12 +78,12 @@ syn match vimHLGroup contained	"Conceal"
 syn case match
 
 " Function Names {{{2
-syn keyword vimFuncName contained	abs argc assert_equal assert_match atan balloon_show bufexists bufwinid ceil ch_canread ch_getbufnr ch_read ch_status complete_check count deletebufline digraph_set eval exists_compiled extendnew findfile fnameescape foldtextresult get getcharmod getcmdpos getcursorcharpos getftime getmarklist getreg gettagstack getwinvar haslocaldir hlexists indent inputsave isdirectory job_info join keys line2byte listener_flush luaeval mapnew matcharg matchlist min nr2char popup_beval popup_filter_menu popup_getpos popup_move pow prompt_setinterrupt prop_find prop_type_delete py3eval readblob reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcellwidths setenv setpos settagstack sign_define sign_placelist sin soundfold spellsuggest str2float strchars string strtrans swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_channel test_null_partial test_setmouse timer_info tolower type values winbufnr win_getid win_id2win winnr win_splitmove
-syn keyword vimFuncName contained	acos argidx assert_equalfile assert_nobeep atan2 balloon_split buflisted bufwinnr changenr ch_close ch_getjob ch_readblob cindent complete_info cscope_connection did_filetype digraph_setlist eventhandler exp feedkeys flatten fnamemodify foreground getbufinfo getcharpos getcmdscreenpos getcwd getftype getmatches getreginfo gettext glob hasmapto hlget index inputsecret isinf job_setoptions js_decode len lispindent listener_remove map mapset matchdelete matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prompt_setprompt prop_list prop_type_get pyeval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcharpos setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playevent split str2list strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_dict test_null_string test_settime timer_pause toupper typename virtcol wincol win_gettype winlayout winrestcmd winwidth
-syn keyword vimFuncName contained	add arglistid assert_exception assert_notequal autocmd_add blob2list bufload byte2line char2nr ch_close_in ch_info ch_readraw clearmatches confirm cursor diff_filler echoraw executable expand filereadable flattennew foldclosed fullcommand getbufline getcharsearch getcmdtype getenv getimstatus getmousepos getregtype getwininfo glob2regpat histadd hlID input insert islocked job_start js_encode libcall list2blob localtime maparg match matchend matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_add prop_remove prop_type_list pyxeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setcharsearch setline setreg sha256 sign_getplaced sign_unplace slice sound_playfile sqrt str2nr strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_gui_event test_null_function test_option_not_set test_srand_seed timer_start tr undofile virtcol2col windowsversion win_gotoid winline winrestview wordcount
-syn keyword vimFuncName contained	and argv assert_fails assert_notmatch autocmd_delete browse bufloaded byteidx charclass chdir ch_log ch_sendexpr col copy debugbreak diff_hlID empty execute expandcmd filewritable float2nr foldclosedend funcref getbufvar getcharstr getcmdwintype getfontname getjumplist getpid gettabinfo getwinpos globpath histdel hlset inputdialog interrupt isnan job_status json_decode libcallnr list2str log mapcheck matchadd matchfuzzy max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_getprompt prop_add_list prop_type_add pum_getpos rand readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setcmdpos setloclist settabvar shellescape sign_jump sign_unplacelist sort sound_stop srand strcharlen strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_ignore_error test_null_job test_override test_unknown timer_stop trim undotree visualmode win_execute winheight win_move_separator winsaveview writefile
-syn keyword vimFuncName contained	append asin assert_false assert_report autocmd_get browsedir bufname byteidxcomp charcol ch_evalexpr ch_logfile ch_sendraw complete cos deepcopy digraph_get environ exepath expr10 filter floor foldlevel function getchangelist getcmdcompltype getcompletion getfperm getline getpos gettabvar getwinposx has histget hostname inputlist invert items job_stop json_encode line listener_add log10 maplist matchaddpos matchfuzzypos menu_info nextnonblank popup_atcursor popup_dialog popup_getoptions popup_menu popup_show prompt_setcallback prop_clear prop_type_change pumvisible range reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setcursorcharpos setmatches settabwinvar shiftwidth sign_place simplify sound_clear spellbadword state strcharpart stridx strridx swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_null_blob test_null_list test_refcount test_void timer_stopall trunc uniq wildmenumode win_findbuf win_id2tabwin win_move_statusline win_screenpos xor
-syn keyword vimFuncName contained	appendbufline assert_beeps assert_inrange assert_true balloon_gettext bufadd bufnr call charidx ch_evalraw ch_open ch_setoptions complete_add cosh delete digraph_getlist escape exists extend finddir fmod foldtext garbagecollect getchar getcmdline getcurpos getfsize getloclist getqflist gettabwinvar getwinposy has_key histnr iconv inputrestore isabsolutepath job_getchannel
+syn keyword vimFuncName contained	abs argc assert_equal assert_match atan balloon_show bufexists bufwinid ceil ch_canread ch_getbufnr ch_read ch_status complete_check count deletebufline digraph_set eval exists_compiled extendnew findfile fnameescape foldtextresult get getcharmod getcmdpos getcursorcharpos getftime getmarklist getreg gettagstack getwinvar haslocaldir hlexists indent inputrestore isabsolutepath job_getchannel join keys line2byte listener_flush luaeval mapnew matcharg matchlist min nr2char popup_beval popup_filter_menu popup_getpos popup_move pow prompt_setinterrupt prop_find prop_type_delete py3eval readblob reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcellwidths setenv setpos settagstack sign_define sign_placelist sin soundfold spellsuggest str2float strchars string strtrans swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_channel test_null_partial test_setmouse timer_info tolower type values winbufnr win_getid win_id2win winnr win_splitmove
+syn keyword vimFuncName contained	acos argidx assert_equalfile assert_nobeep atan2 balloon_split buflisted bufwinnr changenr ch_close ch_getjob ch_readblob cindent complete_info cscope_connection did_filetype digraph_setlist eventhandler exp feedkeys flatten fnamemodify foreground getbufinfo getcharpos getcmdscreenpos getcwd getftype getmatches getreginfo gettext glob hasmapto hlget index inputsave isdirectory job_info js_decode len lispindent listener_remove map mapset matchdelete matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prompt_setprompt prop_list prop_type_get pyeval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcharpos setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playevent split str2list strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_dict test_null_string test_settime timer_pause toupper typename virtcol wincol win_gettype winlayout winrestcmd winwidth
+syn keyword vimFuncName contained	add arglistid assert_exception assert_notequal autocmd_add blob2list bufload byte2line char2nr ch_close_in ch_info ch_readraw clearmatches confirm cursor diff_filler echoraw executable expand filereadable flattennew foldclosed fullcommand getbufline getcharsearch getcmdtype getenv getimstatus getmousepos getregtype getwininfo glob2regpat histadd hlID indexof inputsecret isinf job_setoptions js_encode libcall list2blob localtime maparg match matchend matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_add prop_remove prop_type_list pyxeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setcharsearch setline setreg sha256 sign_getplaced sign_unplace slice sound_playfile sqrt str2nr strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_gui_event test_null_function test_option_not_set test_srand_seed timer_start tr undofile virtcol2col windowsversion win_gotoid winline winrestview wordcount
+syn keyword vimFuncName contained	and argv assert_fails assert_notmatch autocmd_delete browse bufloaded byteidx charclass chdir ch_log ch_sendexpr col copy debugbreak diff_hlID empty execute expandcmd filewritable float2nr foldclosedend funcref getbufvar getcharstr getcmdwintype getfontname getjumplist getpid gettabinfo getwinpos globpath histdel hlset input insert islocked job_start json_decode libcallnr list2str log mapcheck matchadd matchfuzzy max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_getprompt prop_add_list prop_type_add pum_getpos rand readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setcmdpos setloclist settabvar shellescape sign_jump sign_unplacelist sort sound_stop srand strcharlen strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_ignore_error test_null_job test_override test_unknown timer_stop trim undotree visualmode win_execute winheight win_move_separator winsaveview writefile
+syn keyword vimFuncName contained	append asin assert_false assert_report autocmd_get browsedir bufname byteidxcomp charcol ch_evalexpr ch_logfile ch_sendraw complete cos deepcopy digraph_get environ exepath expr10 filter floor foldlevel function getchangelist getcmdcompltype getcompletion getfperm getline getpos gettabvar getwinposx has histget hostname inputdialog interrupt isnan job_status json_encode line listener_add log10 maplist matchaddpos matchfuzzypos menu_info nextnonblank popup_atcursor popup_dialog popup_getoptions popup_menu popup_show prompt_setcallback prop_clear prop_type_change pumvisible range reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setcursorcharpos setmatches settabwinvar shiftwidth sign_place simplify sound_clear spellbadword state strcharpart stridx strridx swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_null_blob test_null_list test_refcount test_void timer_stopall trunc uniq wildmenumode win_findbuf win_id2tabwin win_move_statusline win_screenpos xor
+syn keyword vimFuncName contained	appendbufline assert_beeps assert_inrange assert_true balloon_gettext bufadd bufnr call charidx ch_evalraw ch_open ch_setoptions complete_add cosh delete digraph_getlist escape exists extend finddir fmod foldtext garbagecollect getchar getcmdline getcurpos getfsize getloclist getqflist gettabwinvar getwinposy has_key histnr iconv inputlist invert items job_stop
 
 "--- syntax here and above generated by mkvimvim ---
 " Special Vim Highlighting (not automatic) {{{1

src/INSTALLpc.txt

@@ -52,11 +52,14 @@ needed to target Windows XP.  But not older Windows versions (95, 98), see
 
 We do not provide download links, since Microsoft keeps changing them.  You
 can search for "Visual Studio Community 2015", for example.  You will need to
-create a Microsoft account (it's free).
+create a Microsoft account (it's free).  You need to download the "DVD", and
+execute the installer from it.
 
-When installing "Visual Studio Community 2015 with Update 3" make sure to
+When installing "Visual Studio Community 2015 with Update 3" or "Visual C++
+Build Tools for Visual Studio 2015 with Update 3" make sure to
 select "custom" and check "Windows XP Support for C++" and all checkboxes
-under "Universal Windows App Development Tools"
+under "Universal Windows App Development Tools".  Or whatever they are called
+now.
 
 
 Visual Studio

src/Makefile

@@ -169,7 +169,6 @@
 #AIX 4.2.1	      cc				5.2k (C) Will Fiveash
 #AIX 4.3.3.12	      xic 3.6.6				5.6  (5) David R. Favor
 #A/UX 3.1.1	      gcc	     +X11		4.0  (6) Jim Jagielski
-#BeOS PR	      mwcc DR3				5.0n (T) Olaf Seibert
 #BSDI 2.1 (x86)       shlicc2 gcc-2.6.3 -X11 X11R6	4.5  (1) Jos Backus
 #BSD/OS 3.0 (x86)     gcc gcc-2.7.2.1 -X11 X11R6	4.6c (1) Jos Backus
 #CX/UX 6.2	      cc	     +X11 +GUI_Mofif	5.4  (V) Kipp E. Howard
@@ -177,10 +176,6 @@
 #DG/UX 5.4R4.20       gcc 2.7.2      GUI		5.0s (H) Rocky Olive
 #HP-UX (most)	      c89 cc				5.1  (2) Bram Moolenaar
 #HP-UX_9.04	      cc	     +X11 +Motif	5.0  (2) Carton Lao
-#Irix 6.3 (O2)	      cc	     ?			4.5  (L) Edouard Poor
-#Irix 6.4	      cc	     ?			5.0m (S) Rick Sayre
-#Irix 6.5	      cc	     ?			6.0  (S) David Harrison
-#Irix 64 bit						4.5  (K) Jon Wright
 #Linux 2.0	      gcc-2.7.2      Infomagic Motif	4.3  (3) Ronald Rietman
 #NEC UP4800 UNIX_SV 4.2MP  cc	     +X11R6 Motif	4.6b (Q) Lennart Schultz
 #NetBSD 1.0A	      gcc-2.4.5      -X11 -GUI		3.21 (X) Juergen Weigert
@@ -240,8 +235,6 @@
 # (P)  For SuperUX 6.2 on NEC SX-4 see a few lines below to uncomment.
 # (Q)  For UNIXSVR 4.2MP on NEC UP4800 see below for lines to uncomment.
 # (R)  For Solaris 2.5 (or 2.5.1) with gcc > 2.5.6, uncomment line below.
-# (S)  For Irix 6.x with MipsPro compiler, use -OPT:Olimit.  See line below.
-# (T)  See ../doc/os_beos.txt.
 # (U)  Must uncomment CONF_OPT_PYTHON option below to disable Python
 #      detection, since the configure script runs into an error when it
 #      detects Python (probably because of the bash shell).
@@ -748,11 +741,6 @@ SANITIZER_LIBS = $(SANITIZER_CFLAGS)
 #CC = c89 -O +Onolimit +ESlit -D_HPUX_SOURCE
 #CC = c89 -O +Onolimit +ESlit +e -D_HPUX_SOURCE
 
-### (2) For HP-UX: Enable the use of a different set of digraphs.  Use this
-###	when the default (ISO) digraphs look completely wrong.
-###	After changing this do "touch digraph.c; make".
-#EXTRA_DEFS = -DHPUX_DIGRAPHS
-
 ### (2) For HP-UX: 9.04 cpp default macro definition table of 128000 bytes
 ###	is too small to compile many routines.	It produces too much defining
 ###	and no space errors.
@@ -887,51 +875,6 @@ SANITIZER_LIBS = $(SANITIZER_CFLAGS)
 #CONF_OPT_X = --x-include=$(XROOT)/include --x-libraries=$(XROOT)/lib/X11R6
 #EXTRA_LIBS = -lsocket -lgen
 
-### Irix 4.0 & 5.2 (Silicon Graphics Machines, __sgi will be defined)
-# Not needed for Irix 5.3, Ives Aerts reported
-#EXTRA_LIBS = -lmalloc -lc_s
-# Irix 4.0, when regexp and regcmp cannot be found when linking:
-#EXTRA_LIBS = -lmalloc -lc_s -lPW
-
-### (S) Irix 6.x (MipsPro compiler): Uses different Olimit flag:
-# Note:	This newer option style is used with the MipsPro compilers ONLY if
-#	you are compiling an "n32" or "64" ABI binary (use either a -n32
-#	flag or a -64 flag for CFLAGS).  If you explicitly use a -o32 flag,
-#	then the CFLAGS option format will be the typical style (i.e.
-#	-Olimit 3000).
-#CFLAGS = -OPT:Olimit=3000 -O
-
-### (S) Irix 6.5 with MipsPro C compiler.  Try this as a test to see new
-#	compiler features!  Beware, the optimization is EXTREMELY thorough
-#	and takes quite a long time.
-# Note: See the note above.  Here, the -mips3 option automatically
-#	enables either the "n32" or "64" ABI, depending on what machine you
-#	are compiling on (n32 is explicitly enabled here, just to make sure).
-#CFLAGS = -OPT:Olimit=3500 -O -n32 -mips3 -IPA:aggr_cprop=ON -INLINE:dfe=ON:list=ON:must=screen_char,out_char,ui_write,out_flush
-#LDFLAGS= -OPT:Olimit=3500 -O -n32 -mips3 -IPA:aggr_cprop=ON -INLINE:dfe=ON:list=ON:must=screen_char,out_char,ui_write,out_flush
-
-### (K) for SGI Irix machines with 64 bit pointers ("uname -s" says IRIX64)
-###	Suggested by Jon Wright <jon@gate.sinica.edu.tw>.
-###	Tested on R8000 IRIX6.1 Power Indigo2.
-###	Check /etc/compiler.defaults for your compiler settings.
-# either (for 64 bit pointers) uncomment the following line
-#GUI_LIB_LOC = -L/usr/lib64
-# then
-# 1) make config
-# 2) edit auto/config.mk and delete the -lelf entry in the LIBS line
-# 3) make
-#
-# or (for 32bit pointers) uncomment the following line
-#EXTRA_DEFS = -n32
-#GUI_LIB_LOC = -L/usr/lib32
-# then
-# 1) make config
-# 2) edit auto/config.mk, add -n32 to LDFLAGS
-# 3) make
-#
-#Alternatively: use -o32 instead of -n32.
-###
-
 ### (C)  On SCO Unix v3.2.5 (and probably other versions) the termcap library,
 ###	 which is found by configure, doesn't work correctly.  Symptom is the
 ###	 error message "Termcap entry too long".  Uncomment the next line.
@@ -2378,9 +2321,11 @@ INSTALLMANARGS = $(VIMLOC) $(SCRIPTLOC) $(VIMRCLOC) $(HELPSOURCE) $(MANMOD) \
 # Install most of the runtime files
 installruntime: installrtbase installmacros installpack installtutor installspell
 
-# install the help files; first adjust the contents for the final location
+# Install the help files; first adjust the contents for the final location.
+# Also install most of the other runtime files.
 installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
-		$(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND) \
+		$(DEST_HELP) $(DEST_PRINT) $(DEST_COL) \
+		$(DEST_SYN) $(DEST_SYN)/shared $(DEST_IND) \
 		$(DEST_FTP) $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml \
 		$(DEST_IMPORT) $(DEST_IMPORT)/dist \
 		$(DEST_PLUG) $(DEST_TUTOR) $(DEST_SPELL) $(DEST_COMP)
@@ -2451,6 +2396,8 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
 # install the syntax files
 	cd $(SYNSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_SYN)
 	cd $(DEST_SYN); chmod $(HELPMOD) *.vim README.txt
+	cd $(SYNSOURCE)/shared; $(INSTALL_DATA) *.vim README.txt $(DEST_SYN)/shared
+	cd $(DEST_SYN)/shared; chmod $(HELPMOD) *.vim README.txt
 # install the indent files
 	cd $(INDSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_IND)
 	cd $(DEST_IND); chmod $(HELPMOD) *.vim README.txt
@@ -2696,7 +2643,8 @@ $(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE):
 
 $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
 		$(DEST_VIM) $(DEST_RT) $(DEST_HELP) \
-		$(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND) $(DEST_FTP) \
+		$(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_SYN)/shared \
+		$(DEST_IND) $(DEST_FTP) \
 		$(DEST_LANG) $(DEST_KMAP) $(DEST_COMP) $(DEST_MACRO) \
 		$(DEST_PACK) $(DEST_TOOLS) $(DEST_TUTOR) $(DEST_SPELL) \
 		$(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml \
@@ -2872,6 +2820,7 @@ uninstall_runtime:
 	-rm -f $(DEST_COL)/*.vim $(DEST_COL)/README.txt
 	-rm -rf $(DEST_COL)/tools
 	-rm -rf $(DEST_COL)/lists
+	-rm -f $(DEST_SYN)/shared/*.vim $(DEST_SYN)/shared/README.txt
 	-rm -f $(DEST_SYN)/*.vim $(DEST_SYN)/README.txt
 	-rm -f $(DEST_IND)/*.vim $(DEST_IND)/README.txt
 	-rm -rf $(DEST_MACRO)
@@ -2883,7 +2832,8 @@ uninstall_runtime:
 	-rm -rf $(DEST_KMAP)
 	-rm -rf $(DEST_COMP)
 	-rm -f $(DEST_PRINT)/*.ps
-	-rmdir $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND)
+	-rmdir $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN)/shared
+	-rmdir $(DEST_SYN) $(DEST_IND)
 	-rm -rf $(DEST_FTP)/*.vim $(DEST_FTP)/README.txt $(DEST_FTP)/logtalk.dict
 	-rm -f $(DEST_AUTO)/*.vim $(DEST_AUTO)/README.txt
 	-rm -f $(DEST_AUTO)/dist/*.vim $(DEST_AUTO)/xml/*.vim

src/alloc.c

@@ -158,10 +158,10 @@ alloc(size_t size)
     void *
 alloc_id(size_t size, alloc_id_T id UNUSED)
 {
-#ifdef FEAT_EVAL
+# ifdef FEAT_EVAL
     if (alloc_fail_id == id && alloc_does_fail(size))
 	return NULL;
-#endif
+# endif
     return lalloc(size, TRUE);
 }
 #endif
@@ -425,9 +425,7 @@ free_all_mem(void)
     }
 
     free_titles();
-# if defined(FEAT_SEARCHPATH)
     free_findfile();
-# endif
 
     // Obviously named calls.
     free_all_autocmds();

src/autocmd.c

@@ -1249,6 +1249,7 @@ do_autocmd_event(
 		{
 		    curwin->w_last_topline = curwin->w_topline;
 		    curwin->w_last_leftcol = curwin->w_leftcol;
+		    curwin->w_last_skipcol = curwin->w_skipcol;
 		    curwin->w_last_width = curwin->w_width;
 		    curwin->w_last_height = curwin->w_height;
 		}