patch 8.2.4445: exit test fails on MS-Windows anyway

Problem:    Exit test fails on MS-Windows anyway.
Solution:   Skip the test on MS-Windows.

.github/workflows/ci.yml

@@ -225,7 +225,7 @@ jobs:
           do_test make ${SHADOWOPT} ${TEST}
 
       # - name: Coveralls
-      #   if: matrix.coverage && success() && github.event_name != 'pull_request'
+      #   if: matrix.coverage && github.event_name != 'pull_request'
       #   env:
       #     COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
       #     COVERALLS_PARALLEL: true
@@ -238,21 +238,21 @@ jobs:
       #     ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8
 
       - name: Generate gcov files
-        if: matrix.coverage && success()
+        if: matrix.coverage
         run: |
           cd "${SRCDIR}"
           find . -type f -name '*.gcno' -exec gcov -pb {} + || true
 
       - name: Codecov
-        if: matrix.coverage && success()
+        if: matrix.coverage
         uses: codecov/codecov-action@v2
         with:
-          flags: ${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}
+          flags: linux,${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}
 
       - name: ASan logs
         if: contains(matrix.extra, 'asan') && !cancelled()
         run: |
-          for f in $(grep -lR '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "${LOG_DIR}"); do
+          for f in $(grep -lR '#[[:digit:]]* *0x[[:xdigit:]]*' "${LOG_DIR}"); do
             asan_symbolize -l "$f"
             false # in order to fail a job
           done
@@ -344,15 +344,14 @@ jobs:
           make ${TEST}
 
   windows:
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     env:
-      VCVARSALL: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
       # Interfaces
       # Lua
       LUA_VER: 54
       LUA_VER_DOT: '5.4'
-      LUA_RELEASE: 5.4.0
+      LUA_RELEASE: 5.4.2
       LUA32_URL: https://downloads.sourceforge.net/luabinaries/lua-%LUA_RELEASE%_Win32_dllw6_lib.zip
       LUA64_URL: https://downloads.sourceforge.net/luabinaries/lua-%LUA_RELEASE%_Win64_dllw6_lib.zip
       LUA_DIR: D:\Lua
@@ -360,8 +359,8 @@ jobs:
       PYTHON_VER: 27
       PYTHON_VER_DOT: '2.7'
       # Python 3
-      PYTHON3_VER: 38
-      PYTHON3_VER_DOT: '3.8'
+      PYTHON3_VER: 310
+      PYTHON3_VER_DOT: '3.10'
       # Other dependencies
       # winpty
       WINPTY_URL: https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip
@@ -392,6 +391,10 @@ jobs:
             msystem: MINGW32
             cygreg: registry32
             pyreg: "-32"
+          - toolchain: mingw
+            arch: x64
+            features: HUGE
+            coverage: yes
         exclude:
           - toolchain: msvc
             arch: x64
@@ -406,6 +409,7 @@ jobs:
         shell: bash
         run: |
           git config --global core.autocrlf input
+          echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
           python_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON_VER_DOT}/InstallPath/@")
           python3_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}${{ matrix.pyreg }}/InstallPath/@")
           echo "PYTHON_DIR=$python_dir" >> $GITHUB_ENV
@@ -463,8 +467,7 @@ jobs:
 
       - name: Copy src directory to src2
         shell: cmd
-        run: |
-          xcopy src src2\ /E > nul
+        run: xcopy src src2\ /E > nul
 
       - name: Build (MSVC)
         if: matrix.toolchain == 'msvc'
@@ -501,7 +504,7 @@ jobs:
               DYNAMIC_LUA=yes LUA=${LUA_DIR} \
               DYNAMIC_PYTHON=yes PYTHON=${PYTHON_DIR} \
               DYNAMIC_PYTHON3=yes PYTHON3=${PYTHON3_DIR} \
-              STATIC_STDCPLUS=yes
+              STATIC_STDCPLUS=yes COVERAGE=${{ matrix.coverage }}
           else
             mingw32-make -f Make_ming.mak -j2 \
               FEATURES=${{ matrix.features }} \
@@ -509,6 +512,14 @@ jobs:
               STATIC_STDCPLUS=yes
           fi
 
+      - name: Check version
+        shell: cmd
+        run: |
+          PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
+          src\vim --version || exit 1
+          src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
+          src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
+
       #- name: Prepare Artifact
       #  shell: cmd
       #  run: |
@@ -522,29 +533,34 @@ jobs:
       #    name: vim${{ matrix.bits }}-${{ matrix.toolchain }}
       #    path: ./artifacts
 
-      - name: Test
+      - name: Copy gcov data files to src2
+        if: matrix.coverage
+        shell: msys2 {0}
+        run: find src -name '*.gcno' | tar -c -T - | tar -x -C src2 --strip-components 1
+
+      - name: Test and show the result of testing gVim
         shell: cmd
         timeout-minutes: 20
         run: |
           PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
           call "%VCVARSALL%" ${{ matrix.vcarch }}
-          cd src
-          echo.
-          echo ::group::%COL_GREEN%Vim version:%COL_RESET%
-          .\vim --version || exit 1
-          echo ::endgroup::
 
-          echo %COL_GREEN%Start testing vim in background.%COL_RESET%
-          start cmd /c "cd ..\src2\testdir & nmake -nologo -f Make_dos.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
+          echo %COL_GREEN%Start testing Vim in background.%COL_RESET%
+          start cmd /c "cd src2\testdir & nmake -nologo -f Make_dos.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
 
-          echo ::group::%COL_GREEN%Test gvim:%COL_RESET%
-          cd testdir
+          echo %COL_GREEN%Test gVim:%COL_RESET%
+          cd src\testdir
           nmake -nologo -f Make_dos.mak VIMPROG=..\gvim || exit 1
-          cd ..
-          echo ::endgroup::
 
-          echo %COL_GREEN%Wait for vim tests to finish.%COL_RESET%
-          cd ..\src2\testdir
+      - name: Show the result of testing Vim
+        shell: cmd
+        timeout-minutes: 20
+        run: |
+          PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
+          call "%VCVARSALL%" ${{ matrix.vcarch }}
+
+          echo %COL_GREEN%Wait for Vim tests to finish.%COL_RESET%
+          cd src2\testdir
           :: Wait about 10 minutes.
           for /L %%i in (1,1,60) do (
             if exist done.txt goto exitloop
@@ -554,11 +570,35 @@ jobs:
           set timeout=1
           :exitloop
 
-          echo ::group::%COL_GREEN%Test results of vim:%COL_RESET%
+          echo %COL_GREEN%The result of testing Vim:%COL_RESET%
+          cd src2\testdir
           if exist messages type messages
           nmake -nologo -f Make_dos.mak report VIMPROG=..\..\src\vim || exit 1
+
           if "%timeout%"=="1" (
             echo %COL_RED%Timed out.%COL_RESET%
             exit 1
           )
-          echo ::endgroup::
+
+      - name: Generate gcov files
+        if: matrix.coverage
+        shell: msys2 {0}
+        run: |
+          cd src
+          find . -type f -name '*.gcno' -exec gcov -pb {} + || true
+          cd ../src2
+          find . -type f -name '*.gcno' -exec gcov -pb {} + || true
+
+      - name: Codecov (gVim)
+        if: matrix.coverage
+        uses: codecov/codecov-action@v2
+        with:
+          directory: src
+          flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}-gui
+
+      - name: Codecov (Vim)
+        if: matrix.coverage
+        uses: codecov/codecov-action@v2
+        with:
+          directory: src2
+          flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}

Filelist

@@ -114,6 +114,7 @@ SRC_ALL =	\
 		src/netbeans.c \
 		src/normal.c \
 		src/nv_cmdidxs.h \
+		src/nv_cmds.h \
 		src/ops.c \
 		src/option.c \
 		src/option.h \
@@ -444,6 +445,7 @@ SRC_UNIX =	\
 		src/configure \
 		src/configure.ac \
 		src/create_cmdidxs.vim \
+		src/create_nvcmdidxs.c \
 		src/create_nvcmdidxs.vim \
 		src/gui_at_fs.c \
 		src/gui_at_sb.c \
@@ -661,10 +663,7 @@ SRC_HAIKU =	\
 # source files for the Mac (also in the extra archive)
 SRC_MAC =	\
 		src/INSTALLmac.txt \
-		src/dehqx.py \
-		src/os_mac_rsrc/*.icns \
 		src/os_mac.h \
-		src/os_mac.rsr.hqx \
 		src/os_mac_conv.c \
 		src/os_macosx.m \
 		src/proto/os_mac_conv.pro \
@@ -702,7 +701,6 @@ SRC_EXTRA =	\
 		$(SRC_QNX) \
 		$(SRC_VMS) \
 		README_os390.txt \
-		src/infplist.xml \
 		src/link.390 \
 		src/os_vms_fix.com \
 		src/toolbar.phi \

nsis/gvim.nsi

@@ -347,6 +347,9 @@ Section "$(str_section_exe)" id_section_exe
 	File /oname=gvim.exe ${VIMSRC}\gvim_ole.exe
 !if /FileExists "${VIMSRC}\vim${BIT}.dll"
 	File ${VIMSRC}\vim${BIT}.dll
+!endif
+!if /FileExists "${VIMRT}\libsodium.dll"
+	File ${VIMRT}\libsodium.dll
 !endif
 	File /oname=install.exe ${VIMSRC}\installw32.exe
 	File /oname=uninstall.exe ${VIMSRC}\uninstallw32.exe

runtime/autoload/ccomplete.vim

@@ -4,13 +4,13 @@ vim9script noclear
 # Language:     C
 # Maintainer:   Bram Moolenaar <Bram@vim.org>
 #		Rewritten in Vim9 script by github user lacygoill
-# Last Change:  2021 Dec 27
+# Last Change:  2022 Jan 31
 
 var prepended: string
 var grepCache: dict<list<dict<any>>>
 
 # This function is used for the 'omnifunc' option.
-def ccomplete#Complete(findstart: bool, abase: string): any # {{{1
+export def Complete(findstart: bool, abase: string): any # {{{1
   if findstart
     # Locate the start of the item, including ".", "->" and "[...]".
     var line: string = getline('.')
@@ -202,7 +202,7 @@ def ccomplete#Complete(findstart: bool, abase: string): any # {{{1
               || !v['static']
               || bufnr('%') == bufnr(v['filename']))
 
-    res = extendnew(res, tags->map((_, v: dict<any>) => Tag2item(v)))
+    res = res->extend(tags->map((_, v: dict<any>) => Tag2item(v)))
   endif
 
   if len(res) == 0
@@ -216,9 +216,9 @@ def ccomplete#Complete(findstart: bool, abase: string): any # {{{1
     for i: number in len(diclist)->range()
       # New ctags has the "typeref" field.  Patched version has "typename".
       if diclist[i]->has_key('typename')
-        res = extendnew(res, diclist[i]['typename']->StructMembers(items[1 :], true))
+        res = res->extend(diclist[i]['typename']->StructMembers(items[1 :], true))
       elseif diclist[i]->has_key('typeref')
-        res = extendnew(res, diclist[i]['typeref']->StructMembers(items[1 :], true))
+        res = res->extend(diclist[i]['typeref']->StructMembers(items[1 :], true))
       endif
 
       # For a variable use the command, which must be a search pattern that
@@ -227,7 +227,7 @@ def ccomplete#Complete(findstart: bool, abase: string): any # {{{1
         var line: string = diclist[i]['cmd']
         if line[: 1] == '/^'
           var col: number = line->charidx(match(line, '\<' .. items[0] .. '\>'))
-          res = extendnew(res, line[2 : col - 1]->Nextitem(items[1 :], 0, true))
+          res = res->extend(line[2 : col - 1]->Nextitem(items[1 :], 0, true))
         endif
       endif
     endfor
@@ -256,11 +256,10 @@ def ccomplete#Complete(findstart: bool, abase: string): any # {{{1
 enddef
 
 def GetAddition( # {{{1
-  line: string,
-  match: string,
-  memarg: list<dict<any>>,
-  bracket: bool
-): string
+    line: string,
+    match: string,
+    memarg: list<dict<any>>,
+    bracket: bool): string
   # Guess if the item is an array.
   if bracket && match(line, match .. '\s*\[') > 0
     return '['
@@ -403,10 +402,9 @@ def Tagline2item(val: dict<any>, brackets: string): dict<string> # {{{1
 enddef
 
 def Tagcmd2extra( # {{{1
-  cmd: string,
-  name: string,
-  fname: string
-): string
+    cmd: string,
+    name: string,
+    fname: string): string
 # Turn a command from a tag line to something that is useful in the menu
   var x: string
   if cmd =~ '^/^'
@@ -427,11 +425,10 @@ def Tagcmd2extra( # {{{1
 enddef
 
 def Nextitem( # {{{1
-  lead: string,
-  items: list<string>,
-  depth: number,
-  all: bool
-): list<dict<string>>
+    lead: string,
+    items: list<string>,
+    depth: number,
+    all: bool): list<dict<string>>
 # Find composing type in "lead" and match items[0] with it.
 # Repeat this recursively for items[1], if it's there.
 # When resolving typedefs "depth" is used to avoid infinite recursion.
@@ -473,11 +470,11 @@ def Nextitem( # {{{1
 
       # New ctags has the "typeref" field.  Patched version has "typename".
       if item->has_key('typeref')
-        res = extendnew(res, item['typeref']->StructMembers(items, all))
+        res = res->extend(item['typeref']->StructMembers(items, all))
         continue
       endif
       if item->has_key('typename')
-        res = extendnew(res, item['typename']->StructMembers(items, all))
+        res = res->extend(item['typename']->StructMembers(items, all))
         continue
       endif
 
@@ -511,11 +508,11 @@ def Nextitem( # {{{1
               endif
             endfor
             if name != ''
-              res = extendnew(res, StructMembers(cmdtokens[0] .. ':' .. name, items, all))
+              res = res->extend(StructMembers(cmdtokens[0] .. ':' .. name, items, all))
             endif
           elseif depth < 10
             # Could be "typedef other_T some_T".
-            res = extendnew(res, cmdtokens[0]->Nextitem(items, depth + 1, all))
+            res = res->extend(cmdtokens[0]->Nextitem(items, depth + 1, all))
           endif
         endif
       endif
@@ -529,10 +526,9 @@ def Nextitem( # {{{1
 enddef
 
 def StructMembers( # {{{1
-  atypename: string,
-  items: list<string>,
-  all: bool
-): list<dict<string>>
+    atypename: string,
+    items: list<string>,
+    all: bool): list<dict<string>>
 
 # Search for members of structure "typename" in tags files.
 # Return a list with resulting matches.
@@ -641,10 +637,9 @@ def StructMembers( # {{{1
 enddef
 
 def SearchMembers( # {{{1
-  matches: list<dict<any>>,
-  items: list<string>,
-  all: bool
-): list<dict<string>>
+    matches: list<dict<any>>,
+    items: list<string>,
+    all: bool): list<dict<string>>
 
 # For matching members, find matches for following items.
 # When "all" is true find all, otherwise just return 1 if there is any member.
@@ -674,7 +669,7 @@ def SearchMembers( # {{{1
     endif
 
     if typename != ''
-      res = extendnew(res, StructMembers(typename, items, all))
+      res = res->extend(StructMembers(typename, items, all))
     else
       # Use the search command (the declaration itself).
       var sb: number = line->match('\t\zs/^')
@@ -683,7 +678,7 @@ def SearchMembers( # {{{1
         var e: number = line
           ->charidx(match(line, '\<' .. matches[i]['match'] .. '\>', sb))
         if e > 0
-          res = extendnew(res, line[s : e - 1]->Nextitem(items, 0, all))
+          res = res->extend(line[s : e - 1]->Nextitem(items, 0, all))
         endif
       endif
     endif

runtime/autoload/dist/script.vim

@@ -0,0 +1,426 @@
+vim9script
+
+# Vim function for detecting a filetype from the file contents.
+# Invoked from "scripts.vim" in 'runtimepath'
+#
+# Maintainer:	Bram Moolenaar <Bram@vim.org>
+# Last Change:	2022 Feb 13
+
+export def DetectFiletype()
+  var line1 = getline(1)
+  if line1[0] == '#' && line1[1] == '!'
+    # File that starts with "#!".
+    DetectFromHashBang(line1)
+  else
+    # File does not start with "#!".
+    DetectFromText(line1)
+  endif
+enddef
+
+# Called for a script that has "#!" in the first line.
+def DetectFromHashBang(firstline: string)
+  var line1 = firstline
+
+  # Check for a line like "#!/usr/bin/env {options} bash".  Turn it into
+  # "#!/usr/bin/bash" to make matching easier.
+  # Recognize only a few {options} that are commonly used.
+  if line1 =~ '^#!\s*\S*\<env\s'
+    line1 = substitute(line1, '\S\+=\S\+', '', 'g')
+    line1 = substitute(line1, '\(-[iS]\|--ignore-environment\|--split-string\)', '', '')
+    line1 = substitute(line1, '\<env\s\+', '', '')
+  endif
+
+  # Get the program name.
+  # Only accept spaces in PC style paths: "#!c:/program files/perl [args]".
+  # If the word env is used, use the first word after the space:
+  # "#!/usr/bin/env perl [path/args]"
+  # If there is no path use the first word: "#!perl [path/args]".
+  # Otherwise get the last word after a slash: "#!/usr/bin/perl [path/args]".
+  var name: string
+  if line1 =~ '^#!\s*\a:[/\\]'
+    name = substitute(line1, '^#!.*[/\\]\(\i\+\).*', '\1', '')
+  elseif line1 =~ '^#!.*\<env\>'
+    name = substitute(line1, '^#!.*\<env\>\s\+\(\i\+\).*', '\1', '')
+  elseif line1 =~ '^#!\s*[^/\\ ]*\>\([^/\\]\|$\)'
+    name = substitute(line1, '^#!\s*\([^/\\ ]*\>\).*', '\1', '')
+  else
+    name = substitute(line1, '^#!\s*\S*[/\\]\(\i\+\).*', '\1', '')
+  endif
+
+  # tcl scripts may have #!/bin/sh in the first line and "exec wish" in the
+  # third line.  Suggested by Steven Atkinson.
+  if getline(3) =~ '^exec wish'
+    name = 'wish'
+  endif
+
+  # Bourne-like shell scripts: bash bash2 ksh ksh93 sh
+  if name =~ '^\(bash\d*\|\|ksh\d*\|sh\)\>'
+    call dist#ft#SetFileTypeSH(line1)
+
+    # csh scripts
+  elseif name =~ '^csh\>'
+    if exists("g:filetype_csh")
+      call dist#ft#SetFileTypeShell(g:filetype_csh)
+    else
+      call dist#ft#SetFileTypeShell("csh")
+    endif
+
+    # tcsh scripts
+  elseif name =~ '^tcsh\>'
+    call dist#ft#SetFileTypeShell("tcsh")
+
+    # Z shell scripts
+  elseif name =~ '^zsh\>'
+    set ft=zsh
+
+    # TCL scripts
+  elseif name =~ '^\(tclsh\|wish\|expectk\|itclsh\|itkwish\)\>'
+    set ft=tcl
+
+    # Expect scripts
+  elseif name =~ '^expect\>'
+    set ft=expect
+
+    # Gnuplot scripts
+  elseif name =~ '^gnuplot\>'
+    set ft=gnuplot
+
+    # Makefiles
+  elseif name =~ 'make\>'
+    set ft=make
+
+    # Pike
+  elseif name =~ '^pike\%(\>\|[0-9]\)'
+    set ft=pike
+
+    # Lua
+  elseif name =~ 'lua'
+    set ft=lua
+
+    # Perl
+  elseif name =~ 'perl'
+    set ft=perl
+
+    # PHP
+  elseif name =~ 'php'
+    set ft=php
+
+    # Python
+  elseif name =~ 'python'
+    set ft=python
+
+    # Groovy
+  elseif name =~ '^groovy\>'
+    set ft=groovy
+
+    # Raku
+  elseif name =~ 'raku'
+    set ft=raku
+
+    # Ruby
+  elseif name =~ 'ruby'
+    set ft=ruby
+
+    # JavaScript
+  elseif name =~ 'node\(js\)\=\>\|js\>' || name =~ 'rhino\>'
+    set ft=javascript
+
+    # BC calculator
+  elseif name =~ '^bc\>'
+    set ft=bc
+
+    # sed
+  elseif name =~ 'sed\>'
+    set ft=sed
+
+    # OCaml-scripts
+  elseif name =~ 'ocaml'
+    set ft=ocaml
+
+    # Awk scripts; also finds "gawk"
+  elseif name =~ 'awk\>'
+    set ft=awk
+
+    # Website MetaLanguage
+  elseif name =~ 'wml'
+    set ft=wml
+
+    # Scheme scripts
+  elseif name =~ 'scheme'
+    set ft=scheme
+
+    # CFEngine scripts
+  elseif name =~ 'cfengine'
+    set ft=cfengine
+
+    # Erlang scripts
+  elseif name =~ 'escript'
+    set ft=erlang
+
+    # Haskell
+  elseif name =~ 'haskell'
+    set ft=haskell
+
+    # Scala
+  elseif name =~ 'scala\>'
+    set ft=scala
+
+    # Clojure
+  elseif name =~ 'clojure'
+    set ft=clojure
+
+    # Free Pascal
+  elseif name =~ 'instantfpc\>'
+    set ft=pascal
+
+    # Fennel
+  elseif name =~ 'fennel\>'
+    set ft=fennel
+
+    # MikroTik RouterOS script
+  elseif name =~ 'rsc\>'
+    set ft=routeros
+
+    # Fish shell
+  elseif name =~ 'fish\>'
+    set ft=fish
+
+    # Gforth
+  elseif name =~ 'gforth\>'
+    set ft=forth
+
+  endif
+enddef
+
+
+# Called for a script that does not have "#!" in the first line.
+def DetectFromText(line1: string)
+  var line2 = getline(2)
+  var line3 = getline(3)
+  var line4 = getline(4)
+  var line5 = getline(5)
+
+  # Bourne-like shell scripts: sh ksh bash bash2
+  if line1 =~ '^:$'
+    call dist#ft#SetFileTypeSH(line1)
+
+  # Z shell scripts
+  elseif line1 =~ '^#compdef\>'
+      || line1 =~ '^#autoload\>'
+      || "\n" .. line1 .. "\n" .. line2 .. "\n" .. line3 ..
+	 "\n" .. line4 .. "\n" .. line5
+	 =~ '\n\s*emulate\s\+\%(-[LR]\s\+\)\=[ckz]\=sh\>'
+    set ft=zsh
+
+  # ELM Mail files
+  elseif line1 =~ '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .* \(19\|20\)\d\d$'
+    set ft=mail
+
+  # Mason
+  elseif line1 =~ '^<[%&].*>'
+    set ft=mason
+
+  # Vim scripts (must have '" vim' as the first line to trigger this)
+  elseif line1 =~ '^" *[vV]im$'
+    set ft=vim
+
+  # libcxx and libstdc++ standard library headers like "iostream" do not have
+  # an extension, recognize the Emacs file mode.
+  elseif line1 =~? '-\*-.*C++.*-\*-'
+    set ft=cpp
+
+  # MOO
+  elseif line1 =~ '^\*\* LambdaMOO Database, Format Version \%([1-3]\>\)\@!\d\+ \*\*$'
+    set ft=moo
+
+    # Diff file:
+    # - "diff" in first line (context diff)
+    # - "Only in " in first line
+    # - "--- " in first line and "+++ " in second line (unified diff).
+    # - "*** " in first line and "--- " in second line (context diff).
+    # - "# It was generated by makepatch " in the second line (makepatch diff).
+    # - "Index: <filename>" in the first line (CVS file)
+    # - "=== ", line of "=", "---", "+++ " (SVK diff)
+    # - "=== ", "--- ", "+++ " (bzr diff, common case)
+    # - "=== (removed|added|renamed|modified)" (bzr diff, alternative)
+    # - "# HG changeset patch" in first line (Mercurial export format)
+  elseif line1 =~ '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\>\|# It was generated by makepatch \|Index:\s\+\f\+\r\=$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\|# HG changeset patch\)'
+	 || (line1 =~ '^--- ' && line2 =~ '^+++ ')
+	 || (line1 =~ '^\* looking for ' && line2 =~ '^\* comparing to ')
+	 || (line1 =~ '^\*\*\* ' && line2 =~ '^--- ')
+	 || (line1 =~ '^=== ' && ((line2 =~ '^=\{66\}' && line3 =~ '^--- ' && line4 =~ '^+++') || (line2 =~ '^--- ' && line3 =~ '^+++ ')))
+	 || (line1 =~ '^=== \(removed\|added\|renamed\|modified\)')
+    set ft=diff
+
+    # PostScript Files (must have %!PS as the first line, like a2ps output)
+  elseif line1 =~ '^%![ \t]*PS'
+    set ft=postscr
+
+    # M4 scripts: Guess there is a line that starts with "dnl".
+  elseif line1 =~ '^\s*dnl\>'
+	 || line2 =~ '^\s*dnl\>'
+	 || line3 =~ '^\s*dnl\>'
+	 || line4 =~ '^\s*dnl\>'
+	 || line5 =~ '^\s*dnl\>'
+    set ft=m4
+
+    # AmigaDos scripts
+  elseif $TERM == "amiga" && (line1 =~ "^;" || line1 =~? '^\.bra')
+    set ft=amiga
+
+    # SiCAD scripts (must have procn or procd as the first line to trigger this)
+  elseif line1 =~? '^ *proc[nd] *$'
+    set ft=sicad
+
+    # Purify log files start with "****  Purify"
+  elseif line1 =~ '^\*\*\*\*  Purify'
+    set ft=purifylog
+
+    # XML
+  elseif line1 =~ '<?\s*xml.*?>'
+    set ft=xml
+
+    # XHTML (e.g.: PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN")
+  elseif line1 =~ '\<DTD\s\+XHTML\s'
+    set ft=xhtml
+
+    # HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
+    # Avoid "doctype html", used by slim.
+  elseif line1 =~? '<!DOCTYPE\s\+html\>'
+    set ft=html
+
+    # PDF
+  elseif line1 =~ '^%PDF-'
+    set ft=pdf
+
+    # XXD output
+  elseif line1 =~ '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} '
+    set ft=xxd
+
+    # RCS/CVS log output
+  elseif line1 =~ '^RCS file:' || line2 =~ '^RCS file:'
+    set ft=rcslog
+
+    # CVS commit
+  elseif line2 =~ '^CVS:' || getline("$") =~ '^CVS: '
+    set ft=cvs
+
+    # Prescribe
+  elseif line1 =~ '^!R!'
+    set ft=prescribe
+
+    # Send-pr
+  elseif line1 =~ '^SEND-PR:'
+    set ft=sendpr
+
+    # SNNS files
+  elseif line1 =~ '^SNNS network definition file'
+    set ft=snnsnet
+  elseif line1 =~ '^SNNS pattern definition file'
+    set ft=snnspat
+  elseif line1 =~ '^SNNS result file'
+    set ft=snnsres
+
+    # Virata
+  elseif line1 =~ '^%.\{-}[Vv]irata'
+	 || line2 =~ '^%.\{-}[Vv]irata'
+	 || line3 =~ '^%.\{-}[Vv]irata'
+	 || line4 =~ '^%.\{-}[Vv]irata'
+	 || line5 =~ '^%.\{-}[Vv]irata'
+    set ft=virata
+
+    # Strace
+  elseif line1 =~ '[0-9:.]* *execve(' || line1 =~ '^__libc_start_main'
+    set ft=strace
+
+    # VSE JCL
+  elseif line1 =~ '^\* $$ JOB\>' || line1 =~ '^// *JOB\>'
+    set ft=vsejcl
+
+    # TAK and SINDA
+  elseif line4 =~ 'K & K  Associates' || line2 =~ 'TAK 2000'
+    set ft=takout
+  elseif line3 =~ 'S Y S T E M S   I M P R O V E D '
+    set ft=sindaout
+  elseif getline(6) =~ 'Run Date: '
+    set ft=takcmp
+  elseif getline(9) =~ 'Node    File  1'
+    set ft=sindacmp
+
+    # DNS zone files
+  elseif line1 .. line2 .. line3 .. line4 =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
+    set ft=bindzone
+
+    # BAAN
+  elseif line1 =~ '|\*\{1,80}' && line2 =~ 'VRC '
+	 || line2 =~ '|\*\{1,80}' && line3 =~ 'VRC '
+    set ft=baan
+
+    # Valgrind
+  elseif line1 =~ '^==\d\+== valgrind' || line3 =~ '^==\d\+== Using valgrind'
+    set ft=valgrind
+
+    # Go docs
+  elseif line1 =~ '^PACKAGE DOCUMENTATION$'
+    set ft=godoc
+
+    # Renderman Interface Bytestream
+  elseif line1 =~ '^##RenderMan'
+    set ft=rib
+
+    # Scheme scripts
+  elseif line1 =~ 'exec\s\+\S*scheme' || line2 =~ 'exec\s\+\S*scheme'
+    set ft=scheme
+
+    # Git output
+  elseif line1 =~ '^\(commit\|tree\|object\) \x\{40,\}\>\|^tag \S\+$'
+    set ft=git
+
+    # Gprof (gnu profiler)
+  elseif line1 == 'Flat profile:'
+	&& line2 == ''
+	&& line3 =~ '^Each sample counts as .* seconds.$'
+    set ft=gprof
+
+    # Erlang terms
+    # (See also: http://www.gnu.org/software/emacs/manual/html_node/emacs/Choosing-Modes.html#Choosing-Modes)
+  elseif line1 =~? '-\*-.*erlang.*-\*-'
+    set ft=erlang
+
+    # YAML
+  elseif line1 =~ '^%YAML'
+    set ft=yaml
+
+    # MikroTik RouterOS script
+  elseif line1 =~ '^#.*by RouterOS.*$'
+    set ft=routeros
+
+    # Sed scripts
+    # #ncomment is allowed but most likely a false positive so require a space
+    # before any trailing comment text
+  elseif line1 =~ '^#n\%($\|\s\)'
+    set ft=sed
+
+  else
+    var lnum = 1
+    while getline(lnum) =~ "^? " && lnum < line("$")
+      lnum += 1
+    endwhile
+    if getline(lnum) =~ '^Index:\s\+\f\+$'
+      # CVS diff
+      set ft=diff
+
+      # locale input files: Formal Definitions of Cultural Conventions
+      # filename must be like en_US, fr_FR@euro or en_US.UTF-8
+    elseif expand("%") =~ '\a\a_\a\a\($\|[.@]\)\|i18n$\|POSIX$\|translit_'
+      lnum = 1
+      while lnum < 100 && lnum < line("$")
+	if getline(lnum) =~ '^LC_\(IDENTIFICATION\|CTYPE\|COLLATE\|MONETARY\|NUMERIC\|TIME\|MESSAGES\|PAPER\|TELEPHONE\|MEASUREMENT\|NAME\|ADDRESS\)$'
+	  setf fdcc
+	  break
+	endif
+	lnum += 1
+      endwhile
+    endif
+  endif
+enddef

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.2.  Last change: 2022 Jan 21
+*autocmd.txt*   For Vim version 8.2.  Last change: 2022 Feb 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -326,6 +326,7 @@ Name			triggered by ~
 |FileChangedRO|		before making the first change to a read-only file
 
 |DiffUpdated|		after diffs have been updated
+|DirChangedPre|		before the working directory will change
 |DirChanged|		after the working directory has changed
 
 |ShellCmdPost|		after executing a shell command
@@ -738,6 +739,11 @@ DiffUpdated			After diffs have been updated.  Depending on
 				what kind of diff is being used (internal or
 				external) this can be triggered on every
 				change or when doing |:diffupdate|.
+							*DirChangedPre*
+DirChangedPre			The working directory is going to be changed,
+				as with |DirChanged|.  The pattern is like
+				with |DirChanged|.  The new directory can be
+				found in v:event.directory.
 							*DirChanged*
 DirChanged			The working directory has changed in response
 				to the |:cd| or |:tcd| or |:lcd| commands, or

runtime/doc/builtin.txt

@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 8.2.  Last change: 2022 Jan 28
+*builtin.txt*	For Vim version 8.2.  Last change: 2022 Feb 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -292,7 +292,6 @@ inputrestore()			Number	restore typeahead
 inputsave()			Number	save and clear typeahead
 inputsecret({prompt} [, {text}]) String	like input() but hiding the text
 insert({object}, {item} [, {idx}]) List	insert {item} in {object} [before {idx}]
-internal_get_nv_cmdchar({idx})	Number	command character at this index
 interrupt()			none	interrupt script execution
 invert({expr})			Number	bitwise invert
 isdirectory({directory})	Number	|TRUE| if {directory} is a directory
@@ -655,8 +654,6 @@ test_null_string()		String	null value for testing
 test_option_not_set({name})	none	reset flag indicating option was set
 test_override({expr}, {val})	none	test with Vim internal overrides
 test_refcount({expr})		Number	get the reference count of {expr}
-test_scrollbar({which}, {value}, {dragging})
-				none	scroll in the GUI for testing
 test_setmouse({row}, {col})	none	set the mouse position for testing
 test_settime({expr})		none	set current time for testing
 test_srand_seed([seed])		none	set seed for testing srand()
@@ -1888,12 +1885,13 @@ digraph_getlist([{listall}])				*digraph_getlist()*
 		display an error message.
 
 
-digraph_set({chars}, {digraph})				*digraph_set()* *E1205*
+digraph_set({chars}, {digraph})				*digraph_set()*
 		Add digraph {chars} to the list.  {chars} must be a string
 		with two characters.  {digraph} is a string with one UTF-8
-		encoded character. Be careful, composing characters are NOT
-		ignored.  This function is similar to |:digraphs| command, but
-		useful to add digraphs start with a white space.
+		encoded character.  *E1215*
+		Be careful, composing characters are NOT ignored.  This
+		function is similar to |:digraphs| command, but useful to add
+		digraphs start with a white space.
 
 		The function result is v:true if |digraph| is registered.  If
 		this fails an error message is given and v:false is returned.
@@ -1916,7 +1914,7 @@ digraph_setlist({digraphlist})				*digraph_setlist()*
 		Similar to |digraph_set()| but this function can add multiple
 		digraphs at once.  {digraphlist} is a list composed of lists,
 		where each list contains two strings with {chars} and
-		{digraph} as in |digraph_set()|.
+		{digraph} as in |digraph_set()|. *E1216*
 		Example: >
 		    call digraph_setlist([['aa', 'あ'], ['ii', 'い']])
 <
@@ -2084,9 +2082,12 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is defined,
 			dict.key	|internal-variables|).  Also works
 			list[i]		for |curly-braces-names|, |Dictionary|
 			import.Func	entries, |List| items, imported
-					items,etc.
+					items, etc.
 					Does not work for local variables in a
 					compiled `:def` function.
+					Also works for a function in |Vim9|
+					script, since it can be used as a
+					function reference.
 					Beware that evaluating an index may
 					cause an error message for an invalid
 					expression.  E.g.: >
@@ -2139,7 +2140,8 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is defined,
 			exists("&shortname")
 			exists("$HOSTNAME")
 			exists("*strftime")
-			exists("*s:MyFunc")
+			exists("*s:MyFunc")	" only for legacy script
+			exists("*MyFunc")
 			exists("bufcount")
 			exists(":Make")
 			exists("#CursorHold")
@@ -2534,7 +2536,7 @@ flatten({list} [, {maxdepth}])					*flatten()*
 		The {list} is changed in place, use |flattennew()| if you do
 		not want that.
 		In Vim9 script flatten() cannot be used, you must always use
-		|flattennew()|. *E1158*
+		|flattennew()|.
 								*E900*
 		{maxdepth} means how deep in nested lists changes are made.
 		{list} is not modified when {maxdepth} is 0.
@@ -3754,7 +3756,7 @@ getreg([{regname} [, 1 [, {list}]]])			*getreg()*
 			:let cliptext = getreg('*')
 <		When register {regname} was not set the result is an empty
 		string.
-		The {regname} argument must be a string.
+		The {regname} argument must be a string.  *E1162*
 
 		getreg('=') returns the last evaluated value of the expression
 		register.  (For use in maps.)
@@ -4618,11 +4620,6 @@ insert({object}, {item} [, {idx}])			*insert()*
 
 		Can also be used as a |method|: >
 			mylist->insert(item)
-<
-						*internal_get_nv_cmdchar()*
-internal_get_nv_cmdchar({idx})
-		Return the normal/visual mode command character at the
-		specified index. To be used only during the Vim build process.
 
 interrupt()						*interrupt()*
 		Interrupt script execution.  It works more or less like the
@@ -4677,9 +4674,11 @@ islocked({expr})					*islocked()* *E786*
 			:echo islocked('alist')		" 1
 			:echo islocked('alist[1]')	" 0
 
-<		When {expr} is a variable that does not exist you get an error
-		message.  Use |exists()| to check for existence.
-		In Vim9 script it does not work for local variables.
+<		When {expr} is a variable that does not exist -1 is returned.
+		If {expr} uses a range, list or dict index that is out of
+		range or does not exist you get an error message.  Use
+		|exists()| to check for existence.
+		In Vim9 script it does not work for local function variables.
 
 		Can also be used as a |method|: >
 			GetName()->islocked()
@@ -4791,7 +4790,7 @@ json_encode({expr})					*json_encode()*
 		Encode {expr} as JSON and return this as a string.
 		The encoding is specified in:
 		https://tools.ietf.org/html/rfc7159.html
-		Vim values are converted as follows:
+		Vim values are converted as follows:   *E1161*
 		   |Number|		decimal number
 		   |Float|		floating point number
 		   Float nan		"NaN"
@@ -4905,7 +4904,7 @@ libcallnr({libname}, {funcname}, {argument})
 line({expr} [, {winid}])				*line()*
 		The result is a Number, which is the line number of the file
 		position given with {expr}.  The {expr} argument is a string.
-		The accepted positions are:
+		The accepted positions are:			 *E1209*
 		    .	    the cursor position
 		    $	    the last line in the current buffer
 		    'x	    position of mark x (if the mark is not set, 0 is
@@ -5004,12 +5003,12 @@ listener_add({callback} [, {buf}])			*listener_add()*
 		Returns a unique ID that can be passed to |listener_remove()|.
 
 		The {callback} is invoked with five arguments:
-		    a:bufnr	the buffer that was changed
-		    a:start	first changed line number
-		    a:end	first line number below the change
-		    a:added	number of lines added, negative if lines were
+		    bufnr	the buffer that was changed
+		    start	first changed line number
+		    end		first line number below the change
+		    added	number of lines added, negative if lines were
 				deleted
-		    a:changes	a List of items with details about the changes
+		    changes	a List of items with details about the changes
 
 		Example: >
 	    func Listener(bufnr, start, end, added, changes)
@@ -5017,7 +5016,7 @@ listener_add({callback} [, {buf}])			*listener_add()*
 	    endfunc
 	    call listener_add('Listener', bufnr)
 
-<		The List cannot be changed.  Each item in a:changes is a
+<		The List cannot be changed.  Each item in "changes" is a
 		dictionary with these entries:
 		    lnum	the first line number of the change
 		    end		the first line below the change
@@ -5144,7 +5143,7 @@ luaeval({expr} [, {expr}])					*luaeval()*
 
 map({expr1}, {expr2})					*map()*
 		{expr1} must be a |List|, |String|, |Blob| or |Dictionary|.
-		When {expr1} is a |List|| or |Dictionary|, replace each
+		When {expr1} is a |List| or |Dictionary|, replace each
 		item in {expr1} with the result of evaluating {expr2}.
 		For a |Blob| each byte is replaced.
 		For a |String|, each character, including composing
@@ -6622,16 +6621,22 @@ reltimestr({time})				*reltimestr()*
 
 							*remote_expr()* *E449*
 remote_expr({server}, {string} [, {idvar} [, {timeout}]])
-		Send the {string} to {server}.  The string is sent as an
-		expression and the result is returned after evaluation.
-		The result must be a String or a |List|.  A |List| is turned
-		into a String by joining the items with a line break in
-		between (not at the end), like with join(expr, "\n").
+		Send the {string} to {server}.  The {server} argument is a
+		string, also see |{server}|.
+
+		The string is sent as an expression and the result is returned
+		after evaluation.  The result must be a String or a |List|.  A
+		|List| is turned into a String by joining the items with a
+		line break in between (not at the end), like with join(expr,
+		"\n").
+
 		If {idvar} is present and not empty, it is taken as the name
 		of a variable and a {serverid} for later use with
 		|remote_read()| is stored there.
+
 		If {timeout} is given the read times out after this many
 		seconds.  Otherwise a timeout of 600 seconds is used.
+
 		See also |clientserver| |RemoteReply|.
 		This function is not available in the |sandbox|.
 		{only available when compiled with the |+clientserver| feature}
@@ -6652,7 +6657,7 @@ remote_expr({server}, {string} [, {idvar} [, {timeout}]])
 
 remote_foreground({server})				*remote_foreground()*
 		Move the Vim server with the name {server} to the foreground.
-		The {server} argument is a string.
+		The {server} argument is a string, also see |{server}|.
 		This works like: >
 			remote_expr({server}, "foreground()")
 <		Except that on Win32 systems the client does the work, to work
@@ -6701,12 +6706,17 @@ remote_read({serverid}, [{timeout}])			*remote_read()*
 <
 							*remote_send()* *E241*
 remote_send({server}, {string} [, {idvar}])
-		Send the {string} to {server}.  The string is sent as input
-		keys and the function returns immediately.  At the Vim server
-		the keys are not mapped |:map|.
+		Send the {string} to {server}.  The {server} argument is a
+		string, also see |{server}|.
+
+		The string is sent as input keys and the function returns
+		immediately.  At the Vim server the keys are not mapped
+		|:map|.
+
 		If {idvar} is present, it is taken as the name of a variable
 		and a {serverid} for later use with remote_read() is stored
 		there.
+
 		See also |clientserver| |RemoteReply|.
 		This function is not available in the |sandbox|.
 		{only available when compiled with the |+clientserver| feature}
@@ -6921,6 +6931,8 @@ screenpos({winid}, {lnum}, {col})				*screenpos()*
 		as if 'conceallevel' is zero.  You can set the cursor to the
 		right position and use |screencol()| to get the value with
 		|conceal| taken into account.
+		If the position is in a closed fold the screen position of the
+		first character is returned, {col} is not used.
 
 		Can also be used as a |method|: >
 			GetWinid()->screenpos(lnum, col)
@@ -7652,10 +7664,12 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 		    module	name of a module; if given it will be used in
 				quickfix error window instead of the filename.
 		    lnum	line number in the file
+		    end_lnum	end of lines, if the item spans multiple lines
 		    pattern	search pattern used to locate the error
 		    col		column number
 		    vcol	when non-zero: "col" is visual column
 				when zero: "col" is byte index
+		    end_col	end column, if the item spans multiple columns
 		    nr		error number
 		    text	description of the error
 		    type	single-character error type, 'E', 'W', etc.
@@ -7900,7 +7914,7 @@ sha256({string})						*sha256()*
 shellescape({string} [, {special}])			*shellescape()*
 		Escape {string} for use as a shell command argument.
 		When the 'shell' contains powershell (MS-Windows) or pwsh
-		(MS-Windows, Linux, and MacOS) then it will enclose {string}
+		(MS-Windows, Linux, and macOS) then it will enclose {string}
 		in single quotes and will double up all internal single
 		quotes.
 		On MS-Windows, when 'shellslash' is not set, it will enclose

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 8.2.  Last change: 2022 Jan 28
+*change.txt*    For Vim version 8.2.  Last change: 2022 Feb 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -782,7 +782,7 @@ This deletes "TESTING" from all lines, but only one per line.
 For compatibility with Vi these two exceptions are allowed:
 "\/{string}/" and "\?{string}?" do the same as "//{string}/r".
 "\&{string}&" does the same as "//{string}/".
-						*pattern-delimiter* *E146*
+				*pattern-delimiter* *E146* *E1241* *E1242*
 Instead of the '/' which surrounds the pattern and replacement string, you can
 use another single-byte character.  This is useful if you want to include a
 '/' in the search pattern or replacement string.  Example: >
@@ -1076,7 +1076,7 @@ inside of strings can change!  Also see 'softtabstop' option. >
 			in [range] (default: current line |cmdline-ranges|),
 			[into register x].
 
-							*p* *put* *E353*
+						*p* *put* *E353* *E1240*
 ["x]p			Put the text [from register x] after the cursor
 			[count] times.
 

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.2.  Last change: 2022 Jan 08
+*cmdline.txt*   For Vim version 8.2.  Last change: 2022 Feb 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -730,7 +730,7 @@ If more line specifiers are given than required for the command, the first
 one(s) will be ignored.
 
 Line numbers may be specified with:		*:range* *{address}*
-	{number}	an absolute line number
+	{number}	an absolute line number  *E1247*
 	.		the current line			  *:.*
 	$		the last line in the file		  *:$*
 	%		equal to 1,$ (the entire file)		  *:%*

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.2.  Last change: 2022 Jan 21
+*editing.txt*   For Vim version 8.2.  Last change: 2022 Feb 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -222,7 +222,7 @@ If you want to keep the changed buffer without saving it, switch on the
 			Edit {file} always.  Discard any changes to the
 			current buffer.
 			Also see |++opt| and |+cmd|.
-
+							*:edit_#* *:e#*
 :e[dit] [++opt] [+cmd] #[count]
 			Edit the [count]th buffer (as shown by |:files|).
 			This command does the same as [count] CTRL-^.  But ":e
@@ -389,7 +389,7 @@ as a wildcard when "[" is in the 'isfname' option.  A simple way to avoid this
 is to use "path\[[]abc]", this matches the file "path\[abc]".
 
 					*starstar-wildcard*
-Expanding "**" is possible on Unix, Win32, Mac OS/X and a few other systems.
+Expanding "**" is possible on Unix, Win32, macOS and a few other systems.
 This allows searching a directory tree.  This goes up to 100 directories deep.
 Note there are some commands where this works slightly differently, see
 |file-searching|.
@@ -633,7 +633,7 @@ list of the current window.
 			Also see |++opt| and |+cmd|.
 
 :[count]arga[dd] {name} ..			*:arga* *:argadd* *E479*
-:[count]arga[dd]
+:[count]arga[dd]						*E1156*
 			Add the {name}s to the argument list.  When {name} is
 			omitted add the current buffer name to the argument
 			list.
@@ -1650,6 +1650,11 @@ If you don't get warned often enough you can use the following command.
 			if it exists now.
 			Once a file has been checked the timestamp is reset,
 			you will not be warned again.
+			Syntax highlighting, marks, diff status,
+			'fileencoding', 'fileformat' and 'binary' options
+			are not changed.  See |v:fcs_choice| to reload these
+			too (for example, if a code formatting tools has
+			changed the file).
 
 :[N]checkt[ime] {filename}
 :[N]checkt[ime] [N]
@@ -1690,7 +1695,7 @@ which version of the file you want to keep.
 
 The accuracy of the time check depends on the filesystem.  On Unix it is
 usually sub-second.  With old file sytems and on MS-Windows it is normally one
-second.  Use has('nanotime') check if sub-second time stamp checks are
+second.  Use `has('nanotime')` to check if sub-second time stamp checks are
 available.
 
 There is one situation where you get the message while there is nothing wrong:
@@ -1772,10 +1777,8 @@ There are three different types of searching:
 	/u/user_x/include
 
 <   Note: If your 'path' setting includes a non-existing directory, Vim will
-   skip the non-existing directory, but continues searching in the parent of
-   the non-existing directory if upwards searching is used.  E.g. when
-   searching "../include" and that doesn't exist, and upward searching is
-   used, also searches in "..".
+   skip the non-existing directory, and also does not search in the parent of
+   the non-existing directory if upwards searching is used.
 
 3) Combined up/downward search:
    If Vim's current path is /u/user_x/work/release and you do >

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.2.  Last change: 2022 Jan 24
+*eval.txt*	For Vim version 8.2.  Last change: 2022 Feb 20
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -181,7 +181,7 @@ You will not get an error if you try to change the type of a variable.
 
 
 1.2 Function references ~
-					*Funcref* *E695* *E718* *E1086*
+				*Funcref* *E695* *E718* *E1086* *E1192*
 A Funcref variable is obtained with the |function()| function, the |funcref()|
 function or created with the lambda expression |expr-lambda|.  It can be used
 in an expression in the place of a function name, before the parenthesis
@@ -765,7 +765,7 @@ length minus one is used: >
 
 
 Blob modification ~
-							*blob-modification*
+					*blob-modification* *E1182* *E1184*
 To change a specific byte of a blob use |:let| this way: >
 	:let blob[4] = 0x44
 
@@ -1018,7 +1018,7 @@ This is valid whether "b" has been defined or not.  The second clause will
 only be evaluated if "b" has been defined.
 
 
-expr4							*expr4*
+expr4							*expr4* *E1153*
 -----
 
 expr5 {cmp} expr5
@@ -1176,6 +1176,7 @@ When dividing a Number by zero the result depends on the value:
 	 >0 / 0  =  0x7fffffff	(like positive infinity)
 	 <0 / 0  = -0x7fffffff	(like negative infinity)
 	(before Vim 7.2 it was always 0x7fffffff)
+In |Vim9| script dividing a number by zero is an error.	*E1154*
 
 When 64-bit Number support is enabled:
 	  0 / 0  = -0x8000000000000000	(like NaN for Float)
@@ -1243,7 +1244,7 @@ recognize multibyte encodings, see `byteidx()` for an alternative, or use
 byte under the cursor: >
 	:let c = getline(".")[col(".") - 1]
 
-In |Vim9| script:
+In |Vim9| script:					*E1147* *E1148*
 If expr9 is a String this results in a String that contains the expr1'th
 single character (including any composing characters) from expr9.  To use byte
 indexes use |strpart()|.
@@ -1323,7 +1324,7 @@ for a sublist: >
 
 
 expr9.name		entry in a |Dictionary|		*expr-entry*
-
+							*E1203* *E1229*
 If expr9 is a |Dictionary| and it is followed by a dot, then the following
 name will be used as a key in the |Dictionary|.  This is just like:
 expr9[name].
@@ -1350,7 +1351,7 @@ When expr9 is a |Funcref| type variable, invoke the function it refers to.
 
 expr9->name([args])	method call			*method* *->*
 expr9->{lambda}([args])
-							*E260* *E276*
+							*E260* *E276* *E1265*
 For methods that are also available as global functions this is the same as: >
 	name(expr9 [, args])
 There can also be methods specifically for the type of "expr9".
@@ -1370,7 +1371,7 @@ And NOT: >
 	-(1.234->string())
 
 What comes after "->" can be a name, a simple expression (not containing any
-parenthesis), or any expression in parenthesis: >
+parenthesis), or any expression in parentheses: >
 	base->name(args)
 	base->some.name(args)
 	base->alist[idx](args)
@@ -1550,7 +1551,7 @@ When using the '=' register you get the expression itself, not what it
 evaluates to.  Use |eval()| to evaluate it.
 
 
-nesting							*expr-nesting* *E110*
+nesting						*expr-nesting* *E110*
 -------
 (expr1)			nested expression
 
@@ -2069,6 +2070,11 @@ v:fcs_choice	What should happen after a |FileChangedShell| event was
 		do with the affected buffer:
 			reload		Reload the buffer (does not work if
 					the file was deleted).
+			edit		Reload the buffer and detect the
+					values for options such as
+					'fileformat', 'fileencoding', 'binary'
+					(does not work if the file was
+					deleted).
 			ask		Ask the user what to do, as if there
 					was no autocommand.  Except that when
 					only the timestamp changed nothing
@@ -2176,7 +2182,8 @@ v:lnum		Line number for the 'foldexpr' |fold-expr|, 'formatexpr' and
 
 						*v:maxcol* *maxcol-variable*
 v:maxcol	Maximum line length.  Depending on where it is used it can be
-		screen columns, characters or bytes.
+		screen columns, characters or bytes.  The value currently is
+		2147483647 on all systems.
 
 					*v:mouse_win* *mouse_win-variable*
 v:mouse_win	Window number for a mouse click obtained with |getchar()|.
@@ -2694,7 +2701,7 @@ See |:verbose-cmd| for more information.
 			implies that the effect of |:nohlsearch| is undone
 			when the function returns.
 
-				*:endf* *:endfunction* *E126* *E193* *W22*
+			*:endf* *:endfunction* *E126* *E193* *W22* *E1151*
 :endf[unction] [argument]
 			The end of a function definition.  Best is to put it
 			on a line by its own, without [argument].
@@ -2995,8 +3002,9 @@ Also note that if you have two script files, and one calls a function in the
 other and vice versa, before the used function is defined, it won't work.
 Avoid using the autoload functionality at the toplevel.
 
-In |Vim9| script you will get error *E1263* if you use a function name with a
-"#" character when not in an autoload script.
+In |Vim9| script you will get error *E1263* if you define a function with
+a "#" character in the name.  You should use a name without "#" and use
+`:export`.
 
 Hint: If you distribute a bunch of scripts you can pack them together with the
 |vimball| utility.  Also read the user manual |distribute-script|.
@@ -3074,7 +3082,7 @@ declarations and assignments do not use a command.  |vim9-declaration|
 			length of the blob, in which case one byte is
 			appended.
 
-							*E711* *E719*
+					*E711* *E719* *E1165* *E1166* *E1183*
 :let {var-name}[{idx1}:{idx2}] = {expr1}		*E708* *E709* *E710*
 			Set a sequence of items in a |List| to the result of
 			the expression {expr1}, which must be a list with the
@@ -3410,7 +3418,7 @@ text...
 			See |deepcopy()|.
 
 
-:unlo[ckvar][!] [depth] {name} ...			*:unlockvar* *:unlo*
+:unlo[ckvar][!] [depth] {name} ...		*:unlockvar* *:unlo* *E1246*
 			Unlock the internal variable {name}.  Does the
 			opposite of |:lockvar|.
 
@@ -3471,7 +3479,7 @@ text...
 :endfo[r]						*:endfo* *:endfor*
 			Repeat the commands between ":for" and ":endfor" for
 			each item in {object}.  {object} can be a |List| or
-			a |Blob|.
+			a |Blob|. *E1177*
 
 			Variable {var} is set to the value of each item.
 			In |Vim9| script the loop variable must not have been
@@ -3725,6 +3733,9 @@ text...
 			the `append()` call appends the List with text to the
 			buffer.  This is similar to `:call` but works with any
 			expression.
+			In |Vim9| script an expression without an effect will
+			result in error *E1207* .  This should help noticing
+			mistakes.
 
 			The command can be shortened to `:ev` or `:eva`, but
 			these are hard to recognize and therefore not to be
@@ -4892,6 +4903,9 @@ explicit the |:scriptversion| command can be used.  When a Vim script is not
 compatible with older versions of Vim this will give an explicit error,
 instead of failing in mysterious ways.
 
+When using a legacy function, defined with `:function`, in |Vim9| script then
+scriptversion 4 is used.
+
 							*scriptversion-1*  >
  :scriptversion 1
 <	This is the original Vim script, same as not using a |:scriptversion|

runtime/doc/filetype.txt

@@ -142,7 +142,8 @@ variables can be used to overrule the filetype used for certain extensions:
 	*.asm		g:asmsyntax	|ft-asm-syntax|
 	*.asp		g:filetype_asp	|ft-aspvbs-syntax| |ft-aspperl-syntax|
 	*.bas		g:filetype_bas	|ft-basic-syntax|
-	*.fs		g:filetype_fs   |ft-forth-syntax|
+	*.frm		g:filetype_frm	|ft-form-syntax|
+	*.fs		g:filetype_fs	|ft-forth-syntax|
 	*.i		g:filetype_i	|ft-progress-syntax|
 	*.inc		g:filetype_inc
 	*.m		g:filetype_m	|ft-mathematica-syntax|

runtime/doc/if_pyth.txt

@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 8.2.  Last change: 2021 Nov 12
+*if_pyth.txt*   For Vim version 8.2.  Last change: 2022 Feb 07
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -65,7 +65,7 @@ There is no need to import sys, it's done by default.
 
 							*python-environment*
 Environment variables set in Vim are not always available in Python.  This
-depends on how Vim and Python were build.  Also see
+depends on how Vim and Python were built.  Also see
 https://docs.python.org/3/library/os.html#os.environ
 
 Note: Python is very sensitive to the indenting.  Make sure the "class" line
@@ -834,6 +834,19 @@ To work around such problems there are these options:
 Raising SystemExit exception in python isn't endorsed way to quit vim, use: >
 	:py vim.command("qall!")
 <
+							*E1266*
+This error can occur when python 3 cannot load the required modules.  This
+means that your python 3 is not correctly installed or there are some mistakes
+in your settings.  Please check the following items:
+1. Make sure that python 3 is correctly installed.  Also check the version of
+   python.
+2. Check the 'pythonthreedll' option.
+3. Check the 'pythonthreehome' option.
+4. Check the PATH environment variable if you don't set 'pythonthreedll'.
+   On MS-Windows, you can use where.exe to check which dll will be loaded.
+   E.g. >
+	where.exe python310.dll
+5. Check the PYTHONPATH and PYTHONHOME environment variables.
 
 							*has-python*
 You can test what Python version is available with: >

runtime/doc/indent.txt

@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 8.2.  Last change: 2019 Dec 07
+*indent.txt*    For Vim version 8.2.  Last change: 2022 Jan 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -778,6 +778,15 @@ You can set the indent for the first line after <script> and <style>
       "auto"	auto indent (same indent as the blocktag)
       "inc"	auto indent + one indent step
 
+You can set the indent for attributes after an open <tag line: >
+
+      :let g:html_indent_attribute = 1
+<
+      VALUE	MEANING ~
+      1		auto indent, one indent step more than <tag
+      2		auto indent, two indent steps (default)
+      > 2	auto indent, more indent steps
+
 Many tags increase the indent for what follows per default (see "Add Indent
 Tags" in the script).  You can add further tags with: >
 

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 8.2.  Last change: 2022 Jan 28
+*index.txt*     For Vim version 8.2.  Last change: 2022 Feb 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1152,7 +1152,7 @@ tag		command		action ~
 |:&|		:&		repeat last ":substitute"
 |:star|		:*		execute contents of a register
 |:<|		:<		shift lines one 'shiftwidth' left
-|:=|		:=		print the cursor line number
+|:=|		:=		print the last line number
 |:>|		:>		shift lines one 'shiftwidth' right
 |:@|		:@		execute contents of a register
 |:@@|		:@@		repeat the previous ":@"

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.2.  Last change: 2022 Jan 29
+*options.txt*	For Vim version 8.2.  Last change: 2022 Feb 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -383,12 +383,22 @@ lambda it will be converted to the name, e.g. "<lambda>123".  Examples:
 	set opfunc=function('MyOpFunc')
 	set opfunc=funcref('MyOpFunc')
 	set opfunc={a\ ->\ MyOpFunc(a)}
-	" set using a funcref variable
+
+Set to a script-local function: >
+	set opfunc=s:MyLocalFunc
+	set opfunc=<SID>MyLocalFunc
+In |Vim9| script the "s:" and "<SID>" can be omitted if the function exists in
+the script: >
+	set opfunc=MyLocalFunc
+
+Set using a funcref variable: >
 	let Fn = function('MyTagFunc')
 	let &tagfunc = Fn
-	" set using a lambda expression
+
+Set using a lambda expression: >
 	let &tagfunc = {t -> MyTagFunc(t)}
-	" set using a variable with lambda expression
+
+Set using a variable with lambda expression: >
 	let L = {a, b, c -> MyTagFunc(a, b , c)}
 	let &tagfunc = L
 
@@ -800,6 +810,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	need proper setting-up, so whenever the shell's pwd changes an OSC 7
 	escape sequence will be emitted. For example, on Linux, you can source
 	/etc/profile.d/vte.sh in your shell profile if you use bash or zsh.
+	When the parsing of the OSC sequence fails you get *E1179* .
 
 				*'arabic'* *'arab'* *'noarabic'* *'noarab'*
 'arabic' 'arab'		boolean (default off)
@@ -2476,7 +2487,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			you write the file the encrypted bytes will be
 			different.  The whole undo file is encrypted, not just
 			the pieces of text.
-					*E1193* *E1194* *E1195* *E1196*
+					*E1193* *E1194* *E1195* *E1196* *E1230*
 					*E1197* *E1198* *E1199* *E1200* *E1201*
 	   xchacha20	XChaCha20 Cipher with Poly1305 Message Authentication
 			Code.  Medium strong till strong encryption.
@@ -4027,7 +4038,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 'guitablabel' 'gtl'	string	(default empty)
 			global
 			{only available when compiled with GUI enabled}
-	When nonempty describes the text to use in a label of the GUI tab
+	When non-empty describes the text to use in a label of the GUI tab
 	pages line.  When empty and when the result is empty Vim will use a
 	default label.  See |setting-guitablabel| for more info.
 
@@ -4045,7 +4056,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 'guitabtooltip' 'gtt'	string	(default empty)
 			global
 			{only available when compiled with GUI enabled}
-	When nonempty describes the text to use in a tooltip for the GUI tab
+	When non-empty describes the text to use in a tooltip for the GUI tab
 	pages line.  When empty Vim will use a default tooltip.
 	This option is otherwise just like 'guitablabel' above.
 	You can include a line break.  Simplest method is to use |:let|: >
@@ -6723,6 +6734,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	See |option-backslash| about including spaces and backslashes.
 	Environment variables are expanded |:set_env|.
 
+	In |restricted-mode| shell commands will not be possible.  This mode
+	is used if the value of $SHELL ends in "false" or "nologin".
+
 	If the name of the shell contains a space, you need to enclose it in
 	quotes and escape the space.  Example with quotes: >
 		:set shell=\"c:\program\ files\unix\sh.exe\"\ -f
@@ -7445,7 +7459,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global or local to window |global-local|
 			{not available when compiled without the |+statusline|
 			feature}
-	When nonempty, this option determines the content of the status line.
+	When non-empty, this option determines the content of the status line.
 	Also see |status-line|.
 
 	The option consists of printf style '%' items interspersed with
@@ -7753,7 +7767,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'tabline'* *'tal'*
 'tabline' 'tal'		string	(default empty)
 			global
-	When nonempty, this option determines the content of the tab pages
+	When non-empty, this option determines the content of the tab pages
 	line at the top of the Vim window.  When empty Vim will use a default
 	tab pages line.  See |setting-tabline| for more info.
 
@@ -8970,7 +8984,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	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).  Keys that show the previous/next match, such as <Tab> or
+	one).  This is the behavior without "pum" in 'wildoptions.
+	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
 	specified.  "longest" and "list" do not start "wildmenu" mode.
@@ -8978,10 +8993,12 @@ 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 the following keys have special
-	meanings:
+	While the "wildmenu" is active, not using the popup menu, the
+	following keys have special meanings:
 
 	<Left> <Right>	- select previous/next match (like CTRL-P/CTRL-N)
 	<Down>		- in filename/menu name completion: move into a
@@ -8991,6 +9008,21 @@ A jump table for the options with a short description can be found at |Q_op|.
 	<Up>		- in filename/menu name completion: move up into
 			  parent directory or parent menu.
 
+	When using the popup menu for command line completion, the following
+	keys have special meanings:
+	<Down>		- select next match (like CTRL-N)
+	<Left>		- in filename/menu name completion: move up into
+			  parent directory or parent menu.
+	<Right>		- in filename/menu name completion: move into a
+			  subdirectory or submenu.
+	<Up>		- select previous match (like CTRL-P)
+	CTRL-E		- end completion, go back to what was there before
+			  selecting a match.
+	CTRL-N		- go to the next entry
+	CTRL-P		- go to the previous entry
+	CTRL-Y		- accept the currently selected match and stop
+			  completion.
+
 	This makes the menus accessible from the console |console-menus|.
 
 	If you prefer the <Left> and <Right> keys to move the cursor instead
@@ -9053,14 +9085,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 			{not available when compiled without the |+wildignore|
 			feature}
-	A list of words that change how command line completion is done.
-	Currently only one word is allowed:
+	A list of words that change how |cmdline-completion| is done.
+	The following values are supported:
+	  pum		Display the completion matches using the popupmenu
+			in the same style as the |ins-completion-menu|.
 	  tagfile	When using CTRL-D to list matching tags, the kind of
 			tag and the file of the tag is listed.	Only one match
 			is displayed per line.  Often used tag kinds are:
 				d	#define
 				f	function
-	Also see |cmdline-completion|.
 
 						*'winaltkeys'* *'wak'*
 'winaltkeys' 'wak'	string	(default "menu")

runtime/doc/os_win32.txt

@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 8.2.  Last change: 2021 Apr 05
+*os_win32.txt*  For Vim version 8.2.  Last change: 2022 Feb 14
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
@@ -294,7 +294,7 @@ A. When using :! to run an external command, you can run it with "start". For
        /b    no console window will be opened
    You can use only one of these flags at a time.  A second one will be
    treated as the start of the command.
-
+						*windows-asynchronously*
 Q. How do I avoid getting a window for programs that I run asynchronously?
 A. You have two possible solutions depending on what you want:
    1) You may use the /min flag in order to run program in a minimized state
@@ -308,17 +308,17 @@ A. You have two possible solutions depending on what you want:
 
    Example for a console application, run Exuberant ctags: >
         :!start /min ctags -R .
-<  When it has finished you should see file named "tags" in your current
+<   When it has finished you should see file named "tags" in your current
    directory.  You should notice the window title blinking on your taskbar.
    This is more noticeable for commands that take longer.
    Now delete the "tags" file and run this command: >
         :!start /b ctags -R .
-<  You should have the same "tags" file, but this time there will be no
+<   You should have the same "tags" file, but this time there will be no
    blinking on the taskbar.
    Example for a GUI application: >
         :!start /min notepad
         :!start /b notepad
-<  The first command runs notepad minimized and the second one runs it
+<   The first command runs notepad minimized and the second one runs it
    normally.
 
 						*windows-icon*

runtime/doc/pattern.txt

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 8.2.  Last change: 2022 Jan 08
+*pattern.txt*   For Vim version 8.2.  Last change: 2022 Feb 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -925,7 +925,7 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 	becomes invalid.  Vim doesn't automatically update the matches.
 	Similar to moving the cursor for "\%#" |/\%#|.
 
-						*/\%l* */\%>l* */\%<l* *E951*
+					*/\%l* */\%>l* */\%<l* *E951* *E1204*
 \%23l	Matches in a specific line.
 \%<23l	Matches above a specific line (lower line number).
 \%>23l	Matches below a specific line (higher line number).

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 8.2.  Last change: 2022 Jan 04
+*quickfix.txt*  For Vim version 8.2.  Last change: 2022 Feb 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1385,12 +1385,17 @@ Basic items
 	%f		file name (finds a string)
 	%o		module name (finds a string)
 	%l		line number (finds a number)
+	%e		end line number (finds a number)
 	%c		column number (finds a number representing character
 			column of the error, byte index, a <tab> is 1
 			character column)
 	%v		virtual column number (finds a number representing
 			screen column of the error (1 <tab> == 8 screen
 			columns))
+	%k		end column number (finds a number representing
+			the character column of the error, byte index, or a
+			number representing screen end column of the error if
+			it's used with %v)
 	%t		error type (finds a single character):
 			    e - error message
 			    w - warning message

runtime/doc/remote.txt

@@ -1,4 +1,4 @@
-*remote.txt*    For Vim version 8.2.  Last change: 2021 Dec 27
+*remote.txt*    For Vim version 8.2.  Last change: 2022 Feb 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -120,6 +120,10 @@ when sending command to it.
 
 The --serverlist argument will cause Vim to print a list of registered command
 servers on the standard output (stdout) and exit.
+							*{server}*
+The {server} argument is used by several functions.  When this is an empty
+string then on Unix the default server name is used, which is "GVIM".  On
+MS-Windows an empty string does not work.
 
 Win32 Note: Making the Vim server go to the foreground doesn't always work,
 because MS-Windows doesn't allow it.  The client will move the server to the

runtime/doc/starting.txt

@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 8.2.  Last change: 2022 Jan 20
+*starting.txt*  For Vim version 8.2.  Last change: 2022 Feb 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -256,6 +256,8 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		Interfaces, such as Python, Ruby and Lua, are also disabled,
 		since they could be used to execute shell commands.  Perl uses
 		the Safe module.
+		For Unix restricted mode is used when the last part of $SHELL
+		is "nologin" or "false".
 		Note that the user may still find a loophole to execute a
 		shell command, it has only been made difficult.
 

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 8.2.  Last change: 2021 Nov 20
+*syntax.txt*	For Vim version 8.2.  Last change: 2022 Feb 06
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -215,7 +215,8 @@ A syntax group name doesn't specify any color or attributes itself.
 
 The name for a highlight or syntax group must consist of ASCII letters, digits
 and the underscore.  As a regexp: "[a-zA-Z0-9_]*".  However, Vim does not give
-an error when using other characters.
+an error when using other characters.  The maxium length of a group name is
+about 200 bytes.  *E1249*
 
 To be able to allow each user to pick their favorite set of colors, there must
 be preferred names for highlight groups that are common for many languages.
@@ -1536,6 +1537,14 @@ The enhanced mode also takes advantage of additional color features for a dark
 gvim display.  Here, statements are colored LightYellow instead of Yellow, and
 conditionals are LightBlue for better distinction.
 
+Both Visual Basic and FORM use the extension ".frm".  To detect which one
+should be used, Vim checks for the string "VB_Name" in the first five lines of
+the file.  If it is found, filetype will be "vb", otherwise "form".
+
+If the automatic detection doesn't work for you or you only edit, for
+example, FORM files, use this in your startup vimrc: >
+   :let filetype_frm = "form"
+
 
 FORTH						*forth.vim* *ft-forth-syntax*
 
@@ -3704,12 +3713,13 @@ DEFINING CASE						*:syn-case* *E390*
 	items until the next ":syntax case" command are affected.
 
 :sy[ntax] case
-	Show either "syntax case match" or "syntax case ignore" (translated).
+	Show either "syntax case match" or "syntax case ignore".
 
 
 DEFINING FOLDLEVEL					*:syn-foldlevel*
 
-:sy[ntax] foldlevel [start | minimum]
+:sy[ntax] foldlevel start
+:sy[ntax] foldlevel minimum
 	This defines how the foldlevel of a line is computed when using
 	foldmethod=syntax (see |fold-syntax| and |:syn-fold|):
 
@@ -3722,13 +3732,16 @@ DEFINING FOLDLEVEL					*:syn-foldlevel*
 	may close and open horizontally within a line.
 
 :sy[ntax] foldlevel
-	Show either "syntax foldlevel start" or "syntax foldlevel minimum".
+	Show the current foldlevel method, either "syntax foldlevel start" or
+	"syntax foldlevel minimum".
 
 	{not meaningful when Vim was compiled without |+folding| feature}
 
 SPELL CHECKING						*:syn-spell*
 
-:sy[ntax] spell [toplevel | notoplevel | default]
+:sy[ntax] spell toplevel
+:sy[ntax] spell notoplevel
+:sy[ntax] spell default
 	This defines where spell checking is to be done for text that is not
 	in a syntax item:
 
@@ -3743,8 +3756,8 @@ SPELL CHECKING						*:syn-spell*
 	To activate spell checking the 'spell' option must be set.
 
 :sy[ntax] spell
-	Show either "syntax spell toplevel", "syntax spell notoplevel" or
-	"syntax spell default" (translated).
+	Show the current syntax spell checking method, either "syntax spell
+	toplevel", "syntax spell notoplevel" or "syntax spell default".
 
 
 SYNTAX ISKEYWORD SETTING				*:syn-iskeyword*
@@ -4343,7 +4356,7 @@ IMPLICIT CONCEAL					*:syn-conceal-implicit*
 	given explicitly.
 
 :sy[ntax] conceal
-	Show either "syntax conceal on" or "syntax conceal off" (translated).
+	Show either "syntax conceal on" or "syntax conceal off".
 
 ==============================================================================
 8. Syntax patterns				*:syn-pattern* *E401* *E402*

runtime/doc/tabpage.txt

@@ -1,4 +1,4 @@
-*tabpage.txt*   For Vim version 8.2.  Last change: 2020 Oct 14
+*tabpage.txt*   For Vim version 8.2.  Last change: 2022 Feb 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -143,7 +143,9 @@ something else.
 		    :tabclose 3	    " close the third tab page
 		    :tabclose $	    " close the last tab page
 		    :tabclose #     " close the last accessed tab page
-<
+
+When a tab is closed the next tab page will become the current one.
+
 							*:tabo* *:tabonly*
 :tabo[nly][!]	Close all other tab pages.
 		When the 'hidden' option is set, all buffers in closed windows

runtime/doc/tags

@@ -2415,6 +2415,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 :dsp	tagsrch.txt	/*:dsp*
 :dsplit	tagsrch.txt	/*:dsplit*
 :e	editing.txt	/*:e*
+:e#	editing.txt	/*:e#*
 :ea	undo.txt	/*:ea*
 :earlier	undo.txt	/*:earlier*
 :ec	eval.txt	/*:ec*
@@ -2432,6 +2433,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 :edit	editing.txt	/*:edit*
 :edit!	editing.txt	/*:edit!*
 :edit!_f	editing.txt	/*:edit!_f*
+:edit_#	editing.txt	/*:edit_#*
 :edit_f	editing.txt	/*:edit_f*
 :el	eval.txt	/*:el*
 :else	eval.txt	/*:else*
@@ -3948,6 +3950,7 @@ Dictionary-function	eval.txt	/*Dictionary-function*
 DiffUpdated	autocmd.txt	/*DiffUpdated*
 Digraphs	digraph.txt	/*Digraphs*
 DirChanged	autocmd.txt	/*DirChanged*
+DirChangedPre	autocmd.txt	/*DirChangedPre*
 E	motion.txt	/*E*
 E10	message.txt	/*E10*
 E100	diff.txt	/*E100*
@@ -4031,6 +4034,7 @@ E1075	vim9.txt	/*E1075*
 E1076	eval.txt	/*E1076*
 E1077	vim9.txt	/*E1077*
 E108	eval.txt	/*E108*
+E1080	vim9.txt	/*E1080*
 E1081	eval.txt	/*E1081*
 E1083	editing.txt	/*E1083*
 E1084	eval.txt	/*E1084*
@@ -4041,6 +4045,7 @@ E1089	eval.txt	/*E1089*
 E109	eval.txt	/*E109*
 E1090	eval.txt	/*E1090*
 E1091	vim9.txt	/*E1091*
+E1092	various.txt	/*E1092*
 E1093	eval.txt	/*E1093*
 E1094	vim9.txt	/*E1094*
 E1095	eval.txt	/*E1095*
@@ -4096,19 +4101,62 @@ E1139	vim9.txt	/*E1139*
 E114	eval.txt	/*E114*
 E1140	eval.txt	/*E1140*
 E1141	eval.txt	/*E1141*
+E1142	testing.txt	/*E1142*
 E1143	eval.txt	/*E1143*
 E1144	vim9.txt	/*E1144*
 E1145	eval.txt	/*E1145*
+E1146	vim9.txt	/*E1146*
+E1147	eval.txt	/*E1147*
+E1148	eval.txt	/*E1148*
+E1149	vim9.txt	/*E1149*
 E115	eval.txt	/*E115*
+E1150	vim9.txt	/*E1150*
+E1151	eval.txt	/*E1151*
+E1152	vim9.txt	/*E1152*
+E1153	eval.txt	/*E1153*
+E1154	eval.txt	/*E1154*
 E1155	autocmd.txt	/*E1155*
-E1158	builtin.txt	/*E1158*
+E1156	editing.txt	/*E1156*
+E1157	vim9.txt	/*E1157*
+E1158	vim9.txt	/*E1158*
+E1159	windows.txt	/*E1159*
 E116	eval.txt	/*E116*
+E1160	vim9.txt	/*E1160*
+E1161	builtin.txt	/*E1161*
+E1162	builtin.txt	/*E1162*
+E1163	vim9.txt	/*E1163*
+E1164	vim9.txt	/*E1164*
+E1165	eval.txt	/*E1165*
+E1166	eval.txt	/*E1166*
+E1167	vim9.txt	/*E1167*
+E1168	vim9.txt	/*E1168*
 E1169	eval.txt	/*E1169*
 E117	eval.txt	/*E117*
+E1170	vim9.txt	/*E1170*
+E1171	vim9.txt	/*E1171*
+E1172	vim9.txt	/*E1172*
+E1173	vim9.txt	/*E1173*
+E1174	vim9.txt	/*E1174*
+E1175	vim9.txt	/*E1175*
+E1176	vim9.txt	/*E1176*
+E1177	eval.txt	/*E1177*
+E1178	vim9.txt	/*E1178*
+E1179	options.txt	/*E1179*
 E118	eval.txt	/*E118*
+E1180	vim9.txt	/*E1180*
+E1181	vim9.txt	/*E1181*
+E1182	eval.txt	/*E1182*
+E1183	eval.txt	/*E1183*
+E1184	eval.txt	/*E1184*
+E1185	various.txt	/*E1185*
+E1186	vim9.txt	/*E1186*
 E1187	starting.txt	/*E1187*
 E1188	cmdline.txt	/*E1188*
+E1189	vim9.txt	/*E1189*
 E119	eval.txt	/*E119*
+E1190	vim9.txt	/*E1190*
+E1191	vim9.txt	/*E1191*
+E1192	eval.txt	/*E1192*
 E1193	options.txt	/*E1193*
 E1194	options.txt	/*E1194*
 E1195	options.txt	/*E1195*
@@ -4120,25 +4168,77 @@ E12	message.txt	/*E12*
 E120	eval.txt	/*E120*
 E1200	options.txt	/*E1200*
 E1201	options.txt	/*E1201*
-E1205	builtin.txt	/*E1205*
+E1202	vim9.txt	/*E1202*
+E1203	eval.txt	/*E1203*
+E1204	pattern.txt	/*E1204*
+E1205	vim9.txt	/*E1205*
+E1206	vim9.txt	/*E1206*
+E1207	eval.txt	/*E1207*
 E1208	map.txt	/*E1208*
+E1209	builtin.txt	/*E1209*
 E121	eval.txt	/*E121*
+E1210	vim9.txt	/*E1210*
+E1211	vim9.txt	/*E1211*
+E1212	vim9.txt	/*E1212*
+E1213	vim9.txt	/*E1213*
 E1214	builtin.txt	/*E1214*
+E1215	builtin.txt	/*E1215*
+E1216	builtin.txt	/*E1216*
+E1217	vim9.txt	/*E1217*
+E1218	vim9.txt	/*E1218*
+E1219	vim9.txt	/*E1219*
 E122	eval.txt	/*E122*
+E1220	vim9.txt	/*E1220*
+E1221	vim9.txt	/*E1221*
+E1222	vim9.txt	/*E1222*
+E1223	vim9.txt	/*E1223*
+E1224	vim9.txt	/*E1224*
+E1225	vim9.txt	/*E1225*
+E1226	vim9.txt	/*E1226*
+E1227	vim9.txt	/*E1227*
+E1228	vim9.txt	/*E1228*
+E1229	eval.txt	/*E1229*
 E123	eval.txt	/*E123*
+E1230	options.txt	/*E1230*
 E1231	map.txt	/*E1231*
 E1232	builtin.txt	/*E1232*
 E1233	builtin.txt	/*E1233*
+E1234	vim9.txt	/*E1234*
+E1235	vim9.txt	/*E1235*
+E1236	vim9.txt	/*E1236*
 E1237	map.txt	/*E1237*
+E1238	vim9.txt	/*E1238*
 E1239	builtin.txt	/*E1239*
 E124	eval.txt	/*E124*
+E1240	change.txt	/*E1240*
+E1241	change.txt	/*E1241*
+E1242	change.txt	/*E1242*
 E1243	options.txt	/*E1243*
 E1244	message.txt	/*E1244*
 E1245	cmdline.txt	/*E1245*
+E1246	eval.txt	/*E1246*
+E1247	cmdline.txt	/*E1247*
+E1248	vim9.txt	/*E1248*
+E1249	syntax.txt	/*E1249*
 E125	eval.txt	/*E125*
+E1250	vim9.txt	/*E1250*
+E1251	vim9.txt	/*E1251*
+E1252	vim9.txt	/*E1252*
+E1253	vim9.txt	/*E1253*
+E1254	vim9.txt	/*E1254*
 E1255	map.txt	/*E1255*
+E1256	vim9.txt	/*E1256*
+E1257	vim9.txt	/*E1257*
+E1258	vim9.txt	/*E1258*
+E1259	vim9.txt	/*E1259*
 E126	eval.txt	/*E126*
+E1260	vim9.txt	/*E1260*
+E1261	vim9.txt	/*E1261*
+E1262	vim9.txt	/*E1262*
 E1263	eval.txt	/*E1263*
+E1264	vim9.txt	/*E1264*
+E1265	eval.txt	/*E1265*
+E1266	if_pyth.txt	/*E1266*
 E127	eval.txt	/*E127*
 E128	eval.txt	/*E128*
 E129	eval.txt	/*E129*
@@ -6125,6 +6225,7 @@ conversion-server	mbyte.txt	/*conversion-server*
 convert-to-HTML	syntax.txt	/*convert-to-HTML*
 convert-to-XHTML	syntax.txt	/*convert-to-XHTML*
 convert-to-XML	syntax.txt	/*convert-to-XML*
+convert_legacy_function_to_vim9	vim9.txt	/*convert_legacy_function_to_vim9*
 copy()	builtin.txt	/*copy()*
 copy-diffs	diff.txt	/*copy-diffs*
 copy-move	change.txt	/*copy-move*
@@ -7779,7 +7880,6 @@ interactive-functions	usr_41.txt	/*interactive-functions*
 interfaces-5.2	version5.txt	/*interfaces-5.2*
 internal-variables	eval.txt	/*internal-variables*
 internal-wordlist	spell.txt	/*internal-wordlist*
-internal_get_nv_cmdchar()	builtin.txt	/*internal_get_nv_cmdchar()*
 internet	intro.txt	/*internet*
 interrupt()	builtin.txt	/*interrupt()*
 intro	intro.txt	/*intro*
@@ -9919,10 +10019,7 @@ test_feedinput()	testing.txt	/*test_feedinput()*
 test_garbagecollect_now()	testing.txt	/*test_garbagecollect_now()*
 test_garbagecollect_soon()	testing.txt	/*test_garbagecollect_soon()*
 test_getvalue()	testing.txt	/*test_getvalue()*
-test_gui_drop_files()	testing.txt	/*test_gui_drop_files()*
-test_gui_mouse_event()	testing.txt	/*test_gui_mouse_event()*
-test_gui_tabline_event()	testing.txt	/*test_gui_tabline_event()*
-test_gui_tabmenu_event()	testing.txt	/*test_gui_tabmenu_event()*
+test_gui_event()	testing.txt	/*test_gui_event()*
 test_ignore_error()	testing.txt	/*test_ignore_error()*
 test_null_blob()	testing.txt	/*test_null_blob()*
 test_null_channel()	testing.txt	/*test_null_channel()*
@@ -9935,7 +10032,6 @@ test_null_string()	testing.txt	/*test_null_string()*
 test_option_not_set()	testing.txt	/*test_option_not_set()*
 test_override()	testing.txt	/*test_override()*
 test_refcount()	testing.txt	/*test_refcount()*
-test_scrollbar()	testing.txt	/*test_scrollbar()*
 test_setmouse()	testing.txt	/*test_setmouse()*
 test_settime()	testing.txt	/*test_settime()*
 test_srand_seed()	testing.txt	/*test_srand_seed()*
@@ -10436,6 +10532,7 @@ vim9-namespace	vim9.txt	/*vim9-namespace*
 vim9-no-dict-function	vim9.txt	/*vim9-no-dict-function*
 vim9-rationale	vim9.txt	/*vim9-rationale*
 vim9-reload	vim9.txt	/*vim9-reload*
+vim9-s-namespace	vim9.txt	/*vim9-s-namespace*
 vim9-scopes	vim9.txt	/*vim9-scopes*
 vim9-script-intro	usr_46.txt	/*vim9-script-intro*
 vim9-types	vim9.txt	/*vim9-types*
@@ -10593,6 +10690,7 @@ windowid	windows.txt	/*windowid*
 windowid-variable	eval.txt	/*windowid-variable*
 windows	windows.txt	/*windows*
 windows-3.1	os_win32.txt	/*windows-3.1*
+windows-asynchronously	os_win32.txt	/*windows-asynchronously*
 windows-icon	os_win32.txt	/*windows-icon*
 windows-intro	windows.txt	/*windows-intro*
 windows-starting	windows.txt	/*windows-starting*
@@ -10766,6 +10864,7 @@ zz	scroll.txt	/*zz*
 {offset}	pattern.txt	/*{offset}*
 {register}	change.txt	/*{register}*
 {rhs}	map.txt	/*{rhs}*
+{server}	remote.txt	/*{server}*
 {subject}	helphelp.txt	/*{subject}*
 {}	intro.txt	/*{}*
 }	motion.txt	/*}*

runtime/doc/testing.txt

@@ -1,4 +1,4 @@
-*testing.txt*	For Vim version 8.2.  Last change: 2022 Jan 23
+*testing.txt*	For Vim version 8.2.  Last change: 2022 Feb 10
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -65,8 +65,9 @@ test_garbagecollect_now()			 *test_garbagecollect_now()*
 		Like garbagecollect(), but executed right away.  This must
 		only be called directly to avoid any structure to exist
 		internally, and |v:testing| must have been set before calling
-		any function.  This will not work when called from a :def
-		function, because variables on the stack will be freed.
+		any function.   *E1142*
+		This will not work when called from a :def function, because
+		variables on the stack will be freed.
 
 
 test_garbagecollect_soon()			 *test_garbagecollect_soon()*
@@ -92,6 +93,7 @@ test_gui_event({event}, {args})
 		    "dropfiles"	drop one or more files in a window.
 		    "findrepl"  search and replace text
 		    "mouse"	mouse button click event.
+		    "scrollbar" move or drag the scrollbar
 		    "tabline"	select a tab page by mouse click.
 		    "tabmenu"	select a tabline menu entry.
 
@@ -113,6 +115,7 @@ test_gui_event({event}, {args})
 		  |drop_file| feature is present.
 
 		"findrepl":
+		  {only available when the GUI has a find/replace dialog}
 		  Perform a search and replace of text.  The supported items
 		  in {args} are:
 		    find_text:	string to find.
@@ -149,6 +152,22 @@ test_gui_event({event}, {args})
 				    8	alt is pressed
 				   16	ctrl is pressed
 
+		"scrollbar":
+		  Set or drag the left, right or horizontal scrollbar.  Only
+		  works when the scrollbar actually exists.  The supported
+		  items in {args} are:
+		    which:	scrollbar. The supported values are:
+				    left  Left scrollbar of the current window
+				    right Right scrollbar of the current window
+				    hor   Horizontal scrollbar
+		    value:	amount to scroll.  For the vertical scrollbars
+				the value can be 1 to the line-count of the
+				buffer.  For the horizontal scrollbar the
+				value can be between 1 and the maximum line
+				length, assuming 'wrap' is not set.
+		    dragging:	1 to drag the scrollbar and 0 to click in the
+				scrollbar.
+
 		"tabline":
 		  Inject a mouse click event on the tabline to select a
 		  tabpage. The supported items in {args} are:
@@ -284,27 +303,6 @@ test_refcount({expr})					*test_refcount()*
 			GetVarname()->test_refcount()
 
 
-test_scrollbar({which}, {value}, {dragging})		*test_scrollbar()*
-		Pretend using scrollbar {which} to move it to position
-		{value}.  {which} can be:
-			left	Left scrollbar of the current window
-			right	Right scrollbar of the current window
-			hor	Horizontal scrollbar
-
-		For the vertical scrollbars {value} can be 1 to the
-		line-count of the buffer.  For the horizontal scrollbar the
-		{value} can be between 1 and the maximum line length, assuming
-		'wrap' is not set.
-
-		When {dragging} is non-zero it's like dragging the scrollbar,
-		otherwise it's like clicking in the scrollbar.
-		Only works when the {which} scrollbar actually exists,
-		obviously only when using the GUI.
-
-		Can also be used as a |method|: >
-			GetValue()->test_scrollbar('right', 0)
-
-
 test_setmouse({row}, {col})				*test_setmouse()*
 		Set the mouse position to be used for the next mouse action.
 		{row} and {col} are one based.

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.2.  Last change: 2022 Jan 29
+*todo.txt*      For Vim version 8.2.  Last change: 2022 Feb 16
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,24 +38,14 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Only find a global function from Vim9 script when using "g:" ?  #9637
-
-Disallow defining a script#Func() in Vim9 script.
-
-Cannot use command modifier for "import 'name.vim' as vim9"
-
-When making a copy of a list or dict, do not keep the type? #9644
-    With deepcopy() all, with copy() this still fails:
-    var l: list<list<number>> = [[1], [2]]
-    l->copy()[0][0] = 'x'
-
-Remove EBCDIC support?
-
 Once Vim9 is stable:
-- Add all the error numbers in a good place in documentation.
-    done until E1145
-- Check code coverage, add more tests if needed.
 - Use Vim9 for runtime files.
+- Check code coverage, add more tests if needed.
+	vim9execute.c
+	vim9expr.c
+	vim9instr.c
+	vim9script.c
+	vim9type.c
 
 Further Vim9 improvements, possibly after launch:
 - Check performance with callgrind and kcachegrind.
@@ -427,9 +417,6 @@ When editing a file with ":edit" the output of :swapname is relative, while
 editing it with "vim file" it is absolute. (#355)
 Which one should it be?
 
-:map output does not clear the reset of the command line.
-(#5623, also see #5962)
-
 Problem with auto-formatting - inserting space and putting cursor before added
 character. (#6154)
 
@@ -4849,9 +4836,6 @@ Autocommands:
     CursorHoldC     - CursorHold while command-line editing
     WinMoved	    - when windows have been moved around, e.g, ":wincmd J"
     SearchPost	    - After doing a search command (e.g. to do "M")
-    PreDirChanged/PostDirChanged
-		    - Before/after ":cd" has been used (for changing the
-		      window title)
     ShutDown	    - when the system is about to shut down
     InsertCharPost  - user typed a character in Insert mode, after inserting
 		      the char.

runtime/doc/uganda.txt

@@ -1,4 +1,4 @@
-*uganda.txt*    For Vim version 8.2.  Last change: 2020 Jan 08
+*uganda.txt*    For Vim version 8.2.  Last change: 2022 Feb 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -11,9 +11,9 @@ Vim is Charityware.  You can use and copy it as much as you like, but you are
 encouraged to make a donation for needy children in Uganda.  Please see |kcc|
 below or visit the ICCF web site, available at these URLs:
 
-	http://iccf-holland.org/
-	http://www.vim.org/iccf/
-	http://www.iccf.nl/
+	https://iccf-holland.org/
+	https://www.vim.org/iccf/
+	https://www.iccf.nl/
 
 You can also sponsor the development of Vim.  Vim sponsors can vote for
 features.  See |sponsor|.  The money goes to Uganda anyway.
@@ -169,10 +169,11 @@ households are stimulated to build a proper latrine.  I helped setting up a
 production site for cement slabs.  These are used to build a good latrine.
 They are sold below cost price.
 
-There is a small clinic at the project, which provides children and their
-family with medical help.  When needed, transport to a hospital is offered.
-Immunization programs are carried out and help is provided when an epidemic is
-breaking out (measles and cholera have been a problem).
+There is a clinic at the project, which provides children and their family
+medical help.  Since 2020 a maternity ward was added and 24/7 service is
+available.  When needed, transport to a hospital is offered.  Immunization
+programs are carried out and help is provided when an epidemic is breaking out
+(measles and cholera have been a problem).
 							*donate*
 Summer 1994 to summer 1995 I spent a whole year at the centre, working as a
 volunteer.  I have helped to expand the centre and worked in the area of water
@@ -214,44 +215,29 @@ Check the ICCF web site for the latest information!  See |iccf| for the URL.
 
 
 USA:		The methods mentioned below can be used.
-		Sending a check to the Nehemiah Group Outreach Society (NGOS)
-		is no longer possible, unfortunately. We are looking for
-		another way to get you an IRS tax receipt.
-		For sponsoring a child contact KCF in Canada (see below). US
-		checks can be sent to them to lower banking costs.
+		If you must send a check send it to our Canadian partner:
+		https://www.kuwasha.net/
 
-Canada:		Contact Kibaale Children's Fund (KCF) in Surrey, Canada.  They
-		take care of the Canadian sponsors for the children in
-		Kibaale.  KCF forwards 100% of the money to the project in
-		Uganda.  You can send them a one time donation directly.
+Canada:		Contact Kuwasha in Surrey, Canada.  They take care of the
+		Canadian sponsors for the children in Kibaale.  Kuwasha
+		forwards 100% of the money to the project in Uganda.  You can
+		send them a one time donation directly.
 		Please send me a note so that I know what has been donated
-		because of Vim.  Ask KCF for information about sponsorship.
-			Kibaale Children's Fund c/o Pacific Academy
-			10238-168 Street
-			Surrey, B.C. V4N 1Z4
-			Canada
-			Phone: 604-581-5353
-		If you make a donation to Kibaale Children's Fund (KCF) you
-		will receive a tax receipt which can be submitted with your
-		tax return.
+		because of Vim.  Look on their site for information about
+		sponsorship: https://www.kuwasha.net/
+		If you make a donation to Kuwasha you will receive a tax
+		receipt which can be submitted with your tax return.
 
-Holland:	Transfer to the account of "Stichting ICCF Holland" in Lisse.
-		This will allow for tax deduction if you live in Holland.
-			Postbank, nr. 4548774
-			IBAN: NL95 INGB 0004 5487 74
+Holland:	Transfer to the account of "Stichting ICCF Holland" in
+		Amersfoort.  This will allow for tax deduction if you live in
+		Holland.  ING bank, IBAN: NL95 INGB 0004 5487 74
 
 Germany:	It is possible to make donations that allow for a tax return.
 		Check the ICCF web site for the latest information:
-			http://iccf-holland.org/germany.html
+			https://iccf-holland.org/germany.html
 
-World:		Use a postal money order.  That should be possible from any
-		country, mostly from the post office.  Use this name (which is
-		in my passport): "Abraham Moolenaar".  Use Euro for the
-		currency if possible.
-
-Europe:		Use a bank transfer if possible.  Your bank should have a form
-		that you can use for this.  See "Others" below for the swift
-		code and IBAN number.
+Europe:		Use a bank transfer if possible.  See "Others" below for the
+		swift code and IBAN number.
 		Any other method should work.  Ask for information about
 		sponsorship.
 
@@ -261,28 +247,12 @@ Credit Card:	You can use PayPal to send money with a Credit card.  This is
 		    https://www.paypal.com/en_US/mrb/pal=XAC62PML3GF8Q
 		The e-mail address for sending the money to is:
 		    Bram@iccf-holland.org
-		For amounts above 400 Euro ($500) sending a check is
-		preferred.
 
-Others:		Transfer to one of these accounts if possible:
-		    Postbank, account 4548774
-				Swift code: INGB NL 2A
-				IBAN: NL95 INGB 0004 5487 74
-			under the name "stichting ICCF Holland", Lisse
-		    If that doesn't work:
-		    Rabobank Lisse, account 3765.05.117
-				Swift code: RABO NL 2U
-			under the name "Bram Moolenaar", Lisse
-		Otherwise, send a check in euro or US dollars to the address
-		below.  Minimal amount: $70 (my bank does not accept smaller
-		amounts for foreign check, sorry)
+Others:		Transfer to this account if possible:
+		    ING bank: 	IBAN: NL95 INGB 0004 5487 74
+				Swift code: INGBNL2A
+		    under the name "stichting ICCF Holland", Amersfoort
+		Checks are not accepted.
 
-Address to send checks to:
-			Bram Moolenaar
-			Finsterruetihof 1
-			8134 Adliswil
-			Switzerland
-
-This address is expected to be valid for a long time.
 
  vim:tw=78:ts=8:noet:ft=help:norl:

runtime/doc/usr_41.txt

@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 8.2.  Last change: 2022 Jan 28
+*usr_41.txt*	For Vim version 8.2.  Last change: 2022 Feb 11
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -162,7 +162,7 @@ and avoid errors.  Such as thinking that the "-0o36" above makes the number
 negative, while it is actually seen as a subtraction.
 
 To actually have the minus sign be used for negation, you can put the second
-expression in parenthesis: >
+expression in parentheses: >
 
 	echo -0x7f (-0o36)
 
@@ -1110,7 +1110,6 @@ Testing:				    *test-functions*
 	assert_nobeep()		assert that a command does not cause a beep
 	assert_fails()		assert that a command fails
 	assert_report()		report a test failure
-	internal_get_nv_cmdchar()  normal/visual command character at an index
 	test_alloc_fail()	make memory allocation fail
 	test_autochdir()	enable 'autochdir' during startup
 	test_override()		test with Vim internal overrides
@@ -1131,7 +1130,6 @@ Testing:				    *test-functions*
 	test_setmouse()		set the mouse position
 	test_feedinput()	add key sequence to input buffer
 	test_option_not_set()	reset flag indicating option was set
-	test_scrollbar()	simulate scrollbar movement in the GUI
 	test_refcount()		return an expression's reference count
 	test_srand_seed()	set the seed value for srand()
 	test_unknown()		return a value with unknown type
@@ -2514,6 +2512,8 @@ continuation, as mentioned above |use-cpo-save|.
 For undoing the effect of an indent script, the b:undo_indent variable should
 be set accordingly.
 
+Both these variables use legacy script syntax, not |Vim9| syntax.
+
 
 FILE NAME
 

runtime/doc/various.txt

@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 8.2.  Last change: 2022 Jan 15
+*various.txt*   For Vim version 8.2.  Last change: 2022 Feb 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -424,7 +424,7 @@ m  *+mzscheme*		Mzscheme interface |mzscheme|
 m  *+mzscheme/dyn*	Mzscheme interface |mzscheme-dynamic| |/dyn|
 m  *+netbeans_intg*	|netbeans|
 T  *+num64*		64-bit Number support |Number|
-   			Always enabled since 8.2.0271, use v:numbersize to
+			Always enabled since 8.2.0271, use v:numbersize to
 			check the actual size of a Number.
 m  *+ole*		Win32 GUI only: |ole-interface|
 N  *+packages*		Loading |packages|
@@ -549,7 +549,7 @@ N  *+X11*		Unix only: can restore window title |X11|
 			backward compatibility, the ">" after the register
 			name can be omitted.
 :redi[r] @">>		Append messages to the unnamed register.
-
+							*E1092*
 :redi[r] => {var}	Redirect messages to a variable.
 			In legacy script: If the variable doesn't exist, then
 			it is created.  If the variable exists, then it is
@@ -566,7 +566,7 @@ N  *+X11*		Unix only: can restore window title |X11|
 
 :redi[r] =>> {var}	Append messages to an existing variable.  Only string
 			variables can be used.
-
+								 *E1185*
 :redi[r] END		End redirecting messages.
 
 							*:filt* *:filter*
@@ -649,7 +649,7 @@ N  *+X11*		Unix only: can restore window title |X11|
 			used.  In this example |:silent| is used to avoid the
 			message about reading the file and |:unsilent| to be
 			able to list the first line of each file. >
-    		:silent argdo unsilent echo expand('%') . ": " . getline(1)
+		:silent argdo unsilent echo expand('%') . ": " . getline(1)
 <
 
 						*:verb* *:verbose*

runtime/doc/version8.txt

@@ -1,4 +1,4 @@
-*version8.txt*  For Vim version 8.2.  Last change: 2021 Jul 24
+*version8.txt*  For Vim version 8.2.  Last change: 2022 Feb 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -25971,7 +25971,7 @@ Added functions:
 	|test_getvalue()|
 	|test_null_blob()|
 	|test_refcount()|
-	|test_scrollbar()|
+	test_scrollbar() (later replaced with |test_gui_event()|)
 	|test_setmouse()|
 	|win_execute()|
 	|win_splitmove()|

runtime/doc/vim-ja.UTF-8.1

@@ -1,4 +1,4 @@
-.TH VIM 1 "2006 Apr 11"
+.TH VIM 1 "2021 Jun 13"
 .SH 名前
 vim \- Vi IMproved, プログラマのテキストエディタ
 .SH 書式

runtime/doc/vim9.txt

@@ -1,4 +1,4 @@
-*vim9.txt*	For Vim version 8.2.  Last change: 2022 Jan 29
+*vim9.txt*	For Vim version 8.2.  Last change: 2022 Feb 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -56,14 +56,14 @@ Vim9 script and legacy Vim script can be mixed.  There is no requirement to
 rewrite old scripts, they keep working as before.  You may want to use a few
 `:def` functions for code that needs to be fast.
 
-:vim9[cmd] {cmd}				*:vim9* *:vim9cmd*
-		Execute {cmd} using Vim9 script syntax and semantics.
-		Useful when typing a command and in a legacy script or
-		function.
+:vim9[cmd] {cmd}				*:vim9* *:vim9cmd* *E1164*
+		Evaluate and execute {cmd} using Vim9 script syntax and
+		semantics.  Useful when typing a command and in a legacy
+		script or function.
 
-:leg[acy] {cmd}					*:leg* *:legacy*
-		Execute {cmd} using legacy script syntax and semantics.  Only
-		useful in a Vim9 script or a :def function.
+:leg[acy] {cmd}					*:leg* *:legacy* *E1189* *E1234*
+		Evaluate and execute {cmd} using legacy script syntax and
+		semantics.  Only useful in a Vim9 script or a :def function.
 		Note that {cmd} cannot use local variables, since it is parsed
 		with legacy expression syntax.
 
@@ -72,7 +72,7 @@ rewrite old scripts, they keep working as before.  You may want to use a few
 2. Differences from legacy Vim script			*vim9-differences*
 
 Overview ~
-
+							*E1146*
 Brief summary of the differences you will most often encounter when using Vim9
 script and `:def` functions; details are below:
 - Comments start with #, not ": >
@@ -128,7 +128,7 @@ To improve readability there must be a space between a command and the #
 that starts a comment: >
 	var name = value # comment
 	var name = value# error!
-
+<							*E1170*
 Do not start a comment with #{, it looks like the legacy dictionary literal
 and produces an error where this might be confusing.  #{{ or #{{{ are OK,
 these can be used to start a fold.
@@ -153,7 +153,7 @@ Compilation is done when any of these is encountered:
 - `:disassemble` is used for the function.
 - a function that is compiled calls the function or uses it as a function
   reference (so that the argument and return types can be checked)
-							*E1091*
+						*E1091* *E1191*
 If compilation fails it is not tried again on the next call, instead this
 error is given: "E1091: Function is not compiled: {name}".
 Compilation will fail when encountering a user command that has not been
@@ -183,14 +183,14 @@ You can call a legacy dict function though: >
 	  var d = {func: Legacy, value: 'text'}
 	  d.func()
 	enddef
-<							*E1096*
+<						*E1096* *E1174* *E1175*
 The argument types and return type need to be specified.  The "any" type can
 be used, type checking will then be done at runtime, like with legacy
 functions.
 							*E1106*
 Arguments are accessed by name, without "a:", just like any other language.
 There is no "a:" dictionary or "a:000" list.
-					*vim9-variable-arguments* *E1055*
+			*vim9-variable-arguments* *E1055* *E1160* *E1180*
 Variable arguments are defined as the last argument, with a name and have a
 list type, similar to TypeScript.  For example, a list of numbers: >
 	def MyFunc(...itemlist: list<number>)
@@ -206,7 +206,7 @@ should use its default value.  Example: >
 	enddef
 	MyFunc(v:none, 'LAST')  # first argument uses default value 'one'
 <
-						*vim9-ignored-argument*
+					*vim9-ignored-argument* *E1181*
 The argument "_" (an underscore) can be used to ignore the argument.  This is
 most useful in callbacks where you don't need it, but do need to give an
 argument to match the call.  E.g. when using map() two arguments are passed,
@@ -219,20 +219,18 @@ be given.
 Functions and variables are script-local by default ~
 							*vim9-scopes*
 When using `:function` or `:def` to specify a new function at the script level
-in a Vim9 script, the function is local to the script, as if "s:" was
-prefixed.  Using the "s:" prefix is optional.  To define a global function or
-variable the "g:" prefix must be used.  For functions in an autoload script
-the "name#" prefix is sufficient. >
+in a Vim9 script, the function is local to the script.  Like prefixing "s:" in
+legacy script.  To define a global function or variable the "g:" prefix must
+be used.  For functions in a script that is to be imported and in an autoload
+script "export" needs to be used. >
 	def ThisFunction()          # script-local
-	def s:ThisFunction()        # script-local
 	def g:ThatFunction()        # global
-	def scriptname#function()   # autoload
+	export def Function()       # for import and import autoload
 <						*E1058* *E1075*
 When using `:function` or `:def` to specify a nested function inside a `:def`
 function and no namespace was given, this nested function is local to the code
-block it is defined in.  In a `:def` function it is not possible to define a
-script-local function.  It is possible to define a global function by using
-the "g:" prefix.
+block it is defined in.  It is not possible to define a script-local function.
+It is possible to define a global function by using the "g:" prefix.
 
 When referring to a function and no "s:" or "g:" prefix is used, Vim will
 search for the function:
@@ -244,6 +242,13 @@ start with an upper case letter even when using the "s:" prefix.  In legacy
 script "s:funcref" could be used, because it could not be referred to with
 "funcref".  In Vim9 script it can, therefore "s:Funcref" must be used to avoid
 that the name interferes with builtin functions.
+							*vim9-s-namespace*
+The use of the "s:" prefix is not supported at the Vim9 script level.  All
+functions and variables without a prefix are script-local.
+In :def functions the use of "s:" is optional.  This is because in legacy
+script the "s:" might be needed.  Disallowing the use of "s:" only in a :def
+function in Vim9 script would be a bit confusing.
+In legacy functions the use of "s:" for script items is required, as before.
 
 In all cases the function must be defined before used.  That is when it is
 called, when `:defcompile` causes it to be compiled, or when code that calls
@@ -264,7 +269,7 @@ You can use an autoload function if needed, or call a legacy function and have
 
 
 Reloading a Vim9 script clears functions and variables by default ~
-							*vim9-reload*
+						*vim9-reload* *E1149* *E1150*
 When loading a legacy Vim script a second time nothing is removed, the
 commands will replace existing variables and functions and create new ones.
 
@@ -277,11 +282,14 @@ If you do want to keep items, use: >
 	vim9script noclear
 
 You want to use this in scripts that use a `finish` command to bail out at
-some point when loaded again.  E.g. when a buffer local option is set: >
+some point when loaded again.  E.g. when a buffer local option is set to a
+function, the function does not need to be defined more than once: >
 	vim9script noclear
 	setlocal completefunc=SomeFunc
-	if exists('*g:SomeFunc') | finish | endif
-	def g:SomeFunc()
+	if exists('*SomeFunc')
+	  finish
+	endif
+	def SomeFunc()
 	....
 
 
@@ -345,7 +353,8 @@ And with autocommands: >
 	   }
 
 Although using a :def function probably works better.
-				*E1022* *E1103* *E1130* *E1131* *E1133* *E1134*
+				*E1022* *E1103* *E1130* *E1131* *E1133*
+				*E1134* *E1235*
 Declaring a variable with a type but without an initializer will initialize to
 false (for bool), empty (for string, list, dict, etc.) or zero (for number,
 any, etc.).  This matters especially when using the "any" type, the value will
@@ -355,13 +364,13 @@ In Vim9 script `:let` cannot be used.  An existing variable is assigned to
 without any command.  The same for global, window, tab, buffer and Vim
 variables, because they are not really declared.  Those can also be deleted
 with `:unlet`.
-
+							*E1178*
 `:lockvar` does not work on local variables.  Use `:const` and `:final`
 instead.
 
 The `exists()` and `exists_compiled()` functions do not work on local variables
 or arguments.
-						*E1006* *E1041*
+				*E1006* *E1041* *E1167* *E1168* *E1213*
 Variables, functions and function arguments cannot shadow previously defined
 or imported variables and functions in the same script file.
 Variables may shadow Ex commands, rename the variable if needed.
@@ -372,13 +381,12 @@ Global variables must be prefixed with "g:", also at the script level. >
 	g:global = 'value'
 	var Funcref = g:ThatFunction
 
-Global functions must be prefixed with "g:" when defining them, but can be
-called without "g:". >
+Global functions must be prefixed with "g:": >
 	vim9script
 	def g:GlobalFunc(): string
 	  return 'text'
 	enddef
-	echo GlobalFunc()
+	echo g:GlobalFunc()
 The "g:" prefix is not needed for auto-load functions.
 
 					*vim9-function-defined-later*
@@ -415,7 +423,7 @@ similar to how a function argument can be ignored: >
 	[a, _, c] = theList
 To ignore any remaining items: >
 	[a, b; _] = longList
-
+<							*E1163* *E1080*
 Declaring more than one variable at a time, using the unpack notation, is
 possible.  Each variable can have a type or infer it from the value: >
 	var [v1: number, v2] = GetValues()
@@ -457,7 +465,7 @@ The constant only applies to the value itself, not what it refers to. >
 
 
 Omitting :call and :eval ~
-
+							*E1190*
 Functions can be called without `:call`: >
 	writefile(lines, 'file')
 Using `:call` is still possible, but this is discouraged.
@@ -517,7 +525,8 @@ because of the use of argument types.
 To avoid these problems Vim9 script uses a different syntax for a lambda,
 which is similar to JavaScript: >
 	var Lambda = (arg) => expression
-
+	var Lambda = (arg): type => expression
+<							*E1157*
 No line break is allowed in the arguments of a lambda up to and including the
 "=>" (so that Vim can tell the difference between an expression in parentheses
 and lambda arguments).  This is OK: >
@@ -533,7 +542,7 @@ But you can use a backslash to concatenate the lines before parsing: >
 	filter(list, (k,
 		\	v)
 		\	=> v > 0)
-<							*vim9-lambda-arguments*
+<					*vim9-lambda-arguments* *E1172*
 In legacy script a lambda could be called with any number of extra arguments,
 there was no way to warn for not using them.  In Vim9 script the number of
 arguments must match.  If you do want to accept any arguments, or any further
@@ -542,7 +551,7 @@ arguments, use "..._", which makes the function accept
 	var Callback = (..._) => 'anything'
 	echo Callback(1, 2, 3)  # displays "anything"
 
-<							*inline-function*
+<						*inline-function* *E1171*
 Additionally, a lambda can contain statements in {}: >
 	var Lambda = (arg) => {
 		g:was_called = 'yes'
@@ -736,7 +745,7 @@ Notes:
 
 
 White space ~
-				*E1004* *E1068* *E1069* *E1074* *E1127*
+			*E1004* *E1068* *E1069* *E1074* *E1127* *E1202*
 Vim9 script enforces proper use of white space.  This is no longer allowed: >
 	var name=234	# Error!
 	var name= 234	# Error!
@@ -770,7 +779,7 @@ White space is not allowed:
 	Func(
 	      arg	   # OK
 	      )
-
+<							*E1205*
 White space is not allowed in a `:set` command between the option name and a
 following "&", "!", "<", "=", "+=", "-=" or "^=".
 
@@ -780,6 +789,11 @@ No curly braces expansion ~
 |curly-braces-names| cannot be used.
 
 
+Command modifiers are not ignored ~
+								*E1176*
+Using a command modifier for a command that does not use it gives an error.
+
+
 Dictionary literals ~
 						*vim9-literal-dict* *E1014*
 Traditionally Vim has supported dictionary literals with a {} syntax: >
@@ -824,6 +838,7 @@ Instead of `:k` you can use `:mark`.
 Comparators ~
 
 The 'ignorecase' option is not used for comparators that use strings.
+Thus "=~" works like "=~#".
 
 
 Abort after error ~
@@ -838,7 +853,7 @@ error.  Example: >
 
 
 For loop ~
-
+							*E1254*
 The loop variable must not be declared yet: >
 	var i = 1
 	for i in [1, 2, 3]   # Error!
@@ -1104,7 +1119,7 @@ Using ++var or --var in an expression is not supported yet.
 			later in Vim9 script.  They can only be removed by
 			reloading the same script.
 
-							*:enddef* *E1057*
+					*:enddef* *E1057* *E1152* *E1173*
 :enddef			End of a function defined with `:def`. It should be on
 			a line by its own.
 
@@ -1183,6 +1198,67 @@ for each closure call a function to define it: >
 	echo range(5)->map((i, _) => flist[i]())
 	# Result: [0, 1, 2, 3, 4]
 
+In some situations, especially when calling a Vim9 closure from legacy
+context, the evaluation will fail.  *E1248*
+
+
+Converting a function from legacy to Vim9 ~
+					*convert_legacy_function_to_vim9*
+These are the most changes that need to be made to convert a legacy function
+to a Vim9 function:
+
+- Change `func` or `function` to `def`.
+- Change `endfunc` or `endfunction` to `enddef`.
+- Add types to the function arguments.
+- If the function returns something, add the return type.
+- Change comments to start with # instead of ".
+
+  For example, a legacy function: >
+	func MyFunc(text)
+	  " function body
+	endfunc
+<  Becomes: >
+	def MyFunc(text: string): number
+	  # function body
+	enddef
+
+- Remove "a:" used for arguments. E.g.: >
+	return len(a:text)
+<  Becomes: >
+	return len(text)
+
+- Change `let` used to declare a variable to `var`.
+- Remove `let` used to assign a value to a variable.  This is for local
+  variables already declared and b: w: g: and t: variables.
+
+  For example, legacy function: >
+	  let lnum = 1
+	  let lnum += 3
+	  let b:result = 42
+<  Becomes: >
+	  var lnum = 1
+	  lnum += 3
+	  b:result = 42
+
+- Insert white space in expressions where needed.
+- Change "." used for concatenation to "..".
+
+  For example, legacy function: >
+	  echo line(1).line(2)
+<  Becomes: >
+	  echo line(1) .. line(2)
+
+- line continuation does not always require a backslash: >
+  	echo ['one',
+		\ 'two',
+		\ 'three'
+		\ ]
+<  Becomes: >
+	echo ['one',
+		'two',
+		'three'
+		]
+
 ==============================================================================
 
 4. Types					*vim9-types*
@@ -1209,7 +1285,7 @@ Not supported yet:
 
 These types can be used in declarations, but no simple value will actually
 have the "void" type.  Trying to use a void (e.g. a function without a
-return value) results in error *E1031* .
+return value) results in error *E1031*  *E1186* .
 
 There is no array type, use list<{type}> instead.  For a list constant an
 efficient implementation is used that avoids allocating lot of small pieces of
@@ -1331,13 +1407,23 @@ Results in:
 For script-local variables in Vim9 script the type is checked, also when the
 variable was declared in a legacy function.
 
-When a type has been declared this is attached to a list or string.  When
+When a type has been declared this is attached to a List or Dictionary.  When
 later some expression attempts to change the type an error will be given: >
 	var ll: list<number> = [1, 2, 3]
-	ll->extend('x')  # Error, 'x' is not a number
+	ll->extend(['x'])  # Error, 'x' is not a number
 
-If the type is inferred then the type is allowed to change: >
-	[1, 2, 3]->extend('x')  # result: [1, 2, 3, 'x']
+If the type is not declared then it is allowed to change: >
+	[1, 2, 3]->extend(['x'])  # result: [1, 2, 3, 'x']
+
+For a variable declaration an inferred type matters: >
+	var ll = [1, 2, 3]
+	ll->extend(['x'])  # Error, 'x' is not a number
+That is because the declaration looks like a list of numbers, thus is
+equivalent to: >
+	var ll: list<number> = [1, 2, 3]
+If you do want a more permissive list you need to declare the type: >
+	var ll: list<any = [1, 2, 3]
+	ll->extend(['x'])  # OK
 
 
 Stricter type checking ~
@@ -1346,32 +1432,67 @@ In legacy Vim script, where a number was expected, a string would be
 automatically converted to a number.  This was convenient for an actual number
 such as "123", but leads to unexpected problems (and no error message) if the
 string doesn't start with a number.  Quite often this leads to hard-to-find
-bugs.
-
+bugs. e.g.: >
+	echo 123 == '123'
+<	1 ~
+With an accidental space: >
+	echo 123 == ' 123'
+<	0 ~
+							*E1206* *E1210* *E1212*
 In Vim9 script this has been made stricter.  In most places it works just as
-before, if the value used matches the expected type.  There will sometimes be
+before if the value used matches the expected type.  There will sometimes be
 an error, thus breaking backwards compatibility.  For example:
 - Using a number other than 0 or 1 where a boolean is expected.  *E1023*
 - Using a string value when setting a number option.
 - Using a number where a string is expected.   *E1024* *E1105*
 
 One consequence is that the item type of a list or dict given to |map()| must
-not change.  This will give an error in Vim9 script: >
-	echo map([1, 2, 3], (i, v) => 'item ' .. i)
-	E1012: Type mismatch; expected number but got string
-Instead use |mapnew()|: >
-	echo mapnew([1, 2, 3], (i, v) => 'item ' .. i)
-	['item 0', 'item 1', 'item 2']
+not change, if the type was declared.  This will give an error in Vim9
+script: >
+	var mylist: list<number> = [1, 2, 3]
+	echo map(mylist, (i, v) => 'item ' .. i)
+<	E1012: Type mismatch; expected number but got string in map() ~
 
-If the item type was determined to be "any" it can change to a more specific
-type.  E.g. when a list of mixed types gets changed to a list of strings: >
+Instead use |mapnew()|, it creates a new list: >
+	var mylist: list<number> = [1, 2, 3]
+	echo mapnew(mylist, (i, v) => 'item ' .. i)
+<	['item 0', 'item 1', 'item 2'] ~
+
+If the item type was not declared or determined to be "any" it can change to a
+more specific type.  E.g. when a list of mixed types gets changed to a list of
+strings: >
 	var mylist = [1, 2.0, '3']
 	# typename(mylist) == "list<any>"
 	map(mylist, (i, v) => 'item ' .. i)
 	# typename(mylist) == "list<string>", no error
 
+There is a subtle difference between using a list constant directly and
+through a variable declaraiton.  Because of type inference, when using a list
+constant to initialize a variable, this also sets the declared type: >
+	var mylist = [1, 2, 3]
+	# typename(mylist) == "list<number>"
+	echo map(mylist, (i, v) => 'item ' .. i)  # Error!
+
+When using the list constant directly, the type is not declared and is allowed
+to change: >
+	echo map([1, 2, 3], (i, v) => 'item ' .. i)  # OK
+
+The reasoning behind this is that when a type is declared and the list is
+passed around and changed, the declaration must always hold.  So that you can
+rely on the type to match the declared type.  For a constant this is not
+needed.
+
+								*E1158*
 Same for |extend()|, use |extendnew()| instead, and for |flatten()|, use
-|flattennew()| instead.
+|flattennew()| instead.  Since |flatten()| is intended to always change the
+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*
+Types are checked for most builtin functions to make it easier to spot
+mistakes.
 
 ==============================================================================
 
@@ -1460,16 +1581,16 @@ be exported. {not implemented yet: class, interface}
 
 
 Import ~
-					*:import* *:imp* *E1094* *E1047*
-					*E1048* *E1049* *E1053* *E1071*
+					*:import* *:imp* *E1094* *E1047* *E1262*
+					*E1048* *E1049* *E1053* *E1071* *E1236*
 The exported items can be imported in another Vim9 script: >
 	import "myscript.vim"
 
 This makes each item available as "myscript.item".
-							*:import-as*
+						*:import-as* *E1257* *E1261*
 In case the name is long or ambiguous, another name can be specified: >
 	import "thatscript.vim" as that
-<							*E1060*
+<						*E1060* *E1258* *E1259* *E1260*
 Then you can use "that.EXPORTED_CONST", "that.someValue", etc.  You are free
 to choose the name "that".  Use something that will be recognized as referring
 to the imported script.  Avoid command names, command modifiers and builtin
@@ -1527,17 +1648,19 @@ line, there can be no line break: >
 	echo that
 		.name  # Error!
 <							*:import-cycle*
-The `import` commands are executed when encountered.  If that script (directly
-or indirectly) imports the current script, then items defined after the
-`import` won't be processed yet.  Therefore cyclic imports can exist, but may
-result in undefined items.
+The `import` commands are executed when encountered.  If script A imports
+script B, and B (directly or indirectly) imports A, this will be skipped over.
+At this point items in A after "import B" will not have been processed and
+defined yet.  Therefore cyclic imports can exist and not result in an error
+directly, but may result in an error for items in A after "import B" not being
+defined.  This does not apply to autoload imports, see the next section.
 
 
 Importing an autoload script ~
 							*vim9-autoload*
 For optimal startup speed, loading scripts should be postponed until they are
 actually needed.  Using the autoload mechanism is recommended:
-
+							*E1264*
 1. In the plugin define user commands, functions and/or mappings that refer to
    items imported from an autoload script. >
 	import autoload 'for/search.vim'

runtime/doc/windows.txt

@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 8.2.  Last change: 2022 Jan 08
+*windows.txt*   For Vim version 8.2.  Last change: 2022 Feb 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -168,7 +168,7 @@ CTRL-W CTRL-S						*CTRL-W_CTRL-S*
 		Note: CTRL-S does not work on all terminals and might block
 		further input, use CTRL-Q to get going again.
 		Also see |++opt| and |+cmd|.
-							*E242*
+							*E242* *E1159*
 		Be careful when splitting a window in an autocommand, it may
 		mess up the window layout if this happens while making other
 		window layout changes.

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Jan 29
+" Last Change:	2022 Feb 13
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -44,7 +44,7 @@ endif
 " file name matches ft_ignore_pat.
 " When using this, the entry should probably be further down below with the
 " other StarSetf() calls.
-func! s:StarSetf(ft)
+func s:StarSetf(ft)
   if expand("<amatch>") !~ g:ft_ignore_pat
     exe 'setf ' . a:ft
   endif
@@ -229,6 +229,9 @@ au BufNewFile,BufRead *.bib			setf bib
 " BibTeX Bibliography Style
 au BufNewFile,BufRead *.bst			setf bst
 
+" Bicep
+au BufNewFile,BufRead *.bicep			setf bicep
+
 " BIND configuration
 " sudoedit uses namedXXXX.conf
 au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key	setf named
@@ -727,6 +730,10 @@ au BufNewFile,BufRead gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc setf gnash
 au BufNewFile,BufRead gitolite.conf		setf gitolite
 au BufNewFile,BufRead {,.}gitolite.rc,example.gitolite.rc	setf perl
 
+" Glimmer-flavored TypeScript and JavaScript
+au BufNewFile,BufRead *.gts	setf typescript.glimmer
+au BufNewFile,BufRead *.gjs	setf javascript.glimmer
+
 " Gnuplot scripts
 au BufNewFile,BufRead *.gpi,.gnuplot		setf gnuplot
 
@@ -1547,6 +1554,9 @@ au BufNewFile,BufRead *.r,*.R				call dist#ft#FTr()
 " Remind
 au BufNewFile,BufRead .reminders,*.remind,*.rem		setf remind
 
+" ReScript
+au BufNewFile,BufRead *.res,*.resi			setf rescript
+
 " Resolv.conf
 au BufNewFile,BufRead resolv.conf		setf resolv
 
@@ -1789,6 +1799,9 @@ au BufNewFile,BufRead *.mib,*.my		setf mib
 au BufNewFile,BufRead *.hog,snort.conf,vision.conf	setf hog
 au BufNewFile,BufRead *.rules			call dist#ft#FTRules()
 
+" Solidity
+au BufRead,BufNewFile *.sol			setf solidity
+
 " SPARQL queries
 au BufNewFile,BufRead *.rq,*.sparql		setf sparql
 
@@ -2051,7 +2064,7 @@ au BufRead,BufNewFile *.hw,*.module,*.pkg
 	\ endif
 
 " Visual Basic (also uses *.bas) or FORM
-au BufNewFile,BufRead *.frm			call dist#ft#FTVB("form")
+au BufNewFile,BufRead *.frm			call dist#ft#FTfrm()
 
 " SaxBasic is close to Visual Basic
 au BufNewFile,BufRead *.sba			setf vb
@@ -2513,7 +2526,7 @@ endif
 " Function called for testing all functions defined here.  These are
 " script-local, thus need to be executed here.
 " Returns a string with error messages (hopefully empty).
-func! TestFiletypeFuncs(testlist)
+func TestFiletypeFuncs(testlist)
   let output = ''
   for f in a:testlist
     try

runtime/ftplugin.vim

@@ -1,35 +1,43 @@
-" Vim support file to switch on loading plugins for file types
-"
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2006 Apr 30
+vim9script noclear
 
-if exists("did_load_ftplugin")
+# Vim support file to switch on loading plugins for file types
+#
+# Maintainer:	Bram Moolenaar <Bram@vim.org>
+# Last change:	2022 Feb 11
+
+if exists("g:did_load_ftplugin")
   finish
 endif
-let did_load_ftplugin = 1
+g:did_load_ftplugin = 1
 
 augroup filetypeplugin
-  au FileType * call s:LoadFTPlugin()
-
-  func! s:LoadFTPlugin()
-    if exists("b:undo_ftplugin")
-      exe b:undo_ftplugin
-      unlet! b:undo_ftplugin b:did_ftplugin
-    endif
-
-    let s = expand("<amatch>")
-    if s != ""
-      if &cpo =~# "S" && exists("b:did_ftplugin")
-	" In compatible mode options are reset to the global values, need to
-	" set the local values also when a plugin was already used.
-	unlet b:did_ftplugin
-      endif
-
-      " When there is a dot it is used to separate filetype names.  Thus for
-      " "aaa.bbb" load "aaa" and then "bbb".
-      for name in split(s, '\.')
-	exe 'runtime! ftplugin/' . name . '.vim ftplugin/' . name . '_*.vim ftplugin/' . name . '/*.vim'
-      endfor
-    endif
-  endfunc
+  au FileType * call LoadFTPlugin()
 augroup END
+
+if exists('*LoadFTPlugin')
+  # No need to define the function again.
+  finish
+endif
+
+def LoadFTPlugin()
+  if exists("b:undo_ftplugin")
+    # We assume b:undo_ftplugin is using legacy script syntax
+    legacy exe b:undo_ftplugin
+    unlet! b:undo_ftplugin b:did_ftplugin
+  endif
+
+  var s = expand("<amatch>")
+  if s != ""
+    if &cpo =~# "S" && exists("b:did_ftplugin")
+      # In compatible mode options are reset to the global values, need to
+      # set the local values also when a plugin was already used.
+      unlet b:did_ftplugin
+    endif
+
+    # When there is a dot it is used to separate filetype names.  Thus for
+    # "aaa.bbb" load "aaa" and then "bbb".
+    for name in split(s, '\.')
+      exe 'runtime! ftplugin/' .. name .. '.vim ftplugin/' .. name .. '_*.vim ftplugin/' .. name .. '/*.vim'
+    endfor
+  endif
+enddef

runtime/ftplugof.vim

@@ -1,13 +1,15 @@
-" Vim support file to switch off loading plugins for file types
-"
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2011 Oct 20
+vim9script
 
-if exists("did_load_ftplugin")
-  unlet did_load_ftplugin
+# Vim support file to switch off loading plugins for file types
+#
+# Maintainer:	Bram Moolenaar <Bram@vim.org>
+# Last Change:	2022 Feb 09
+
+if exists("g:did_load_ftplugin")
+  unlet g:did_load_ftplugin
 endif
 
-" Remove all autocommands in the filetypeplugin group, if any exist.
+# Remove all autocommands in the filetypeplugin group, if any exist.
 if exists("#filetypeplugin")
   silent! au! filetypeplugin *
 endif

runtime/gvim.desktop

@@ -6,6 +6,7 @@ Name[de]=GVim
 Name[eo]=GVim
 Name[fi]=GVim
 Name[fr]=GVim
+Name[ga]=GVim
 Name[it]=GVim
 Name[ru]=GVim
 Name[sr]=GVim
@@ -16,6 +17,7 @@ GenericName[de]=Texteditor
 GenericName[eo]=Tekstoredaktilo
 GenericName[fi]=Tekstinmuokkain
 GenericName[fr]=Éditeur de texte
+GenericName[ga]=Eagarthóir Téacs
 GenericName[it]=Editor di testi
 GenericName[ja]=テキストエディタ
 GenericName[ru]=Текстовый редактор
@@ -27,6 +29,7 @@ Comment[de]=Textdateien bearbeiten
 Comment[eo]=Redakti tekstajn dosierojn
 Comment[fi]=Muokkaa tekstitiedostoja
 Comment[fr]=Éditer des fichiers texte
+Comment[ga]=Cuir comhaid téacs in eagar
 Comment[it]=Edita file di testo
 Comment[ja]=テキストファイルを編集します
 Comment[ru]=Редактирование текстовых файлов
@@ -57,7 +60,6 @@ Comment[es]=Edita archivos de texto
 Comment[et]=Redigeeri tekstifaile
 Comment[eu]=Editatu testu-fitxategiak
 Comment[fa]=ویرایش پرونده‌های متنی
-Comment[ga]=Eagar comhad Téacs
 Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો
 Comment[he]=ערוך קבצי טקסט
 Comment[hi]=पाठ फ़ाइलें संपादित करें
@@ -107,6 +109,7 @@ Keywords[de]=Text;Editor;
 Keywords[eo]=Teksto;redaktilo;
 Keywords[fi]=Teksti;muokkain;editori;
 Keywords[fr]=Texte;éditeur;
+Keywords[ga]=Téacs;eagarthóir;
 Keywords[it]=Testo;editor;
 Keywords[ja]=テキスト;エディタ;
 Keywords[ru]=текст;текстовый редактор;

runtime/indent.vim

@@ -1,7 +1,7 @@
 " Vim support file to switch on loading indent files for file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2008 Feb 22
+" Last Change:	2022 Feb 11
 
 if exists("did_indent_on")
   finish
@@ -10,22 +10,23 @@ let did_indent_on = 1
 
 augroup filetypeindent
   au FileType * call s:LoadIndent()
-  func! s:LoadIndent()
-    if exists("b:undo_indent")
-      exe b:undo_indent
-      unlet! b:undo_indent b:did_indent
-    endif
-    let s = expand("<amatch>")
-    if s != ""
-      if exists("b:did_indent")
-	unlet b:did_indent
-      endif
-
-      " When there is a dot it is used to separate filetype names.  Thus for
-      " "aaa.bbb" load "indent/aaa.vim" and then "indent/bbb.vim".
-      for name in split(s, '\.')
-	exe 'runtime! indent/' . name . '.vim'
-      endfor
-    endif
-  endfunc
 augroup END
+
+def s:LoadIndent()
+  if exists("b:undo_indent")
+    legacy exe b:undo_indent
+    unlet! b:undo_indent b:did_indent
+  endif
+  var s = expand("<amatch>")
+  if s != ""
+    if exists("b:did_indent")
+      unlet b:did_indent
+    endif
+
+    # When there is a dot it is used to separate filetype names.  Thus for
+    # "aaa.bbb" load "indent/aaa.vim" and then "indent/bbb.vim".
+    for name in split(s, '\.')
+      exe 'runtime! indent/' .. name .. '.vim'
+    endfor
+  endif
+enddef

runtime/indent/html.vim

@@ -1,7 +1,7 @@
 " Vim indent script for HTML
 " Maintainer:	Bram Moolenaar
 " Original Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change:	2021 Jun 13
+" Last Change:	2022 Jan 31
 " Version:	1.0 "{{{
 " Description:	HTML indent script with cached state for faster indenting on a
 "		range of lines.
@@ -149,6 +149,15 @@ func HtmlIndent_CheckUserSettings()
       let b:html_indent_line_limit = 200
     endif
   endif
+
+  if exists('b:html_indent_attribute')
+    let b:hi_attr_indent = b:html_indent_attribute
+  elseif exists('g:html_indent_attribute')
+    let b:hi_attr_indent = g:html_indent_attribute
+  else
+    let b:hi_attr_indent = 2
+  endif
+
 endfunc "}}}
 
 " Init Script Vars
@@ -946,11 +955,11 @@ func s:InsideTag(foundHtmlString)
       let idx = match(text, '<' . s:tagname . '\s\+\zs\w')
     endif
     if idx == -1
-      " after just "<tag" indent two levels more
+      " after just "<tag" indent two levels more by default
       let idx = match(text, '<' . s:tagname . '$')
       if idx >= 0
 	call cursor(lnum, idx + 1)
-	return virtcol('.') - 1 + shiftwidth() * 2
+	return virtcol('.') - 1 + shiftwidth() * b:hi_attr_indent
       endif
     endif
     if idx > 0

runtime/indent/testdir/html.in

@@ -1,4 +1,4 @@
-" vim: set ft=html sw=4 :
+" vim: set ft=html sw=4 ts=8 :
 
 
 " START_INDENT
@@ -41,6 +41,11 @@ dd text
 dt text
 </dt>
 </dl>
+<div
+class="test"
+style="color: yellow">
+text
+</div>
 
     </body>
 </html>
@@ -50,6 +55,7 @@ dt text
 % START_INDENT
 % INDENT_EXE let g:html_indent_style1 = "inc"
 % INDENT_EXE let g:html_indent_script1 = "zero"
+% INDENT_EXE let g:html_indent_attribute = 1
 % INDENT_EXE call HtmlIndent_CheckUserSettings()
 <html>
     <body>
@@ -61,6 +67,11 @@ div#d2 { color: green; }
 	var v1 = "v1";
 var v2 = "v2";
     </script>
+<div
+class="test"
+style="color: yellow">
+text
+</div>
 </body>
 </html>
 % END_INDENT

runtime/indent/testdir/html.ok

@@ -1,4 +1,4 @@
-" vim: set ft=html sw=4 :
+" vim: set ft=html sw=4 ts=8 :
 
 
 " START_INDENT
@@ -41,6 +41,11 @@ div#d2 { color: green; }
 		dt text
 	    </dt>
 	</dl>
+	<div
+		class="test"
+		style="color: yellow">
+	    text
+	</div>
 
     </body>
 </html>
@@ -50,6 +55,7 @@ div#d2 { color: green; }
 % START_INDENT
 % INDENT_EXE let g:html_indent_style1 = "inc"
 % INDENT_EXE let g:html_indent_script1 = "zero"
+% INDENT_EXE let g:html_indent_attribute = 1
 % INDENT_EXE call HtmlIndent_CheckUserSettings()
 <html>
     <body>
@@ -61,6 +67,11 @@ div#d2 { color: green; }
 var v1 = "v1";
 var v2 = "v2";
 	</script>
+	<div
+	    class="test"
+	    style="color: yellow">
+	    text
+	</div>
     </body>
 </html>
 % END_INDENT

runtime/lang/Makefile

@@ -0,0 +1,196 @@
+# Author: Ada (Haowen) Yu <me@yuhaowen.com>
+
+all: \
+		menu_chinese_gb.936.vim \
+		menu_uk_ua.cp1251.vim \
+		menu_uk_ua.koi8-u.vim \
+		menu_chinese_taiwan.950.vim \
+		menu_cs_cz.iso_8859-2.vim \
+		menu_czech_czech_republic.1250.vim \
+		menu_ja_jp.euc-jp.vim \
+		menu_japanese_japan.932.vim \
+		menu_ko_kr.euckr.vim \
+		menu_pl_pl.iso_8859-2.vim \
+		menu_polish_poland.1250.vim \
+		menu_ru_ru.koi8-r.vim \
+		menu_sl_si.cp1250.vim \
+		menu_sl_si.latin2.vim \
+		menu_slovak_slovak_republic.1250.vim \
+		menu_tr_tr.cp1254.vim \
+		menu_tr_tr.iso_8859-9.vim \
+		menu_sr_rs.iso_8859-5.vim \
+		menu_sr_rs.iso_8859-2.vim \
+		menu_sr_rs.ascii.vim \
+		menu_czech_czech_republic.ascii.vim \
+
+# Convert menu_zh_cn.utf-8.vim to create menu_chinese_gb.936.vim.
+menu_chinese_gb.936.vim: menu_zh_cn.utf-8.vim
+	rm -f menu_chinese_gb.936.vim
+	iconv -f utf-8 -t cp936 menu_zh_cn.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp936/' -e 's/" Original translations/" Generated from menu_zh_cn.utf-8.vim, DO NOT EDIT/' > menu_chinese_gb.936.vim
+
+# Convert menu_zh_tw.utf-8.vim to create menu_chinese_taiwan.950.vim.
+menu_chinese_taiwan.950.vim: menu_zh_tw.utf-8.vim
+	rm -f menu_chinese_taiwan.950.vim
+	iconv -f utf-8 -t cp950 menu_zh_tw.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp950/' -e 's/" Original translations/" Generated from menu_zh_tw.utf-8.vim, DO NOT EDIT/' > menu_chinese_taiwan.950.vim
+
+# Convert menu_cs_cz.utf-8.vim to create menu_cs_cz.iso_8859-2.vim.
+menu_cs_cz.iso_8859-2.vim: menu_cs_cz.utf-8.vim
+	rm -f menu_cs_cz.iso_8859-2.vim
+	iconv -f utf-8 -t iso8859-2 menu_cs_cz.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-2/' \
+			-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/' \
+			-e 's/\(" Menu Translations:.*\)(.*)/\1(ISO8859-2)/'  \
+			> menu_cs_cz.iso_8859-2.vim
+
+# Convert menu_cs_cz.utf-8.vim to create menu_czech_czech_republic.1250.vim.
+menu_czech_czech_republic.1250.vim: menu_cs_cz.utf-8.vim
+	rm -f menu_czech_czech_republic.1250.vim
+	iconv -f utf-8 -t cp1250 menu_cs_cz.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/'  \
+		-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/'  \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(CP1250)/'  \
+		> menu_czech_czech_republic.1250.vim
+
+# Convert menu_cs_cz.utf-8.vim to create menu_czech_czech_republic.ascii.vim.
+menu_czech_czech_republic.ascii.vim: menu_cs_cz.utf-8.vim
+	rm -f menu_czech_czech_republic.ascii.vim
+	sed -e 's/Á/A/g' -e 's/á/a/g' -e 's/Č/C/g' -e 's/č/c/g' -e 's/Ď/D/g' \
+		-e 's/ď/d/g' -e 's/É/E/g' -e 's/é/e/g' -e 's/Ě/E/g' -e 's/ě/e/g' \
+		-e 's/Í/I/g' -e 's/í/i/g' -e 's/Ň/N/g' -e 's/ň/n/g' -e 's/Ó/O/g' \
+		-e 's/ó/o/g' -e 's/Ř/R/g' -e 's/ř/r/g' -e 's/Š/S/g' -e 's/š/s/g' \
+		-e 's/Ť/T/g' -e 's/ť/t/g' -e 's/Ú/U/g' -e 's/ú/u/g' -e 's/Ů/U/g' \
+		-e 's/ů/u/g' -e 's/Ý/Y/g' -e 's/ý/y/g' -e 's/Ž/Z/g' -e 's/ž/z/g' \
+		-e 's/scriptencoding utf-8/scriptencoding latin1/'  \
+		-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/' \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(ASCII - without diacritics)/'  \
+	menu_cs_cz.utf-8.vim > menu_czech_czech_republic.ascii.vim
+
+# Convert menu_ja_jp.utf-8.vim to create menu_ja_jp.euc-jp.vim.
+menu_ja_jp.euc-jp.vim: menu_ja_jp.utf-8.vim
+	rm -f menu_ja_jp.euc-jp.vim
+	iconv -f utf-8 -t euc-jp menu_ja_jp.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding euc-jp/'  \
+		-e 's/" Original translations/" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT/'  \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(EUC-JP)/'  \
+		> menu_ja_jp.euc-jp.vim
+
+# Convert menu_ja_jp.utf-8.vim to create menu_japanese_japan.932.vim.
+menu_japanese_japan.932.vim: menu_ja_jp.utf-8.vim
+	rm -f menu_japanese_japan.932.vim
+	iconv -f utf-8 -t cp932 menu_ja_jp.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp932/'  \
+		-e 's/" Original translations/" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT/' \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(CP932)/'  \
+		> menu_japanese_japan.932.vim
+
+# Convert menu_ko_kr.utf-8.vim to create menu_ko_kr.euckr.vim.
+menu_ko_kr.euckr.vim: menu_ko_kr.utf-8.vim
+	rm -f menu_ko_kr.euckr.vim
+	iconv -f utf-8 -t euc-kr menu_ko_kr.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding euc-kr/' -e 's/" Original translations/" Generated from menu_ko_kr.utf-8.vim, DO NOT EDIT/' > menu_ko_kr.euckr.vim
+
+# Convert menu_pl_pl.utf-8.vim to create menu_pl_pl.iso_8859-2.vim.
+menu_pl_pl.iso_8859-2.vim: menu_pl_pl.utf-8.vim
+	rm -f menu_pl_pl.iso_8859-2.vim
+	iconv -f utf-8 -t iso8859-2 menu_pl_pl.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-2/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_pl_pl.iso_8859-2.vim
+
+# Convert menu_pl_pl.utf-8.vim to create menu_polish_poland.1250.vim.
+menu_polish_poland.1250.vim: menu_pl_pl.utf-8.vim
+	rm -f menu_polish_poland.1250.vim
+	iconv -f utf-8 -t cp1250 menu_pl_pl.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_polish_poland.1250.vim
+
+# Convert menu_ru_ru.utf-8.vim to create menu_ru_ru.koi8-r.vim.
+menu_ru_ru.koi8-r.vim: menu_ru_ru.utf-8.vim
+	rm -f menu_ru_ru.koi8-r.vim
+	iconv -f utf-8 -t koi8-r menu_ru_ru.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding koi8-r/' -e 's/" Original translations/" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT/' > menu_ru_ru.koi8-r.vim
+
+# Convert menu_sl_si.utf-8.vim to create menu_sl_si.cp1250.vim.
+menu_sl_si.cp1250.vim: menu_sl_si.utf-8.vim
+	rm -f menu_sl_si.cp1250.vim
+	iconv -f utf-8 -t cp1250 menu_sl_si.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/'  \
+		-e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_sl_si.cp1250.vim
+
+# Convert menu_uk_ua.utf-8.vim to create menu_sl_si.latin2.vim.
+menu_sl_si.latin2.vim: menu_sl_si.utf-8.vim
+	rm -f menu_sl_si.latin2.vim
+	iconv -f utf-8 -t latin2 menu_sl_si.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding latin2/' -e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_sl_si.latin2.vim
+
+# Convert menu_uk_ua.utf-8.vim to create menu_slovak_slovak_republic.1250.vim.
+menu_slovak_slovak_republic.1250.vim: menu_sl_si.utf-8.vim
+	rm -f menu_slovak_slovak_republic.1250.vim
+	iconv -f utf-8 -t cp1250 menu_sl_si.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/' -e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_slovak_slovak_republic.1250.vim
+
+# Convert menu_tr_tr.utf-8.vim to create menu_tr_tr.cp1254.vim.
+menu_tr_tr.cp1254.vim: menu_tr_tr.utf-8.vim
+	rm -f menu_tr_tr.cp1254.vim
+	iconv -f utf-8 -t cp1254 menu_tr_tr.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1254/' -e 's/" Original translations/" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT/' > menu_tr_tr.cp1254.vim
+
+# Convert menu_tr_tr.utf-8.vim to create menu_tr_tr.iso_8859-9.vim.
+menu_tr_tr.iso_8859-9.vim: menu_tr_tr.utf-8.vim
+	rm -f menu_tr_tr.iso_8859-9.vim
+	iconv -f utf-8 -t iso8859-9 menu_tr_tr.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-9/' -e 's/" Original translations/" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT/' > menu_tr_tr.iso_8859-9.vim
+
+# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.iso_8859-5.vim.
+menu_sr_rs.iso_8859-5.vim: menu_sr_rs.utf-8.vim
+	rm -f menu_sr_rs.iso_8859-5.vim
+	iconv -f utf-8 -t iso8859-5 menu_sr_rs.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-5/' -e 's/" Original translations/" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT/' > menu_sr_rs.iso_8859-5.vim
+
+# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.iso_8859-2.vim.
+menu_sr_rs.iso_8859-2.vim: menu_sr_rs.utf-8.vim
+	rm -f menu_sr_rs.iso_8859-2.vim
+	sed -e 's/а/a/g' -e 's/б/b/g' -e 's/в/v/g' -e 's/г/g/g' -e 's/д/d/g' \
+		-e 's/ђ/đ/g' -e 's/е/e/g' -e 's/ж/ž/g' -e 's/з/z/g' -e 's/и/i/g' \
+		-e 's/ј/j/g' -e 's/к/k/g' -e 's/л/l/g' -e 's/љ/lj/g' -e 's/м/m/g' \
+		-e 's/н/n/g' -e 's/њ/nj/g' -e 's/о/o/g' -e 's/п/p/g' -e 's/р/r/g' \
+		-e 's/с/s/g' -e 's/т/t/g' -e 's/ћ/ć/g' -e 's/у/u/g' -e 's/ф/f/g' \
+		-e 's/х/h/g' -e 's/ц/c/g' -e 's/ч/č/g' -e 's/џ/dž/g' -e 's/ш/š/g' \
+		-e 's/А/A/g' -e 's/Б/B/g' -e 's/В/V/g' -e 's/Г/G/g' -e 's/Д/D/g' \
+		-e 's/Ђ/Đ/g' -e 's/Е/E/g' -e 's/Ж/Ž/g' -e 's/З/Z/g' -e 's/И/I/g' \
+		-e 's/Ј/J/g' -e 's/К/K/g' -e 's/Л/L/g' -e 's/Љ/Lj/g' -e 's/М/M/g' \
+		-e 's/Н/N/g' -e 's/Њ/Nj/g' -e 's/О/O/g' -e 's/П/P/g' -e 's/Р/R/g' \
+		-e 's/С/S/g' -e 's/Т/T/g' -e 's/Ћ/Ć/g' -e 's/У/U/g' -e 's/Ф/F/g' \
+		-e 's/Х/H/g' -e 's/Ц/C/g' -e 's/Ч/Č/g' -e 's/Џ/Dž/g' -e 's/Ш/Š/g' \
+		-e 's/scriptencoding utf-8/scriptencoding iso8859-2/' -e 's/" Original translations/" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT/' \
+		menu_sr_rs.utf-8.vim | iconv -f utf-8 -t iso8859-2 \
+	> menu_sr_rs.iso_8859-2.vim
+
+# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.ascii.vim.
+menu_sr_rs.ascii.vim: menu_sr_rs.utf-8.vim
+	rm -f menu_sr_rs.ascii.vim
+	sed -e 's/а/a/g' -e 's/б/b/g' -e 's/в/v/g' -e 's/г/g/g' -e 's/д/d/g' \
+		-e 's/ђ/dj/g' -e 's/е/e/g' -e 's/ж/z/g' -e 's/з/z/g' -e 's/и/i/g' \
+		-e 's/ј/j/g' -e 's/к/k/g' -e 's/л/l/g' -e 's/љ/lj/g' -e 's/м/m/g' \
+		-e 's/н/n/g' -e 's/њ/nj/g' -e 's/о/o/g' -e 's/п/p/g' -e 's/р/r/g' \
+		-e 's/с/s/g' -e 's/т/t/g' -e 's/ћ/c/g' -e 's/у/u/g' -e 's/ф/f/g' \
+		-e 's/х/h/g' -e 's/ц/c/g' -e 's/ч/c/g' -e 's/џ/dz/g' -e 's/ш/s/g' \
+		-e 's/А/A/g' -e 's/Б/B/g' -e 's/В/V/g' -e 's/Г/G/g' -e 's/Д/D/g' \
+		-e 's/Ђ/Đ/g' -e 's/Е/E/g' -e 's/Ж/Z/g' -e 's/З/Z/g' -e 's/И/I/g' \
+		-e 's/Ј/J/g' -e 's/К/K/g' -e 's/Л/L/g' -e 's/Љ/Lj/g' -e 's/М/M/g' \
+		-e 's/Н/N/g' -e 's/Њ/Nj/g' -e 's/О/O/g' -e 's/П/P/g' -e 's/Р/R/g' \
+		-e 's/С/S/g' -e 's/Т/T/g' -e 's/Ћ/C/g' -e 's/У/U/g' -e 's/Ф/F/g' \
+		-e 's/Х/H/g' -e 's/Ц/C/g' -e 's/Ч/C/g' -e 's/Џ/Dz/g' -e 's/Ш/S/g' \
+		-e 's/scriptencoding utf-8/scriptencoding latin1/' -e 's/" Original translations/" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT/' \
+		menu_sr_rs.utf-8.vim > menu_sr_rs.ascii.vim
+	
+# Convert menu_uk_ua.utf-8.vim to create menu_uk_ua.cp1251.vim.
+menu_uk_ua.cp1251.vim: menu_uk_ua.utf-8.vim
+	rm -f menu_uk_ua.cp1251.vim
+	iconv -f utf-8 -t cp1251 menu_uk_ua.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1251/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.cp1251.vim
+
+# Convert menu_uk_ua.utf-8.vim to create menu_uk_ua.koi8-u.vim.
+menu_uk_ua.koi8-u.vim: menu_uk_ua.utf-8.vim
+	rm -f menu_uk_ua.koi8-u.vim
+	iconv -f utf-8 -t koi8-u menu_uk_ua.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding koi8-u/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.koi8-u.vim

runtime/lang/menu_af_af.latin1.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Afrikaas
 " Maintainer:		Danie Roux <droux@tuks.co.za>
 " Last Change:		2012 May 01
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_ca_es.latin1.vim

@@ -2,7 +2,7 @@
 "
 " Maintainer:	Ernest Adrogué <eadrogue@gmx.net>
 " Last Change:	26 Jul 2017
-"
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_chinese_gb.936.vim

@@ -1,7 +1,8 @@
 " Menu Translations:    Simplified Chinese
 " Maintainer:           Shun Bai <baishunde@gmail.com>
 " Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
-" Last Change:          2020 Apr 23
+" Last Change:          2022 Feb 19
+" Generated from menu_zh_cn.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -449,4 +450,4 @@ menutrans Set\ '&filetype'\ Too			Ҳ
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim: set nu ts=4 sw=4 noet fdm=marker fdc=4 :
+" vim: set ts=4 sw=4 noet fdm=marker fdc=4 :

runtime/lang/menu_chinese_taiwan.950.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Traditional Chinese
 " Translated By:	Hung-Te Lin	<piaip@csie.ntu.edu.tw>
 " Last Change:		2012 May 01
+" Generated from menu_zh_tw.utf-8.vim, DO NOT EDIT
 
 " {{{ Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -8,6 +9,7 @@ if exists("did_menu_trans")
 endif
 let did_menu_trans = 1
 " }}}
+
 let s:keepcpo= &cpo
 set cpo&vim
 

runtime/lang/menu_cs_cz.iso_8859-2.vim

@@ -1,7 +1,8 @@
-" Menu Translations:    Czech (ISO-8859-2)
+" Menu Translations:    Czech (ISO8859-2)
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -12,7 +13,7 @@ let did_menu_trans = 1
 let s:keepcpo= &cpo
 set cpo&vim
 
-scriptencoding iso-8859-2
+scriptencoding iso8859-2
 
 " {{{ File menu
 menutrans &File				&Soubor

runtime/lang/menu_cs_cz.utf-8.vim

@@ -2,6 +2,7 @@
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_czech_czech_republic.1250.vim

@@ -2,6 +2,7 @@
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_czech_czech_republic.ascii.vim

@@ -1,7 +1,8 @@
-" Menu Translations:    Czech (latin1 - w/o diacritics)
+" Menu Translations:    Czech (ASCII - without diacritics)
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_da.utf-8.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Danish
 " Maintainer:		scootergrisen
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_de_de.latin1.vim

@@ -5,6 +5,7 @@
 "			        Johannes Zellner <johannes@zellner.org>
 " Last Change:	Mon, 1 April 2019
 " vim:set foldmethod=marker tabstop=8:
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_eo.utf-8.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Esperanto
 " Maintainer:		Dominique PELLE <dominique.pelle@free.fr>
 " Last Change:		2012 May 01
+" Original translations
 " 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_es_es.latin1.vim

@@ -3,7 +3,7 @@
 " Last translator:	Omar Campagne Polaino <ocampagne@gmail.com>
 " Version:		7.2.245
 " Last Change:		2012 May 01
-"
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_fi_fi.latin1.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Finnish
 " Maintainer:		Flammie Pirinen <flammie@iki.fi>
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_fr_fr.latin1.vim

@@ -4,6 +4,7 @@
 " Contributors:		David Blanchet <david.blanchet@free.fr>
 " 			Gabriel Dupras <gabrieldupras@gmail.com>
 " Last Change:		2021 Feb 16
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_hu_hu.iso_8859-2.vim

@@ -2,6 +2,7 @@
 " Original Translation:	Zoltán Árpádffy
 " Maintained By:	Kontra Gergely <kgergely@mcl.hu>
 " Last Change:		2020 Apr 23
+" Original translations
 " I'm working on defining (unaccented) hotkeys for everything.
 " I want to remove y and z hotkeys, because on the hungarian keymap they're at
 " a differrent place.

runtime/lang/menu_hu_hu.utf-8.vim

@@ -5,6 +5,7 @@
 "
 " This file was converted from menu_hu_hu.iso_8859-2.vim.  See there for
 " remarks.
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_is_is.latin1.vim

@@ -2,6 +2,7 @@
 " Maintainer:		Jón Arnar Briem <jonbriem@gmail.com>
 " Originally By:	Jón Arnar Briem <jonbriem@gmail.com>
 " Last Change:	Sun, 24 Mar 2019 22:40:00 CEST
+" Original translations
 " vim:set foldmethod=marker tabstop=8:
 
 " Quit when menu translations have already been done.

runtime/lang/menu_it_it.latin1.vim

@@ -3,6 +3,7 @@
 "			Vlad Sandrini <vlad.gently@gmail.com>
 "			Luciano Montanaro <mikelima@cirulla.net>
 " Last Change:	2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_ja_jp.euc-jp.vim

@@ -2,12 +2,14 @@
 "
 " Menu Translations:	Japanese (EUC-JP)
 " Last Translator:	MURAOKA Taro  <koron.kaoriya@gmail.com>
-" Last Change:		18-Jul-2018.
+" Last Change:		20-Feb-2022.
 "
-" Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
+" Copyright (C) 2001-2022 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
 "
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+"
+" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -23,7 +25,7 @@ scriptencoding euc-jp
 menutrans &Help			ヘルプ(&H)
 menutrans &Overview<Tab><F1>	概略(&O)<Tab><F1>
 menutrans &User\ Manual		ユーザーマニュアル(&U)
-menutrans &How-to\ links	&How-toリンク
+menutrans &How-To\ links	&How-toリンク
 menutrans &Credits		クレジット(&C)
 menutrans Co&pying		著作権情報(&P)
 menutrans &Sponsor/Register	スポンサー/登録(&S)
@@ -270,10 +272,9 @@ if has("toolbar")
     tmenu ToolBar.Cut		クリップボードへ切り取り
     tmenu ToolBar.Copy		クリップボードへコピー
     tmenu ToolBar.Paste		クリップボードから貼り付け
-    tmenu ToolBar.Find		検索...
+    tmenu ToolBar.Replace	検索 / 置換...
     tmenu ToolBar.FindNext	次を検索
     tmenu ToolBar.FindPrev	前を検索
-    tmenu ToolBar.Replace	置換...
     if 0	" disabled; These are in the Windows menu
       tmenu ToolBar.New		新規ウィンドウ作成
       tmenu ToolBar.WinSplit	ウィンドウ分割

runtime/lang/menu_ja_jp.utf-8.vim

@@ -2,12 +2,14 @@
 "
 " Menu Translations:	Japanese (UTF-8)
 " Last Translator:	MURAOKA Taro  <koron.kaoriya@gmail.com>
-" Last Change:		18-Jul-2018.
+" Last Change:		20-Feb-2022.
 "
-" Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
+" Copyright (C) 2001-2022 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
 "
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+"
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -23,7 +25,7 @@ scriptencoding utf-8
 menutrans &Help			ヘルプ(&H)
 menutrans &Overview<Tab><F1>	概略(&O)<Tab><F1>
 menutrans &User\ Manual		ユーザーマニュアル(&U)
-menutrans &How-to\ links	&How-toリンク
+menutrans &How-To\ links	&How-toリンク
 menutrans &Credits		クレジット(&C)
 menutrans Co&pying		著作権情報(&P)
 menutrans &Sponsor/Register	スポンサー/登録(&S)
@@ -270,10 +272,9 @@ if has("toolbar")
     tmenu ToolBar.Cut		クリップボードへ切り取り
     tmenu ToolBar.Copy		クリップボードへコピー
     tmenu ToolBar.Paste		クリップボードから貼り付け
-    tmenu ToolBar.Find		検索...
+    tmenu ToolBar.Replace	検索 / 置換...
     tmenu ToolBar.FindNext	次を検索
     tmenu ToolBar.FindPrev	前を検索
-    tmenu ToolBar.Replace	置換...
     if 0	" disabled; These are in the Windows menu
       tmenu ToolBar.New		新規ウィンドウ作成
       tmenu ToolBar.WinSplit	ウィンドウ分割

runtime/lang/menu_japanese_japan.932.vim

@@ -2,12 +2,14 @@
 "
 " Menu Translations:	Japanese (CP932)
 " Last Translator:	MURAOKA Taro  <koron.kaoriya@gmail.com>
-" Last Change:		18-Jul-2018.
+" Last Change:		20-Feb-2022.
 "
-" Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
+" Copyright (C) 2001-2022 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
 "
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+"
+" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -23,7 +25,7 @@ scriptencoding cp932
 menutrans &Help			ヘルプ(&H)
 menutrans &Overview<Tab><F1>	概略(&O)<Tab><F1>
 menutrans &User\ Manual		ユーザーマニュアル(&U)
-menutrans &How-to\ links	&How-toリンク
+menutrans &How-To\ links	&How-toリンク
 menutrans &Credits		クレジット(&C)
 menutrans Co&pying		著作権情報(&P)
 menutrans &Sponsor/Register	スポンサー/登録(&S)
@@ -270,10 +272,9 @@ if has("toolbar")
     tmenu ToolBar.Cut		クリップボードへ切り取り
     tmenu ToolBar.Copy		クリップボードへコピー
     tmenu ToolBar.Paste		クリップボードから貼り付け
-    tmenu ToolBar.Find		検索...
+    tmenu ToolBar.Replace	検索 / 置換...
     tmenu ToolBar.FindNext	次を検索
     tmenu ToolBar.FindPrev	前を検索
-    tmenu ToolBar.Replace	置換...
     if 0	" disabled; These are in the Windows menu
       tmenu ToolBar.New		新規ウィンドウ作成
       tmenu ToolBar.WinSplit	ウィンドウ分割

runtime/lang/menu_ko_kr.euckr.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Korean
 " Maintainer:		SungHyun Nam <goweol@gmail.com>
 " Last Change:		2012 May 01
+" Generated from menu_ko_kr.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_ko_kr.utf-8.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Korean
 " Maintainer:		SungHyun Nam <goweol@gmail.com>
 " Last Change:		2012 May 01
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_nl_nl.latin1.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Nederlands
 " Maintainer:		Bram Moolenaar
 " Last Change:	2012 May 01
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_no_no.latin1.vim

@@ -2,6 +2,7 @@
 " Maintainer:		Øyvind A. Holm <sunny@sunbase.org>
 " Last Change:		2020 Apr 23
 " menu_no_no.latin1.vim 289 2004-05-16 18:00:52Z sunny
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_pl_pl.iso_8859-2.vim

@@ -2,6 +2,7 @@
 " Maintainer:		Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Initial Translation:	Marcin Dalecki <martin@dalecki.de>
 " Last Change: 17 May  2010
+" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_pl_pl.utf-8.vim

@@ -2,6 +2,7 @@
 " Maintainer:		Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Initial Translation:	Marcin Dalecki <martin@dalecki.de>
 " Last Change: 17 May  2010
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_polish_poland.1250.vim

@@ -2,6 +2,7 @@
 " Maintainer:		Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Initial Translation:	Marcin Dalecki <martin@dalecki.de>
 " Last Change: 17 May  2010
+" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_pt_br.vim

@@ -1,7 +1,7 @@
 " Menu Translations: Português do Brasil
 " Maintainer: José de Paula <jose@infoviaweb.com>
 " Last Change: 2020 Apr 23
-"
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_pt_pt.vim

@@ -1,6 +1,7 @@
 " Menu Translations: Português
 " adaptado de pt_br.
 " Maintainer: Duarte Henriques <duarte_henriques@myrealbox.com>
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_ru.utf-8.vim

@@ -1,3 +1,3 @@
 " Menu Translations:	Russian
 
-source <sfile>:p:h/menu_ru_ru.vim
+source <sfile>:p:h/menu_ru_ru.utf-8.vim

runtime/lang/menu_ru_ru.koi8-r.vim

@@ -1,7 +1,8 @@
 " Menu Translations:	Russian
 " Maintainer:		Sergey Alyoshin <alyoshin.s@gmail.com>
-" Previous Maintainer:	vassily ragosin <vrr[at]users.sourceforge.net>
-" Last Change:		29 May 2013
+" Previous Maintainer:	Vassily Ragosin <vrr[at]users.sourceforge.net>
+" Last Change:		16 May 2018
+" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT
 " URL:			cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim
 "
 " $Id: menu_ru_ru.vim,v 1.1 2004/06/13 16:09:10 vimboss Exp $
@@ -36,7 +37,7 @@ menutrans &Help
 " Help menu
 menutrans &Overview<Tab><F1>		&ïÂÚÏÒ<Tab><F1>
 menutrans &User\ Manual			òÕËÏ×Ï&ÄÓÔ×Ï\ ÐÏÌØÚÏ×ÁÔÅÌÑ
-menutrans &How-to\ links		&ëÁË\ ÜÔÏ\ ÓÄÅÌÁÔØ\.\.\.
+menutrans &How-To\ Links		&ëÁË\ ÜÔÏ\ ÓÄÅÌÁÔØ\.\.\.
 menutrans &Find\.\.\.			&ðÏÉÓË
 "--------------------
 menutrans &Credits			&âÌÁÇÏÄÁÒÎÏÓÔÉ
@@ -58,7 +59,7 @@ menutrans &Close<Tab>:close		&
 menutrans &Save<Tab>:w			&óÏÈÒÁÎÉÔØ<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav	óÏÈÒÁÎÉÔØ\ &ËÁË\.\.\.<Tab>:sav
 "--------------------
-menutrans Split\ &Diff\ with\.\.\.	óÒ&Á×ÎÉÔØ\ Ó\.\.\.
+menutrans Split\ &Diff\ With\.\.\.	óÒ&Á×ÎÉÔØ\ Ó\.\.\.
 menutrans Split\ Patched\ &By\.\.\.	óÒÁ×ÎÉÔØ\ Ó\ ÐÒÉÍÅÎÅÎÉÅÍ\ ÚÁÐ&ÌÁÔËÉ\.\.\.
 "--------------------
 menutrans &Print			îÁ&ÐÅÞÁÔÁÔØ
@@ -97,12 +98,12 @@ menutrans &Keymap
 menutrans Select\ Fo&nt\.\.\.		÷ÙÂÏÒ\ &ÛÒÉÆÔÁ\.\.\.
 ">>>----------------- Edit/Global settings
 menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	ðÏÄÓ×ÅÔËÁ\ &ÎÁÊÄÅÎÎÙÈ\ ÓÏÏÔ×ÅÔÓÔ×ÉÊ<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		&òÅÇÉÓÔÒÏÎÅÚÁ×ÉÓÉÍÙÊ\ ÐÏÉÓË<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!		ðÏËÁÚÙ×ÁÔØ\ ÐÁÒÎÙÅ\ &ÜÌÅÍÅÎÔÙ<Tab>:set\ sm!
-menutrans &Context\ lines				óÔÒ&ÏË\ ×ÏËÒÕÇ\ ËÕÒÓÏÒÁ
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		&òÅÇÉÓÔÒÏÎÅÚÁ×ÉÓÉÍÙÊ\ ÐÏÉÓË<Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	ðÏËÁÚÙ×ÁÔØ\ ÐÁÒÎÙÅ\ &ÜÌÅÍÅÎÔÙ<Tab>:set\ sm!
+menutrans &Context\ Lines				óÔÒ&ÏË\ ×ÏËÒÕÇ\ ËÕÒÓÏÒÁ
 menutrans &Virtual\ Edit				÷ÉÒ&ÔÕÁÌØÎÏÅ\ ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ
 menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		òÅÖÉÍ\ &÷ÓÔÁ×ËÉ<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!		&óÏ×ÍÅÓÔÉÍÏÓÔØ\ Ó\ Vi<Tab>:set\ cp!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&óÏ×ÍÅÓÔÉÍÏÓÔØ\ Ó\ Vi<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\.				&ðÕÔØ\ ÄÌÑ\ ÐÏÉÓËÁ\ ÆÁÊÌÏ×\.\.\.
 menutrans Ta&g\ Files\.\.\.				æÁÊÌÙ\ &ÍÅÔÏË\.\.\.
 "
@@ -113,18 +114,18 @@ menutrans Toggle\ &Right\ Scrollbar
 ">>>->>>------------- Edit/Global settings/Virtual edit
 menutrans Never						÷ÙËÌÀÞÅÎÏ
 menutrans Block\ Selection				ðÒÉ\ ×ÙÄÅÌÅÎÉÉ\ ÂÌÏËÁ
-menutrans Insert\ mode					÷\ ÒÅÖÉÍÅ\ ÷ÓÔÁ×ËÉ
+menutrans Insert\ Mode					÷\ ÒÅÖÉÍÅ\ ÷ÓÔÁ×ËÉ
 menutrans Block\ and\ Insert				ðÒÉ\ ×ÙÄÅÌÅÎÉÉ\ ÂÌÏËÁ\ É\ ×\ ÒÅÖÉÍÅ\ ÷ÓÔÁ×ËÉ
 menutrans Always					÷ËÌÀÞÅÎÏ\ ×ÓÅÇÄÁ
 ">>>----------------- Edit/File settings
 menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	&îÕÍÅÒÁÃÉÑ\ ÓÔÒÏË<Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu!	ïÔÎÏÓÉÔÅ&ÌØÎÁÑ\ ÎÕÍÅÒÁÃÉÑ\ ÓÔÒÏË<Tab>:set\ nru!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	ïÔÎÏÓÉÔÅ&ÌØÎÁÑ\ ÎÕÍÅÒÁÃÉÑ\ ÓÔÒÏË<Tab>:set\ nru!
 menutrans Toggle\ &List\ Mode<Tab>:set\ list!		ïÔÏÂÒÁ&ÖÅÎÉÅ\ ÎÅ×ÉÄÉÍÙÈ\ ÓÉÍ×ÏÌÏ×<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		&ðÅÒÅÎÏÓ\ ÄÌÉÎÎÙÈ\ ÓÔÒÏË<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	ðÅÒÅÎÏÓ\ &ÃÅÌÙÈ\ ÓÌÏ×<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!		ðÒÏ&ÂÅÌÙ\ ×ÍÅÓÔÏ\ ÔÁÂÕÌÑÃÉÉ<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!		á×ÔÏÍÁÔÉÞÅÓËÏÅ\ ÆÏÒÍÁÔÉÒÏ×ÁÎÉÅ\ &ÏÔÓÔÕÐÏ×<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!		æÏÒÍÁÔÉÒÏ×ÁÎÉÅ\ ÏÔÓÔÕÐÏ×\ ×\ &ÓÔÉÌÅ\ C<Tab>:set\ cin!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	&ðÅÒÅÎÏÓ\ ÄÌÉÎÎÙÈ\ ÓÔÒÏË<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	ðÅÒÅÎÏÓ\ &ÃÅÌÙÈ\ ÓÌÏ×<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!	ðÒÏ&ÂÅÌÙ\ ×ÍÅÓÔÏ\ ÔÁÂÕÌÑÃÉÉ<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!	á×ÔÏÍÁÔÉÞÅÓËÏÅ\ ÆÏÒÍÁÔÉÒÏ×ÁÎÉÅ\ &ÏÔÓÔÕÐÏ×<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	æÏÒÍÁÔÉÒÏ×ÁÎÉÅ\ ÏÔÓÔÕÐÏ×\ ×\ &ÓÔÉÌÅ\ C<Tab>:set\ cin!
 ">>>---
 menutrans &Shiftwidth					÷ÅÌÉ&ÞÉÎÁ\ ÏÔÓÔÕÐÁ
 menutrans Soft\ &Tabstop				ûÉÒÉÎÁ\ &ÔÁÂÕÌÑÃÉÉ
@@ -134,55 +135,64 @@ menutrans &File\ Format\.\.\.				&
 "
 "
 " Tools menu
-menutrans &Jump\ to\ this\ tag<Tab>g^]			&ðÅÒÅÈÏÄ\ Ë\ ÍÅÔËÅ<Tab>g^]
-menutrans Jump\ &back<Tab>^T				&÷ÅÒÎÕÔØÓÑ\ ÎÁÚÁÄ<Tab>^T
-menutrans Build\ &Tags\ File				óÏÚÄÁÔØ\ &ÆÁÊÌ\ ÍÅÔÏË
+menutrans &Jump\ to\ This\ Tag<Tab>g^]			&ðÅÒÅÊÔÉ\ Ë\ ÍÅÔËÅ<Tab>g^]
+menutrans Jump\ &Back<Tab>^T				&÷ÅÒÎÕÔØÓÑ\ ÎÁÚÁÄ<Tab>^T
+menutrans Build\ &Tags\ File				óÏÚÄÁÔØ\ ÆÁÊÌ\ ÍÅ&ÔÏË
 "-------------------
-menutrans &Folding					òÁÂÏÔÁ\ ÓÏ\ &ÓËÌÁÄËÁÍÉ
+menutrans &Folding					&óËÌÁÄËÉ
 menutrans &Spelling					ðÒ&Á×ÏÐÉÓÁÎÉÅ
 menutrans &Diff						&ïÔÌÉÞÉÑ\ (diff)
 "-------------------
-menutrans &Make<Tab>:make				ëÏ&ÍÐÉÌÑÃÉÑ<Tab>:make
+menutrans &Make<Tab>:make				ëÏ&ÍÐÉÌÉÒÏ×ÁÔØ<Tab>:make
 menutrans &List\ Errors<Tab>:cl				óÐÉÓÏË\ Ï&ÛÉÂÏË<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!			óÐÉÓÏË\ ×ÓÅ&È\ ÏÛÉÂÏË\ É\ ÐÒÅÄÕÐÒÅÖÄÅÎÉÊ<Tab>:cl!
+menutrans L&ist\ Messages<Tab>:cl!			óÐÉÓÏË\ ÓÏÏ&ÂÝÅÎÉÊ<Tab>:cl!
 menutrans &Next\ Error<Tab>:cn				óÌÅÄÕ&ÀÝÁÑ\ ÏÛÉÂËÁ<Tab>:cn
 menutrans &Previous\ Error<Tab>:cp			ð&ÒÅÄÙÄÕÝÁÑ\ ÏÛÉÂËÁ<Tab>:cp
 menutrans &Older\ List<Tab>:cold			âÏÌÅÅ\ ÓÔÁÒ&ÙÊ\ ÓÐÉÓÏË\ ÏÛÉÂÏË<Tab>:cold
 menutrans N&ewer\ List<Tab>:cnew			âÏÌÅÅ\ Ó×Å&ÖÉÊ\ ÓÐÉÓÏË\ ÏÛÉÂÏË<Tab>:cnew
 menutrans Error\ &Window				ïË&ÎÏ\ ÏÛÉÂÏË
-menutrans Se&T\ Compiler				÷ÙÂÏÒ\ &ËÏÍÐÉÌÑÔÏÒÁ
+menutrans Se&t\ Compiler				÷ÙÂÏÒ\ &ËÏÍÐÉÌÑÔÏÒÁ
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu		ðÏËÁ&ÚÁÔØ\ ÎÁÓÔÒÏÊËÉ\ ËÏÍÐÉ&ÌÑÔÏÒÁ\ ×\ ÍÅÎÀ 
 "-------------------
 menutrans &Convert\ to\ HEX<Tab>:%!xxd			ð&ÅÒÅ×ÅÓÔÉ\ ×\ HEX<Tab>:%!xxd
-menutrans Conve&rt\ back<Tab>:%!xxd\ -r			ðÅÒÅ×ÅÓÔÉ\ É&Ú\ HEX<Tab>:%!xxd\ -r
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			ðÅÒÅ×ÅÓÔÉ\ É&Ú\ HEX<Tab>:%!xxd\ -r
 ">>>---------------- Tools/Spelling
 menutrans &Spell\ Check\ On				&÷ËÌ\ ÐÒÏ×ÅÒËÕ\ ÐÒÁ×ÏÐÉÓÁÎÉÑ
 menutrans Spell\ Check\ &Off				÷Ù&ËÌ\ ÐÒÏ×ÅÒËÕ\ ÐÒÁ×ÏÐÉÓÁÎÉÑ
-menutrans To\ &Next\ error<Tab>]s			&óÌÅÄÕÀÝÁÑ\ ÏÛÉÂËÁ
-menutrans To\ &Previous\ error<Tab>[s			&ðÒÅÄÙÄÕÝÁÑ\ ÏÛÉÂËÁ
-menutrans Suggest\ &Corrections<Tab>z=			ðÒÅÄÌÏÖÉÔØ\ ÉÓÐ&ÒÁ×ÌÅÎÉÑ
-menutrans &Repeat\ correction<Tab>:spellrepall		ðÏ×&ÔÏÒÉÔØ\ ÉÓÐÒÁ×ÌÅÎÉÅ\ ÄÌÑ\ ×ÓÅÈ
+menutrans To\ &Next\ Error<Tab>]s			&óÌÅÄÕÀÝÁÑ\ ÏÛÉÂËÁ<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s			&ðÒÅÄÙÄÕÝÁÑ\ ÏÛÉÂËÁ<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z=			ðÒÅÄÌÏÖÉÔØ\ ÉÓÐ&ÒÁ×ÌÅÎÉÑ<Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall		ðÏ×&ÔÏÒÉÔØ\ ÉÓÐÒÁ×ÌÅÎÉÅ\ ÄÌÑ\ ×ÓÅÈ<Tab>spellrepall
 "-------------------
-menutrans Set\ language\ to\ "en"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en"
-menutrans Set\ language\ to\ "en_au"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_au"
-menutrans Set\ language\ to\ "en_ca"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_ca"
-menutrans Set\ language\ to\ "en_gb"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_gb"
-menutrans Set\ language\ to\ "en_nz"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_nz"
-menutrans Set\ language\ to\ "en_us"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_us"
+menutrans Set\ Language\ to\ "en"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en"
+menutrans Set\ Language\ to\ "en_au"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_au"
+menutrans Set\ Language\ to\ "en_ca"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_ca"
+menutrans Set\ Language\ to\ "en_gb"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_gb"
+menutrans Set\ Language\ to\ "en_nz"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_nz"
+menutrans Set\ Language\ to\ "en_us"			õÓÔÁÎÏ×ÉÔØ\ ÑÚÙË\ "en_us"
 menutrans &Find\ More\ Languages			&îÁÊÔÉ\ ÂÏÌØÛÅ\ ÑÚÙËÏ×
 let g:menutrans_set_lang_to =				'õÓÔÁÎÏ×ÉÔØ ÑÚÙË'
+"
+"
+" The Spelling popup menu
+"
+"
+let g:menutrans_spell_change_ARG_to =			'éÓÐÒÁ×ÉÔØ\ "%s"\ ÎÁ'
+let g:menutrans_spell_add_ARG_to_word_list =		'äÏÂÁ×ÉÔØ\ "%s"\ ×\ ÓÌÏ×ÁÒØ'
+let g:menutrans_spell_ignore_ARG =			'ðÒÏÐÕÓÔÉÔØ\ "%s"'
 ">>>---------------- Folds
-menutrans &Enable/Disable\ folds<Tab>zi			÷ËÌ/×ÙËÌ\ &ÓËÌÁÄËÉ<Tab>zi
+menutrans &Enable/Disable\ Folds<Tab>zi			÷ËÌ/×ÙËÌ\ &ÓËÌÁÄËÉ<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv			ïÔËÒÙÔØ\ ÓÔÒÏËÕ\ Ó\ &ËÕÒÓÏÒÏÍ<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		ïÔËÒÙÔØ\ &ÔÏÌØËÏ\ ÓÔÒÏËÕ\ Ó\ ËÕÒÓÏÒÏÍ<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm			úÁËÒÙÔØ\ &ÂÏÌØÛÅ\ ÓËÌÁÄÏË<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM			úÁËÒÙÔØ\ &×ÓÅ\ ÓËÌÁÄËÉ<Tab>zM
-menutrans &Open\ all\ folds<Tab>zR			ïÔËÒ&ÙÔØ\ ×ÓÅ\ ÓËÌÁÄËÉ<Tab>zR
-menutrans O&pen\ more\ folds<Tab>zr			ïÔË&ÒÙÔØ\ ÂÏÌØÛÅ\ ÓËÌÁÄÏË<Tab>zr
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx		ïÔËÒÙÔØ\ &ÔÏÌØËÏ\ ÓÔÒÏËÕ\ Ó\ ËÕÒÓÏÒÏÍ<Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm			úÁËÒÙÔØ\ &ÂÏÌØÛÅ\ ÓËÌÁÄÏË<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM			úÁËÒÙÔØ\ &×ÓÅ\ ÓËÌÁÄËÉ<Tab>zM
+menutrans &Open\ All\ Folds<Tab>zR			ïÔËÒ&ÙÔØ\ ×ÓÅ\ ÓËÌÁÄËÉ<Tab>zR
+menutrans O&pen\ More\ Folds<Tab>zr			ïÔË&ÒÙÔØ\ ÂÏÌØÛÅ\ ÓËÌÁÄÏË<Tab>zr
 menutrans Fold\ Met&hod					&íÅÔÏÄ\ ÓËÌÁÄÏË
 menutrans Create\ &Fold<Tab>zf				óÏ&ÚÄÁÔØ\ ÓËÌÁÄËÕ<Tab>zf
 menutrans &Delete\ Fold<Tab>zd				õ&ÄÁÌÉÔØ\ ÓËÌÁÄËÕ<Tab>zd
 menutrans Delete\ &All\ Folds<Tab>zD			õÄÁÌÉÔØ\ ×Ó&Å\ ÓËÌÁÄËÉ<Tab>zD
-menutrans Fold\ col&umn\ width				&ûÉÒÉÎÁ\ ËÏÌÏÎËÉ\ ÓËÌÁÄÏË
+menutrans Fold\ col&umn\ Width				&ûÉÒÉÎÁ\ ËÏÌÏÎËÉ\ ÓËÌÁÄÏË
 ">>>->>>----------- Tools/Folds/Fold Method
 menutrans M&anual					÷ÒÕ&ÞÎÕÀ
 menutrans I&ndent					ï&ÔÓÔÕÐ
@@ -201,15 +211,15 @@ menutrans &Open<Tab>:copen				&
 "
 " Syntax menu
 "
-menutrans &Show\ filetypes\ in\ menu			ðÏËÁÚÁÔØ\ ÍÅÎÀ\ ÄÌÑ\ ×ÙÂÏÒÁ\ ÔÉÐÁ\ &ÆÁÊÌÁ
+menutrans &Show\ File\ Types\ in\ Menu			ðÏËÁÚÁÔØ\ ÍÅÎÀ\ ×ÙÂÏÒÁ\ ÔÉÐÁ\ &ÆÁÊÌÁ
 menutrans Set\ '&syntax'\ only				&éÚÍÅÎÑÔØ\ ÔÏÌØËÏ\ ÚÎÁÞÅÎÉÅ\ 'syntax'
 menutrans Set\ '&filetype'\ too				éÚÍÅÎÑÔØ\ &ÔÁËÖÅ\ ÚÎÁÞÅÎÉÅ\ 'filetype'
 menutrans &Off						&ïÔËÌÀÞÉÔØ
 menutrans &Manual					÷ÒÕ&ÞÎÕÀ
 menutrans A&utomatic					&á×ÔÏÍÁÔÉÞÅÓËÉ
-menutrans on/off\ for\ &This\ file			÷ËÌ/×ÙËÌ\ ÄÌÑ\ &ÜÔÏÇÏ\ ÆÁÊÌÁ
-menutrans Co&lor\ test					ðÒÏ×ÅÒËÁ\ &Ã×ÅÔÏ×
-menutrans &Highlight\ test				ðÒÏ×ÅÒËÁ\ ÐÏÄ&Ó×ÅÔËÉ
+menutrans On/Off\ for\ &This\ File			÷ËÌ/×ÙËÌ\ ÄÌÑ\ &ÜÔÏÇÏ\ ÆÁÊÌÁ
+menutrans Co&lor\ Test					ðÒÏ×ÅÒËÁ\ &Ã×ÅÔÏ×
+menutrans &Highlight\ Test				ðÒÏ×ÅÒËÁ\ ÐÏÄ&Ó×ÅÔËÉ
 menutrans &Convert\ to\ HTML				ó&ÄÅÌÁÔØ\ HTML\ Ó\ ÐÏÄÓ×ÅÔËÏÊ
 "
 "
@@ -246,8 +256,8 @@ menutrans Min\ Widt&h<Tab>^W1\|
 ">>>----------------- Window/Move To
 menutrans &Top<Tab>^WK					÷&×ÅÒÈ<Tab>^WK
 menutrans &Bottom<Tab>^WJ				÷&ÎÉÚ<Tab>^WJ
-menutrans &Left\ side<Tab>^WH				÷&ÌÅ×Ï<Tab>^WH
-menutrans &Right\ side<Tab>^WL				÷&ÐÒÁ×Ï<Tab>^WL
+menutrans &Left\ Side<Tab>^WH				÷&ÌÅ×Ï<Tab>^WH
+menutrans &Right\ Side<Tab>^WL				÷&ÐÒÁ×Ï<Tab>^WL
 "
 "
 " The popup menu
@@ -260,9 +270,11 @@ menutrans &Paste
 menutrans &Delete					&õÄÁÌÉÔØ
 menutrans Select\ Blockwise				âÌÏËÏ×ÏÅ\ ×ÙÄÅÌÅÎÉÅ
 menutrans Select\ &Word					÷ÙÄÅÌÉÔØ\ &ÓÌÏ×Ï
+menutrans Select\ &Sentence				÷ÙÄÅÌÉÔØ\ &ÐÒÅÄÌÏÖÅÎÉÅ
+menutrans Select\ Pa&ragraph				÷ÙÄÅÌÉÔØ\ ÐÁÒÁ&ÇÒÁÆ
 menutrans Select\ &Line					÷ÙÄÅÌÉÔØ\ ÓÔ&ÒÏËÕ
 menutrans Select\ &Block				÷ÙÄÅÌÉÔØ\ &ÂÌÏË
-menutrans Select\ &All					÷&ÙÄÅÌÉÔØ\ &×Ó£
+menutrans Select\ &All					÷ÙÄÅÌÉÔØ\ &×Ó£
 "
 " The GUI toolbar
 "
@@ -280,10 +292,9 @@ if has("toolbar")
     tmenu ToolBar.Cut					÷ÙÒÅÚÁÔØ
     tmenu ToolBar.Copy					ëÏÐÉÒÏ×ÁÔØ
     tmenu ToolBar.Paste					÷ËÌÅÉÔØ
-    tmenu ToolBar.Find					ðÏÉÓË...
-    tmenu ToolBar.FindNext				ðÏÉÓË ÓÌÅÄÕÀÝÅÇÏ ÓÏÏÔ×ÅÔÓÔ×ÉÑ
-    tmenu ToolBar.FindPrev				ðÏÉÓË ÐÒÅÄÙÄÕÝÅÇÏ ÓÏÏÔ×ÅÔÓÔ×ÉÑ
-    tmenu ToolBar.Replace				úÁÍÅÎÉÔØ...
+    tmenu ToolBar.FindNext				îÁÊÔÉ ÓÌÅÄÕÀÝÅÅ
+    tmenu ToolBar.FindPrev				îÁÊÔÉ ÐÒÅÄÙÄÕÝÅÅ
+    tmenu ToolBar.Replace				îÁÊÔÉ ÉÌÉ ÚÁÍÅÎÉÔØ...
     tmenu ToolBar.LoadSesn				úÁÇÒÕÚÉÔØ ÓÅÁÎÓ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ
     tmenu ToolBar.SaveSesn				óÏÈÒÁÎÉÔØ ÓÅÁÎÓ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ
     tmenu ToolBar.RunScript				÷ÙÐÏÌÎÉÔØ ÓÃÅÎÁÒÉÊ Vim

runtime/lang/menu_ru_ru.utf-8.vim

@@ -1,3 +1,337 @@
 " Menu Translations:	Russian
+" Maintainer:		Sergey Alyoshin <alyoshin.s@gmail.com>
+" Previous Maintainer:	Vassily Ragosin <vrr[at]users.sourceforge.net>
+" Last Change:		16 May 2018
+" Original translations
+" URL:			cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim
+"
+" $Id: menu_ru_ru.vim,v 1.1 2004/06/13 16:09:10 vimboss Exp $
+"
+" Adopted for RuVim project by Vassily Ragosin.
+" First translation: Tim Alexeevsky <realtim [at] mail.ru>,
+" based on ukrainian translation by Bohdan Vlasyuk <bohdan@vstu.edu.ua>
+"
+"
+" Quit when menu translations have already been done.
+"
+if exists("did_menu_trans")
+   finish
+endif
+let did_menu_trans = 1
+let s:keepcpo= &cpo
+set cpo&vim
 
-source <sfile>:p:h/menu_ru_ru.vim
+scriptencoding utf-8
+
+" Top
+menutrans &File				&Файл
+menutrans &Edit				П&равка
+menutrans &Tools			&Инструменты
+menutrans &Syntax			&Синтаксис
+menutrans &Buffers			&Буферы
+menutrans &Window			&Окно
+menutrans &Help				С&правка
+"
+"
+"
+" Help menu
+menutrans &Overview<Tab><F1>		&Обзор<Tab><F1>
+menutrans &User\ Manual			Руково&дство\ пользователя
+menutrans &How-To\ Links		&Как\ это\ сделать\.\.\.
+menutrans &Find\.\.\.			&Поиск
+"--------------------
+menutrans &Credits			&Благодарности
+menutrans Co&pying			&Распространение
+menutrans &Sponsor/Register		Помо&щь/Регистрация
+menutrans O&rphans			&Сироты
+"--------------------
+menutrans &Version			&Информация\ о\ программе
+menutrans &About			&Заставка
+"
+"
+" File menu
+menutrans &Open\.\.\.<Tab>:e		&Открыть\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp	По&делить\ окно\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	Открыть\ в&кладку\.\.\.<Tab>:tabnew
+menutrans &New<Tab>:enew		&Новый<Tab>:enew
+menutrans &Close<Tab>:close		&Закрыть<Tab>:close
+"--------------------
+menutrans &Save<Tab>:w			&Сохранить<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav	Сохранить\ &как\.\.\.<Tab>:sav
+"--------------------
+menutrans Split\ &Diff\ With\.\.\.	Ср&авнить\ с\.\.\.
+menutrans Split\ Patched\ &By\.\.\.	Сравнить\ с\ применением\ зап&латки\.\.\.
+"--------------------
+menutrans &Print			На&печатать
+menutrans Sa&ve-Exit<Tab>:wqa		Вы&ход\ с\ сохранением<Tab>:wqa
+menutrans E&xit<Tab>:qa			&Выход<Tab>:qa
+"
+"
+" Edit menu
+menutrans &Undo<Tab>u			О&тменить<Tab>u
+menutrans &Redo<Tab>^R			В&ернуть<Tab>^R
+menutrans Rep&eat<Tab>\.		Повторит&ь<Tab>\.
+"--------------------
+menutrans Cu&t<Tab>"+x			&Вырезать<Tab>"+x
+menutrans &Copy<Tab>"+y			&Копировать<Tab>"+y
+menutrans &Paste<Tab>"+gP		Вк&леить<Tab>"+gP
+menutrans Put\ &Before<Tab>[p		Вклеить\ пере&д<Tab>[p
+menutrans Put\ &After<Tab>]p		Вклеить\ по&сле<Tab>]p
+menutrans &Delete<Tab>x			&Удалить<Tab>x
+menutrans &Select\ All<Tab>ggVG		В&ыделить\ всё<Tab>ggVG
+"--------------------
+" Athena GUI only
+menutrans &Find<Tab>/			&Поиск<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s	Поиск\ и\ &замена<Tab>:%s
+" End Athena GUI only
+menutrans &Find\.\.\.<Tab>/		&Поиск\.\.\.<Tab>/
+menutrans Find\ and\ Rep&lace\.\.\.	Поиск\ и\ &замена\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s	Поиск\ и\ &замена\.\.\.<Tab>:%s
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s	Поиск\ и\ &замена\.\.\.<Tab>:s
+"--------------------
+menutrans Settings\ &Window		Окно\ настройки\ &опций
+menutrans Startup\ &Settings		Настройки\ запус&ка
+menutrans &Global\ Settings		&Глобальные\ настройки
+menutrans F&ile\ Settings		Настройки\ &файлов
+menutrans C&olor\ Scheme		&Цветовая\ схема
+menutrans &Keymap			Раскладка\ кл&авиатуры
+menutrans Select\ Fo&nt\.\.\.		Выбор\ &шрифта\.\.\.
+">>>----------------- Edit/Global settings
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	Подсветка\ &найденных\ соответствий<Tab>:set\ hls!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		&Регистронезависимый\ поиск<Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	Показывать\ парные\ &элементы<Tab>:set\ sm!
+menutrans &Context\ Lines				Стр&ок\ вокруг\ курсора
+menutrans &Virtual\ Edit				Вир&туальное\ редактирование
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		Режим\ &Вставки<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&Совместимость\ с\ Vi<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\.				&Путь\ для\ поиска\ файлов\.\.\.
+menutrans Ta&g\ Files\.\.\.				Файлы\ &меток\.\.\.
+"
+menutrans Toggle\ &Toolbar				&Инструментальная\ панель
+menutrans Toggle\ &Bottom\ Scrollbar			Полоса\ прокрутки\ вни&зу
+menutrans Toggle\ &Left\ Scrollbar			Полоса\ прокрутки\ с&лева
+menutrans Toggle\ &Right\ Scrollbar			Полоса\ прокрутки\ спр&ава
+">>>->>>------------- Edit/Global settings/Virtual edit
+menutrans Never						Выключено
+menutrans Block\ Selection				При\ выделении\ блока
+menutrans Insert\ Mode					В\ режиме\ Вставки
+menutrans Block\ and\ Insert				При\ выделении\ блока\ и\ в\ режиме\ Вставки
+menutrans Always					Включено\ всегда
+">>>----------------- Edit/File settings
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	&Нумерация\ строк<Tab>:set\ nu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	Относите&льная\ нумерация\ строк<Tab>:set\ nru!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!		Отобра&жение\ невидимых\ символов<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	&Перенос\ длинных\ строк<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	Перенос\ &целых\ слов<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!	Про&белы\ вместо\ табуляции<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!	Автоматическое\ форматирование\ &отступов<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	Форматирование\ отступов\ в\ &стиле\ C<Tab>:set\ cin!
+">>>---
+menutrans &Shiftwidth					Вели&чина\ отступа
+menutrans Soft\ &Tabstop				Ширина\ &табуляции
+menutrans Te&xt\ Width\.\.\.				&Ширина\ текста\.\.\.
+menutrans &File\ Format\.\.\.				&Формат\ файла\.\.\.
+"
+"
+"
+" Tools menu
+menutrans &Jump\ to\ This\ Tag<Tab>g^]			&Перейти\ к\ метке<Tab>g^]
+menutrans Jump\ &Back<Tab>^T				&Вернуться\ назад<Tab>^T
+menutrans Build\ &Tags\ File				Создать\ файл\ ме&ток
+"-------------------
+menutrans &Folding					&Складки
+menutrans &Spelling					Пр&авописание
+menutrans &Diff						&Отличия\ (diff)
+"-------------------
+menutrans &Make<Tab>:make				Ко&мпилировать<Tab>:make
+menutrans &List\ Errors<Tab>:cl				Список\ о&шибок<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!			Список\ соо&бщений<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn				Следу&ющая\ ошибка<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp			П&редыдущая\ ошибка<Tab>:cp
+menutrans &Older\ List<Tab>:cold			Более\ стар&ый\ список\ ошибок<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew			Более\ све&жий\ список\ ошибок<Tab>:cnew
+menutrans Error\ &Window				Ок&но\ ошибок
+menutrans Se&t\ Compiler				Выбор\ &компилятора
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu		Пока&зать\ настройки\ компи&лятора\ в\ меню 
+"-------------------
+menutrans &Convert\ to\ HEX<Tab>:%!xxd			П&еревести\ в\ HEX<Tab>:%!xxd
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			Перевести\ и&з\ HEX<Tab>:%!xxd\ -r
+">>>---------------- Tools/Spelling
+menutrans &Spell\ Check\ On				&Вкл\ проверку\ правописания
+menutrans Spell\ Check\ &Off				Вы&кл\ проверку\ правописания
+menutrans To\ &Next\ Error<Tab>]s			&Следующая\ ошибка<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s			&Предыдущая\ ошибка<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z=			Предложить\ исп&равления<Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall		Пов&торить\ исправление\ для\ всех<Tab>spellrepall
+"-------------------
+menutrans Set\ Language\ to\ "en"			Установить\ язык\ "en"
+menutrans Set\ Language\ to\ "en_au"			Установить\ язык\ "en_au"
+menutrans Set\ Language\ to\ "en_ca"			Установить\ язык\ "en_ca"
+menutrans Set\ Language\ to\ "en_gb"			Установить\ язык\ "en_gb"
+menutrans Set\ Language\ to\ "en_nz"			Установить\ язык\ "en_nz"
+menutrans Set\ Language\ to\ "en_us"			Установить\ язык\ "en_us"
+menutrans &Find\ More\ Languages			&Найти\ больше\ языков
+let g:menutrans_set_lang_to =				'Установить язык'
+"
+"
+" The Spelling popup menu
+"
+"
+let g:menutrans_spell_change_ARG_to =			'Исправить\ "%s"\ на'
+let g:menutrans_spell_add_ARG_to_word_list =		'Добавить\ "%s"\ в\ словарь'
+let g:menutrans_spell_ignore_ARG =			'Пропустить\ "%s"'
+">>>---------------- Folds
+menutrans &Enable/Disable\ Folds<Tab>zi			Вкл/выкл\ &складки<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv			Открыть\ строку\ с\ &курсором<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx		Открыть\ &только\ строку\ с\ курсором<Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm			Закрыть\ &больше\ складок<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM			Закрыть\ &все\ складки<Tab>zM
+menutrans &Open\ All\ Folds<Tab>zR			Откр&ыть\ все\ складки<Tab>zR
+menutrans O&pen\ More\ Folds<Tab>zr			Отк&рыть\ больше\ складок<Tab>zr
+menutrans Fold\ Met&hod					&Метод\ складок
+menutrans Create\ &Fold<Tab>zf				Со&здать\ складку<Tab>zf
+menutrans &Delete\ Fold<Tab>zd				У&далить\ складку<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD			Удалить\ вс&е\ складки<Tab>zD
+menutrans Fold\ col&umn\ Width				&Ширина\ колонки\ складок
+">>>->>>----------- Tools/Folds/Fold Method
+menutrans M&anual					Вру&чную
+menutrans I&ndent					О&тступ
+menutrans E&xpression					&Выражение
+menutrans S&yntax					&Синтаксис
+menutrans Ma&rker					&Маркеры
+">>>--------------- Tools/Diff
+menutrans &Update					О&бновить
+menutrans &Get\ Block					Изменить\ &этот\ буфер
+menutrans &Put\ Block					Изменить\ &другой\ буфер
+">>>--------------- Tools/Diff/Error window
+menutrans &Update<Tab>:cwin				О&бновить<Tab>:cwin
+menutrans &Close<Tab>:cclose				&Закрыть<Tab>:cclose
+menutrans &Open<Tab>:copen				&Открыть<Tab>:copen
+"
+"
+" Syntax menu
+"
+menutrans &Show\ File\ Types\ in\ Menu			Показать\ меню\ выбора\ типа\ &файла
+menutrans Set\ '&syntax'\ only				&Изменять\ только\ значение\ 'syntax'
+menutrans Set\ '&filetype'\ too				Изменять\ &также\ значение\ 'filetype'
+menutrans &Off						&Отключить
+menutrans &Manual					Вру&чную
+menutrans A&utomatic					&Автоматически
+menutrans On/Off\ for\ &This\ File			Вкл/выкл\ для\ &этого\ файла
+menutrans Co&lor\ Test					Проверка\ &цветов
+menutrans &Highlight\ Test				Проверка\ под&светки
+menutrans &Convert\ to\ HTML				С&делать\ HTML\ с\ подсветкой
+"
+"
+" Buffers menu
+"
+menutrans &Refresh\ menu				О&бновить\ меню
+menutrans Delete					У&далить
+menutrans &Alternate					&Соседний
+menutrans &Next						С&ледующий
+menutrans &Previous					&Предыдущий
+menutrans [No\ File]					[Нет\ файла]
+"
+"
+" Window menu
+"
+menutrans &New<Tab>^Wn					&Новое\ окно<Tab>^Wn
+menutrans S&plit<Tab>^Ws				&Разделить\ окно<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^			Открыть\ &соседний\ файл\ в\ новом\ окне<Tab>^W^^
+menutrans Split\ &Vertically<Tab>^Wv			Разделить\ по\ &вертикали<Tab>^Wv
+menutrans Split\ File\ E&xplorer			Открыть\ проводник\ по\ &файловой\ системе
+"
+menutrans &Close<Tab>^Wc				&Закрыть\ это\ окно<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo			Закрыть\ &остальные\ окна<Tab>^Wo
+"
+menutrans Move\ &To					&Переместить
+menutrans Rotate\ &Up<Tab>^WR				Сдвинуть\ ввер&х<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr				Сдвинуть\ в&низ<Tab>^Wr
+"
+menutrans &Equal\ Size<Tab>^W=				О&динаковый\ размер<Tab>^W=
+menutrans &Max\ Height<Tab>^W_				Максимальная\ в&ысота<Tab>^W_
+menutrans M&in\ Height<Tab>^W1_				Минимальная\ высо&та<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\|				Максимальная\ &ширина<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\|				Минимал&ьная\ ширина<Tab>^W1\|
+">>>----------------- Window/Move To
+menutrans &Top<Tab>^WK					В&верх<Tab>^WK
+menutrans &Bottom<Tab>^WJ				В&низ<Tab>^WJ
+menutrans &Left\ Side<Tab>^WH				В&лево<Tab>^WH
+menutrans &Right\ Side<Tab>^WL				В&право<Tab>^WL
+"
+"
+" The popup menu
+"
+"
+menutrans &Undo						О&тменить
+menutrans Cu&t						&Вырезать
+menutrans &Copy						&Копировать
+menutrans &Paste					Вк&леить
+menutrans &Delete					&Удалить
+menutrans Select\ Blockwise				Блоковое\ выделение
+menutrans Select\ &Word					Выделить\ &слово
+menutrans Select\ &Sentence				Выделить\ &предложение
+menutrans Select\ Pa&ragraph				Выделить\ пара&граф
+menutrans Select\ &Line					Выделить\ ст&року
+menutrans Select\ &Block				Выделить\ &блок
+menutrans Select\ &All					Выделить\ &всё
+"
+" The GUI toolbar
+"
+if has("toolbar")
+  if exists("*Do_toolbar_tmenu")
+    delfun Do_toolbar_tmenu
+  endif
+  fun Do_toolbar_tmenu()
+    tmenu ToolBar.Open					Открыть файл
+    tmenu ToolBar.Save					Сохранить файл
+    tmenu ToolBar.SaveAll				Сохранить все файлы
+    tmenu ToolBar.Print					Напечатать
+    tmenu ToolBar.Undo					Отменить
+    tmenu ToolBar.Redo					Вернуть
+    tmenu ToolBar.Cut					Вырезать
+    tmenu ToolBar.Copy					Копировать
+    tmenu ToolBar.Paste					Вклеить
+    tmenu ToolBar.FindNext				Найти следующее
+    tmenu ToolBar.FindPrev				Найти предыдущее
+    tmenu ToolBar.Replace				Найти или заменить...
+    tmenu ToolBar.LoadSesn				Загрузить сеанс редактирования
+    tmenu ToolBar.SaveSesn				Сохранить сеанс редактирования
+    tmenu ToolBar.RunScript				Выполнить сценарий Vim
+    tmenu ToolBar.Make					Компиляция
+    tmenu ToolBar.Shell					Оболочка
+    tmenu ToolBar.RunCtags				Создать файл меток
+    tmenu ToolBar.TagJump				Перейти к метке
+    tmenu ToolBar.Help					Справка
+    tmenu ToolBar.FindHelp				Найти справку
+  endfun
+endif
+"
+"
+" Dialog texts
+"
+" Find in help dialog
+"
+let g:menutrans_help_dialog = "Введите команду или слово для поиска:\n\nДобавьте i_ для поиска команд режима Вставки (например, i_CTRL-X)\nДобавьте c_ для поиска команд Обычного режима (например, с_<Del>)\nДобавьте ' для поиска справки по опции (например, 'shiftwidth')"
+"
+" Searh path dialog
+"
+let g:menutrans_path_dialog = "Укажите путь для поиска файлов.\nИмена каталогов разделяются запятыми."
+"
+" Tag files dialog
+"
+let g:menutrans_tags_dialog = "Введите имена файлов меток (через запятую).\n"
+"
+" Text width dialog
+"
+let g:menutrans_textwidth_dialog = "Введите ширину текста для форматирования.\nДля отмены форматирования введите 0."
+"
+" File format dialog
+"
+let g:menutrans_fileformat_dialog = "Выберите формат файла."
+let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nО&тмена"
+"
+let menutrans_no_file = "[Нет файла]"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo

runtime/lang/menu_ru_ru.vim

@@ -1,336 +1,3 @@
 " Menu Translations:	Russian
-" Maintainer:		Sergey Alyoshin <alyoshin.s@gmail.com>
-" Previous Maintainer:	Vassily Ragosin <vrr[at]users.sourceforge.net>
-" Last Change:		16 May 2018
-" URL:			cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim
-"
-" $Id: menu_ru_ru.vim,v 1.1 2004/06/13 16:09:10 vimboss Exp $
-"
-" Adopted for RuVim project by Vassily Ragosin.
-" First translation: Tim Alexeevsky <realtim [at] mail.ru>,
-" based on ukrainian translation by Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-"
-"
-" Quit when menu translations have already been done.
-"
-if exists("did_menu_trans")
-   finish
-endif
-let did_menu_trans = 1
-let s:keepcpo= &cpo
-set cpo&vim
 
-scriptencoding utf-8
-
-" Top
-menutrans &File				&Файл
-menutrans &Edit				П&равка
-menutrans &Tools			&Инструменты
-menutrans &Syntax			&Синтаксис
-menutrans &Buffers			&Буферы
-menutrans &Window			&Окно
-menutrans &Help				С&правка
-"
-"
-"
-" Help menu
-menutrans &Overview<Tab><F1>		&Обзор<Tab><F1>
-menutrans &User\ Manual			Руково&дство\ пользователя
-menutrans &How-To\ Links		&Как\ это\ сделать\.\.\.
-menutrans &Find\.\.\.			&Поиск
-"--------------------
-menutrans &Credits			&Благодарности
-menutrans Co&pying			&Распространение
-menutrans &Sponsor/Register		Помо&щь/Регистрация
-menutrans O&rphans			&Сироты
-"--------------------
-menutrans &Version			&Информация\ о\ программе
-menutrans &About			&Заставка
-"
-"
-" File menu
-menutrans &Open\.\.\.<Tab>:e		&Открыть\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp	По&делить\ окно\.\.\.<Tab>:sp
-menutrans Open\ Tab\.\.\.<Tab>:tabnew	Открыть\ в&кладку\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew		&Новый<Tab>:enew
-menutrans &Close<Tab>:close		&Закрыть<Tab>:close
-"--------------------
-menutrans &Save<Tab>:w			&Сохранить<Tab>:w
-menutrans Save\ &As\.\.\.<Tab>:sav	Сохранить\ &как\.\.\.<Tab>:sav
-"--------------------
-menutrans Split\ &Diff\ With\.\.\.	Ср&авнить\ с\.\.\.
-menutrans Split\ Patched\ &By\.\.\.	Сравнить\ с\ применением\ зап&латки\.\.\.
-"--------------------
-menutrans &Print			На&печатать
-menutrans Sa&ve-Exit<Tab>:wqa		Вы&ход\ с\ сохранением<Tab>:wqa
-menutrans E&xit<Tab>:qa			&Выход<Tab>:qa
-"
-"
-" Edit menu
-menutrans &Undo<Tab>u			О&тменить<Tab>u
-menutrans &Redo<Tab>^R			В&ернуть<Tab>^R
-menutrans Rep&eat<Tab>\.		Повторит&ь<Tab>\.
-"--------------------
-menutrans Cu&t<Tab>"+x			&Вырезать<Tab>"+x
-menutrans &Copy<Tab>"+y			&Копировать<Tab>"+y
-menutrans &Paste<Tab>"+gP		Вк&леить<Tab>"+gP
-menutrans Put\ &Before<Tab>[p		Вклеить\ пере&д<Tab>[p
-menutrans Put\ &After<Tab>]p		Вклеить\ по&сле<Tab>]p
-menutrans &Delete<Tab>x			&Удалить<Tab>x
-menutrans &Select\ All<Tab>ggVG		В&ыделить\ всё<Tab>ggVG
-"--------------------
-" Athena GUI only
-menutrans &Find<Tab>/			&Поиск<Tab>/
-menutrans Find\ and\ Rep&lace<Tab>:%s	Поиск\ и\ &замена<Tab>:%s
-" End Athena GUI only
-menutrans &Find\.\.\.<Tab>/		&Поиск\.\.\.<Tab>/
-menutrans Find\ and\ Rep&lace\.\.\.	Поиск\ и\ &замена\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s	Поиск\ и\ &замена\.\.\.<Tab>:%s
-menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s	Поиск\ и\ &замена\.\.\.<Tab>:s
-"--------------------
-menutrans Settings\ &Window		Окно\ настройки\ &опций
-menutrans Startup\ &Settings		Настройки\ запус&ка
-menutrans &Global\ Settings		&Глобальные\ настройки
-menutrans F&ile\ Settings		Настройки\ &файлов
-menutrans C&olor\ Scheme		&Цветовая\ схема
-menutrans &Keymap			Раскладка\ кл&авиатуры
-menutrans Select\ Fo&nt\.\.\.		Выбор\ &шрифта\.\.\.
-">>>----------------- Edit/Global settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	Подсветка\ &найденных\ соответствий<Tab>:set\ hls!
-menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		&Регистронезависимый\ поиск<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	Показывать\ парные\ &элементы<Tab>:set\ sm!
-menutrans &Context\ Lines				Стр&ок\ вокруг\ курсора
-menutrans &Virtual\ Edit				Вир&туальное\ редактирование
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		Режим\ &Вставки<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&Совместимость\ с\ Vi<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.				&Путь\ для\ поиска\ файлов\.\.\.
-menutrans Ta&g\ Files\.\.\.				Файлы\ &меток\.\.\.
-"
-menutrans Toggle\ &Toolbar				&Инструментальная\ панель
-menutrans Toggle\ &Bottom\ Scrollbar			Полоса\ прокрутки\ вни&зу
-menutrans Toggle\ &Left\ Scrollbar			Полоса\ прокрутки\ с&лева
-menutrans Toggle\ &Right\ Scrollbar			Полоса\ прокрутки\ спр&ава
-">>>->>>------------- Edit/Global settings/Virtual edit
-menutrans Never						Выключено
-menutrans Block\ Selection				При\ выделении\ блока
-menutrans Insert\ Mode					В\ режиме\ Вставки
-menutrans Block\ and\ Insert				При\ выделении\ блока\ и\ в\ режиме\ Вставки
-menutrans Always					Включено\ всегда
-">>>----------------- Edit/File settings
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	&Нумерация\ строк<Tab>:set\ nu!
-menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	Относите&льная\ нумерация\ строк<Tab>:set\ nru!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!		Отобра&жение\ невидимых\ символов<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	&Перенос\ длинных\ строк<Tab>:set\ wrap!
-menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	Перенос\ &целых\ слов<Tab>:set\ lbr!
-menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!	Про&белы\ вместо\ табуляции<Tab>:set\ et!
-menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!	Автоматическое\ форматирование\ &отступов<Tab>:set\ ai!
-menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	Форматирование\ отступов\ в\ &стиле\ C<Tab>:set\ cin!
-">>>---
-menutrans &Shiftwidth					Вели&чина\ отступа
-menutrans Soft\ &Tabstop				Ширина\ &табуляции
-menutrans Te&xt\ Width\.\.\.				&Ширина\ текста\.\.\.
-menutrans &File\ Format\.\.\.				&Формат\ файла\.\.\.
-"
-"
-"
-" Tools menu
-menutrans &Jump\ to\ This\ Tag<Tab>g^]			&Перейти\ к\ метке<Tab>g^]
-menutrans Jump\ &Back<Tab>^T				&Вернуться\ назад<Tab>^T
-menutrans Build\ &Tags\ File				Создать\ файл\ ме&ток
-"-------------------
-menutrans &Folding					&Складки
-menutrans &Spelling					Пр&авописание
-menutrans &Diff						&Отличия\ (diff)
-"-------------------
-menutrans &Make<Tab>:make				Ко&мпилировать<Tab>:make
-menutrans &List\ Errors<Tab>:cl				Список\ о&шибок<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!			Список\ соо&бщений<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn				Следу&ющая\ ошибка<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp			П&редыдущая\ ошибка<Tab>:cp
-menutrans &Older\ List<Tab>:cold			Более\ стар&ый\ список\ ошибок<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew			Более\ све&жий\ список\ ошибок<Tab>:cnew
-menutrans Error\ &Window				Ок&но\ ошибок
-menutrans Se&t\ Compiler				Выбор\ &компилятора
-menutrans Show\ Compiler\ Se&ttings\ in\ Menu		Пока&зать\ настройки\ компи&лятора\ в\ меню 
-"-------------------
-menutrans &Convert\ to\ HEX<Tab>:%!xxd			П&еревести\ в\ HEX<Tab>:%!xxd
-menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			Перевести\ и&з\ HEX<Tab>:%!xxd\ -r
-">>>---------------- Tools/Spelling
-menutrans &Spell\ Check\ On				&Вкл\ проверку\ правописания
-menutrans Spell\ Check\ &Off				Вы&кл\ проверку\ правописания
-menutrans To\ &Next\ Error<Tab>]s			&Следующая\ ошибка<Tab>]s
-menutrans To\ &Previous\ Error<Tab>[s			&Предыдущая\ ошибка<Tab>[s
-menutrans Suggest\ &Corrections<Tab>z=			Предложить\ исп&равления<Tab>z=
-menutrans &Repeat\ Correction<Tab>:spellrepall		Пов&торить\ исправление\ для\ всех<Tab>spellrepall
-"-------------------
-menutrans Set\ Language\ to\ "en"			Установить\ язык\ "en"
-menutrans Set\ Language\ to\ "en_au"			Установить\ язык\ "en_au"
-menutrans Set\ Language\ to\ "en_ca"			Установить\ язык\ "en_ca"
-menutrans Set\ Language\ to\ "en_gb"			Установить\ язык\ "en_gb"
-menutrans Set\ Language\ to\ "en_nz"			Установить\ язык\ "en_nz"
-menutrans Set\ Language\ to\ "en_us"			Установить\ язык\ "en_us"
-menutrans &Find\ More\ Languages			&Найти\ больше\ языков
-let g:menutrans_set_lang_to =				'Установить язык'
-"
-"
-" The Spelling popup menu
-"
-"
-let g:menutrans_spell_change_ARG_to =			'Исправить\ "%s"\ на'
-let g:menutrans_spell_add_ARG_to_word_list =		'Добавить\ "%s"\ в\ словарь'
-let g:menutrans_spell_ignore_ARG =			'Пропустить\ "%s"'
-">>>---------------- Folds
-menutrans &Enable/Disable\ Folds<Tab>zi			Вкл/выкл\ &складки<Tab>zi
-menutrans &View\ Cursor\ Line<Tab>zv			Открыть\ строку\ с\ &курсором<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx		Открыть\ &только\ строку\ с\ курсором<Tab>zMzx
-menutrans C&lose\ More\ Folds<Tab>zm			Закрыть\ &больше\ складок<Tab>zm
-menutrans &Close\ All\ Folds<Tab>zM			Закрыть\ &все\ складки<Tab>zM
-menutrans &Open\ All\ Folds<Tab>zR			Откр&ыть\ все\ складки<Tab>zR
-menutrans O&pen\ More\ Folds<Tab>zr			Отк&рыть\ больше\ складок<Tab>zr
-menutrans Fold\ Met&hod					&Метод\ складок
-menutrans Create\ &Fold<Tab>zf				Со&здать\ складку<Tab>zf
-menutrans &Delete\ Fold<Tab>zd				У&далить\ складку<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD			Удалить\ вс&е\ складки<Tab>zD
-menutrans Fold\ col&umn\ Width				&Ширина\ колонки\ складок
-">>>->>>----------- Tools/Folds/Fold Method
-menutrans M&anual					Вру&чную
-menutrans I&ndent					О&тступ
-menutrans E&xpression					&Выражение
-menutrans S&yntax					&Синтаксис
-menutrans Ma&rker					&Маркеры
-">>>--------------- Tools/Diff
-menutrans &Update					О&бновить
-menutrans &Get\ Block					Изменить\ &этот\ буфер
-menutrans &Put\ Block					Изменить\ &другой\ буфер
-">>>--------------- Tools/Diff/Error window
-menutrans &Update<Tab>:cwin				О&бновить<Tab>:cwin
-menutrans &Close<Tab>:cclose				&Закрыть<Tab>:cclose
-menutrans &Open<Tab>:copen				&Открыть<Tab>:copen
-"
-"
-" Syntax menu
-"
-menutrans &Show\ File\ Types\ in\ Menu			Показать\ меню\ выбора\ типа\ &файла
-menutrans Set\ '&syntax'\ only				&Изменять\ только\ значение\ 'syntax'
-menutrans Set\ '&filetype'\ too				Изменять\ &также\ значение\ 'filetype'
-menutrans &Off						&Отключить
-menutrans &Manual					Вру&чную
-menutrans A&utomatic					&Автоматически
-menutrans On/Off\ for\ &This\ File			Вкл/выкл\ для\ &этого\ файла
-menutrans Co&lor\ Test					Проверка\ &цветов
-menutrans &Highlight\ Test				Проверка\ под&светки
-menutrans &Convert\ to\ HTML				С&делать\ HTML\ с\ подсветкой
-"
-"
-" Buffers menu
-"
-menutrans &Refresh\ menu				О&бновить\ меню
-menutrans Delete					У&далить
-menutrans &Alternate					&Соседний
-menutrans &Next						С&ледующий
-menutrans &Previous					&Предыдущий
-menutrans [No\ File]					[Нет\ файла]
-"
-"
-" Window menu
-"
-menutrans &New<Tab>^Wn					&Новое\ окно<Tab>^Wn
-menutrans S&plit<Tab>^Ws				&Разделить\ окно<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^			Открыть\ &соседний\ файл\ в\ новом\ окне<Tab>^W^^
-menutrans Split\ &Vertically<Tab>^Wv			Разделить\ по\ &вертикали<Tab>^Wv
-menutrans Split\ File\ E&xplorer			Открыть\ проводник\ по\ &файловой\ системе
-"
-menutrans &Close<Tab>^Wc				&Закрыть\ это\ окно<Tab>^Wc
-menutrans Close\ &Other(s)<Tab>^Wo			Закрыть\ &остальные\ окна<Tab>^Wo
-"
-menutrans Move\ &To					&Переместить
-menutrans Rotate\ &Up<Tab>^WR				Сдвинуть\ ввер&х<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr				Сдвинуть\ в&низ<Tab>^Wr
-"
-menutrans &Equal\ Size<Tab>^W=				О&динаковый\ размер<Tab>^W=
-menutrans &Max\ Height<Tab>^W_				Максимальная\ в&ысота<Tab>^W_
-menutrans M&in\ Height<Tab>^W1_				Минимальная\ высо&та<Tab>^W1_
-menutrans Max\ &Width<Tab>^W\|				Максимальная\ &ширина<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|				Минимал&ьная\ ширина<Tab>^W1\|
-">>>----------------- Window/Move To
-menutrans &Top<Tab>^WK					В&верх<Tab>^WK
-menutrans &Bottom<Tab>^WJ				В&низ<Tab>^WJ
-menutrans &Left\ Side<Tab>^WH				В&лево<Tab>^WH
-menutrans &Right\ Side<Tab>^WL				В&право<Tab>^WL
-"
-"
-" The popup menu
-"
-"
-menutrans &Undo						О&тменить
-menutrans Cu&t						&Вырезать
-menutrans &Copy						&Копировать
-menutrans &Paste					Вк&леить
-menutrans &Delete					&Удалить
-menutrans Select\ Blockwise				Блоковое\ выделение
-menutrans Select\ &Word					Выделить\ &слово
-menutrans Select\ &Sentence				Выделить\ &предложение
-menutrans Select\ Pa&ragraph				Выделить\ пара&граф
-menutrans Select\ &Line					Выделить\ ст&року
-menutrans Select\ &Block				Выделить\ &блок
-menutrans Select\ &All					Выделить\ &всё
-"
-" The GUI toolbar
-"
-if has("toolbar")
-  if exists("*Do_toolbar_tmenu")
-    delfun Do_toolbar_tmenu
-  endif
-  fun Do_toolbar_tmenu()
-    tmenu ToolBar.Open					Открыть файл
-    tmenu ToolBar.Save					Сохранить файл
-    tmenu ToolBar.SaveAll				Сохранить все файлы
-    tmenu ToolBar.Print					Напечатать
-    tmenu ToolBar.Undo					Отменить
-    tmenu ToolBar.Redo					Вернуть
-    tmenu ToolBar.Cut					Вырезать
-    tmenu ToolBar.Copy					Копировать
-    tmenu ToolBar.Paste					Вклеить
-    tmenu ToolBar.FindNext				Найти следующее
-    tmenu ToolBar.FindPrev				Найти предыдущее
-    tmenu ToolBar.Replace				Найти или заменить...
-    tmenu ToolBar.LoadSesn				Загрузить сеанс редактирования
-    tmenu ToolBar.SaveSesn				Сохранить сеанс редактирования
-    tmenu ToolBar.RunScript				Выполнить сценарий Vim
-    tmenu ToolBar.Make					Компиляция
-    tmenu ToolBar.Shell					Оболочка
-    tmenu ToolBar.RunCtags				Создать файл меток
-    tmenu ToolBar.TagJump				Перейти к метке
-    tmenu ToolBar.Help					Справка
-    tmenu ToolBar.FindHelp				Найти справку
-  endfun
-endif
-"
-"
-" Dialog texts
-"
-" Find in help dialog
-"
-let g:menutrans_help_dialog = "Введите команду или слово для поиска:\n\nДобавьте i_ для поиска команд режима Вставки (например, i_CTRL-X)\nДобавьте c_ для поиска команд Обычного режима (например, с_<Del>)\nДобавьте ' для поиска справки по опции (например, 'shiftwidth')"
-"
-" Searh path dialog
-"
-let g:menutrans_path_dialog = "Укажите путь для поиска файлов.\nИмена каталогов разделяются запятыми."
-"
-" Tag files dialog
-"
-let g:menutrans_tags_dialog = "Введите имена файлов меток (через запятую).\n"
-"
-" Text width dialog
-"
-let g:menutrans_textwidth_dialog = "Введите ширину текста для форматирования.\nДля отмены форматирования введите 0."
-"
-" File format dialog
-"
-let g:menutrans_fileformat_dialog = "Выберите формат файла."
-let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nО&тмена"
-"
-let menutrans_no_file = "[Нет файла]"
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
+source <sfile>:p:h/menu_ru_ru.utf-8.vim

runtime/lang/menu_sk_sk.iso_8859-2.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Slovak
 " Translated By:	Martin Lacko <lacko@host.sk>
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_sl_si.cp1250.vim

@@ -1,8 +1,9 @@
 " Menu Translations:	Slovenian / Slovensko
 " Maintainer:		Mojca Miklavec <mojca.miklavec.lists@gmail.com>
 " Originally By:	Mojca Miklavec <mojca.miklavec.lists@gmail.com>
-" Last Change:		2016 Oct 17
+" Last Change:		2020 Apr 23
 " vim:set foldmethod=marker tabstop=8:
+" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT
 
 " TODO: add/check all '&'s
 
@@ -113,29 +114,29 @@ if has("spell")
     menutrans To\ &Previous\ error<Tab>[s		K\ &prejšnji\ napaki<Tab>[s
     menutrans Suggest\ &Corrections<Tab>z=		Predlagaj\ popravek<Tab>z=
     menutrans &Repeat\ correction<Tab>:spellrepall	Po&novi\ popravke\ na\ vseh\ besedah<Tab>:spellrepall
-    menutrans Set\ language\ to\ "en"			Angleški\ "en"
-    menutrans Set\ language\ to\ "en_au"		Angleški\ "en_au"
-    menutrans Set\ language\ to\ "en_ca"		Angleški\ "en_ca"
-    menutrans Set\ language\ to\ "en_gb"		Angleški\ "en_gb"
-    menutrans Set\ language\ to\ "en_nz"		Angleški\ "en_nz"
-    menutrans Set\ language\ to\ "en_us"		Angleški\ "en_us"
-    menutrans Set\ language\ to\ "sl"			Slovenski\ "sl"
-    menutrans Set\ language\ to\ "de"			Nemški\ "de"
+    menutrans Set\ language\ to\ "en"			Èrkovalnik:\ angleški\ "en"
+    menutrans Set\ language\ to\ "en_au"		Èrkovalnik:\ angleški\ "en_au"
+    menutrans Set\ language\ to\ "en_ca"		Èrkovalnik:\ angleški\ "en_ca"
+    menutrans Set\ language\ to\ "en_gb"		Èrkovalnik:\ angleški\ "en_gb"
+    menutrans Set\ language\ to\ "en_nz"		Èrkovalnik:\ angleški\ "en_nz"
+    menutrans Set\ language\ to\ "en_us"		Èrkovalnik:\ angleški\ "en_us"
+    menutrans Set\ language\ to\ "sl"			Èrkovalnik:\ slovenski\ "sl"
+    menutrans Set\ language\ to\ "de"			Èrkovalnik:\ nemški\ "de"
     menutrans Set\ language\ to\ 			Èrkovalnik:\
     menutrans &Find\ More\ Languages			&Ostali\ jeziki
 endif
 if has("folding")
-  menutrans &Folding					Zvijanje\ kode
+  menutrans &Folding					Zavihek
   " open close folds
-  menutrans &Enable/Disable\ folds<Tab>zi		Omogoèi/onemogoèi\ zvijanje<Tab>zi " Omogoèi/onemogoèi\ zavihke
-  menutrans &View\ Cursor\ Line<Tab>zv			Pokaži\ vrstico\ s\ kazalèkom<Tab>zv " kjer je kazalec
-  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Pokaži\ samo\ vrstico\ s\ kazalèkom<Tab>zMzx
-  menutrans C&lose\ more\ folds<Tab>zm			Zvij\ naslednji\ nivo<Tab>zm " Zapri\ veè\ zavihkov
-  menutrans &Close\ all\ folds<Tab>zM			Zvij\ vso\ kodo<Tab>zM " Zapri\ vse\ zavihke
-  menutrans O&pen\ more\ folds<Tab>zr			Razvij\ en\ nivo<Tab>zr " Odpri\ veè\ zavihkov
-  menutrans &Open\ all\ folds<Tab>zR			Razvij\ vso\ kodo<Tab>zR " Odpri\ vse\ zavihke
+  menutrans &Enable/Disable\ folds<Tab>zi		Omogoèi/onemogoèi\ zavihke<Tab>zi
+  menutrans &View\ Cursor\ Line<Tab>zv			Pokaži\ vrstico\ s\ kazalcem<Tab>zv " kjer je kazalec
+  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Pokaži\ samo\ vrstico\ s\ kazalcem<Tab>zMzx
+  menutrans C&lose\ more\ folds<Tab>zm			Zapri\ veè\ zavihkov<Tab>zm
+  menutrans &Close\ all\ folds<Tab>zM			Zapri\ vse\ zavihke<Tab>zM
+  menutrans O&pen\ more\ folds<Tab>zr			Odpri\ veè\ zavihkov<Tab>zr
+  menutrans &Open\ all\ folds<Tab>zR			Odpri\ vse\ zavihke<Tab>zR
   " fold method
-  menutrans Fold\ Met&hod				Kriterij\ za\ zvijanje " Ustvarjanje\ zavihkov
+  menutrans Fold\ Met&hod				Ustvarjanje\ zavihkov
   menutrans M&anual					&Roèno
   menutrans I&ndent					Glede\ na\ &poravnavo
   menutrans E&xpression					Z\ &izrazi\ (foldexpr)
@@ -144,17 +145,17 @@ if has("folding")
   menutrans Ma&rker					Z\ &markerji/oznaèbami
   " create and delete folds
   " TODO accelerators
-  menutrans Create\ &Fold<Tab>zf			Ustvari\ zvitek<Tab>zf
-  menutrans &Delete\ Fold<Tab>zd			Izbriši\ zvitek<Tab>zd
-  menutrans Delete\ &All\ Folds<Tab>zD			Izbriši\ vse\ zvitke<Tab>zD
+  menutrans Create\ &Fold<Tab>zf			Ustvari\ zavihek<Tab>zf
+  menutrans &Delete\ Fold<Tab>zd			Izbriši\ zavihek<Tab>zd
+  menutrans Delete\ &All\ Folds<Tab>zD			Izbriši\ vse\ zavihke<Tab>zD
   " moving around in folds
-  menutrans Fold\ column\ &width			Širina\ drevesa\ z\ zvitki
+  menutrans Fold\ column\ &width			Širina\ stolpca\ z\ zavihkom
 endif  " has folding
 
 if has("diff")
   menutrans &Diff					Razlike\ (&Diff)
   menutrans &Update					&Posodobi<Tab>
-  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " XXX: check if translation is OK
+  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " TODO: check if translation is OK
   menutrans &Put\ Block					&Pošlji\ (spremeni\ drugo\ okno)
 endif
 
@@ -251,7 +252,7 @@ menutrans Select\ &Sentence		Izberi\ &stavek
 menutrans Select\ Pa&ragraph		Izberi\ &odstavek
 menutrans Select\ &Line			Izberi\ vrs&tico
 menutrans Select\ &Block		Izberi\ b&lok
-menutrans &Select\ All<Tab>ggVG		Izberi\ &vse<Tab>ggVG
+menutrans Select\ &All			Izberi\ &vse
 " }}} POPUP
 
 " {{{ TOOLBAR

runtime/lang/menu_sl_si.latin2.vim

@@ -3,6 +3,7 @@
 " Originally By:	Mojca Miklavec <mojca.miklavec.lists@gmail.com>
 " Last Change:		2020 Apr 23
 " vim:set foldmethod=marker tabstop=8:
+" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT
 
 " TODO: add/check all '&'s
 

runtime/lang/menu_sl_si.utf-8.vim

@@ -1,8 +1,9 @@
 " Menu Translations:	Slovenian / Slovensko
 " Maintainer:		Mojca Miklavec <mojca.miklavec.lists@gmail.com>
 " Originally By:	Mojca Miklavec <mojca.miklavec.lists@gmail.com>
-" Last Change:		2016 Oct 17
+" Last Change:		2020 Apr 23
 " vim:set foldmethod=marker tabstop=8:
+" Original translations
 
 " TODO: add/check all '&'s
 
@@ -113,29 +114,29 @@ if has("spell")
     menutrans To\ &Previous\ error<Tab>[s		K\ &prejšnji\ napaki<Tab>[s
     menutrans Suggest\ &Corrections<Tab>z=		Predlagaj\ popravek<Tab>z=
     menutrans &Repeat\ correction<Tab>:spellrepall	Po&novi\ popravke\ na\ vseh\ besedah<Tab>:spellrepall
-    menutrans Set\ language\ to\ "en"			Angleški\ "en"
-    menutrans Set\ language\ to\ "en_au"		Angleški\ "en_au"
-    menutrans Set\ language\ to\ "en_ca"		Angleški\ "en_ca"
-    menutrans Set\ language\ to\ "en_gb"		Angleški\ "en_gb"
-    menutrans Set\ language\ to\ "en_nz"		Angleški\ "en_nz"
-    menutrans Set\ language\ to\ "en_us"		Angleški\ "en_us"
-    menutrans Set\ language\ to\ "sl"			Slovenski\ "sl"
-    menutrans Set\ language\ to\ "de"			Nemški\ "de"
+    menutrans Set\ language\ to\ "en"			Črkovalnik:\ angleški\ "en"
+    menutrans Set\ language\ to\ "en_au"		Črkovalnik:\ angleški\ "en_au"
+    menutrans Set\ language\ to\ "en_ca"		Črkovalnik:\ angleški\ "en_ca"
+    menutrans Set\ language\ to\ "en_gb"		Črkovalnik:\ angleški\ "en_gb"
+    menutrans Set\ language\ to\ "en_nz"		Črkovalnik:\ angleški\ "en_nz"
+    menutrans Set\ language\ to\ "en_us"		Črkovalnik:\ angleški\ "en_us"
+    menutrans Set\ language\ to\ "sl"			Črkovalnik:\ slovenski\ "sl"
+    menutrans Set\ language\ to\ "de"			Črkovalnik:\ nemški\ "de"
     menutrans Set\ language\ to\ 			Črkovalnik:\
     menutrans &Find\ More\ Languages			&Ostali\ jeziki
 endif
 if has("folding")
-  menutrans &Folding					Zvijanje\ kode
+  menutrans &Folding					Zavihek
   " open close folds
-  menutrans &Enable/Disable\ folds<Tab>zi		Omogoči/onemogoči\ zvijanje<Tab>zi " Omogoči/onemogoči\ zavihke
-  menutrans &View\ Cursor\ Line<Tab>zv			Pokaži\ vrstico\ s\ kazalčkom<Tab>zv " kjer je kazalec
-  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Pokaži\ samo\ vrstico\ s\ kazalčkom<Tab>zMzx
-  menutrans C&lose\ more\ folds<Tab>zm			Zvij\ naslednji\ nivo<Tab>zm " Zapri\ več\ zavihkov
-  menutrans &Close\ all\ folds<Tab>zM			Zvij\ vso\ kodo<Tab>zM " Zapri\ vse\ zavihke
-  menutrans O&pen\ more\ folds<Tab>zr			Razvij\ en\ nivo<Tab>zr " Odpri\ več\ zavihkov
-  menutrans &Open\ all\ folds<Tab>zR			Razvij\ vso\ kodo<Tab>zR " Odpri\ vse\ zavihke
+  menutrans &Enable/Disable\ folds<Tab>zi		Omogoči/onemogoči\ zavihke<Tab>zi
+  menutrans &View\ Cursor\ Line<Tab>zv			Pokaži\ vrstico\ s\ kazalcem<Tab>zv " kjer je kazalec
+  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Pokaži\ samo\ vrstico\ s\ kazalcem<Tab>zMzx
+  menutrans C&lose\ more\ folds<Tab>zm			Zapri\ več\ zavihkov<Tab>zm
+  menutrans &Close\ all\ folds<Tab>zM			Zapri\ vse\ zavihke<Tab>zM
+  menutrans O&pen\ more\ folds<Tab>zr			Odpri\ več\ zavihkov<Tab>zr
+  menutrans &Open\ all\ folds<Tab>zR			Odpri\ vse\ zavihke<Tab>zR
   " fold method
-  menutrans Fold\ Met&hod				Kriterij\ za\ zvijanje " Ustvarjanje\ zavihkov
+  menutrans Fold\ Met&hod				Ustvarjanje\ zavihkov
   menutrans M&anual					&Ročno
   menutrans I&ndent					Glede\ na\ &poravnavo
   menutrans E&xpression					Z\ &izrazi\ (foldexpr)
@@ -144,17 +145,17 @@ if has("folding")
   menutrans Ma&rker					Z\ &markerji/označbami
   " create and delete folds
   " TODO accelerators
-  menutrans Create\ &Fold<Tab>zf			Ustvari\ zvitek<Tab>zf
-  menutrans &Delete\ Fold<Tab>zd			Izbriši\ zvitek<Tab>zd
-  menutrans Delete\ &All\ Folds<Tab>zD			Izbriši\ vse\ zvitke<Tab>zD
+  menutrans Create\ &Fold<Tab>zf			Ustvari\ zavihek<Tab>zf
+  menutrans &Delete\ Fold<Tab>zd			Izbriši\ zavihek<Tab>zd
+  menutrans Delete\ &All\ Folds<Tab>zD			Izbriši\ vse\ zavihke<Tab>zD
   " moving around in folds
-  menutrans Fold\ column\ &width			Širina\ drevesa\ z\ zvitki
+  menutrans Fold\ column\ &width			Širina\ stolpca\ z\ zavihkom
 endif  " has folding
 
 if has("diff")
   menutrans &Diff					Razlike\ (&Diff)
   menutrans &Update					&Posodobi<Tab>
-  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " XXX: check if translation is OK
+  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " TODO: check if translation is OK
   menutrans &Put\ Block					&Pošlji\ (spremeni\ drugo\ okno)
 endif
 
@@ -251,7 +252,7 @@ menutrans Select\ &Sentence		Izberi\ &stavek
 menutrans Select\ Pa&ragraph		Izberi\ &odstavek
 menutrans Select\ &Line			Izberi\ vrs&tico
 menutrans Select\ &Block		Izberi\ b&lok
-menutrans &Select\ All<Tab>ggVG		Izberi\ &vse<Tab>ggVG
+menutrans Select\ &All			Izberi\ &vse
 " }}} POPUP
 
 " {{{ TOOLBAR

runtime/lang/menu_slovak_slovak_republic.1250.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Slovak
 " Translated By:	Martin Lacko <lacko@host.sk>
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_sr_rs.ascii.vim

@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: Ivan Pesic on 2017-12-28 12:05+0400
+" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -11,6 +12,8 @@ let did_menu_trans = 1
 let s:keepcpo= &cpo
 set cpo&vim
 
+scriptencoding latin1
+
 " Help menu
 menutrans &Help		      Pomo&c
 menutrans &Overview<Tab><F1>  &Pregled<Tab><F1>
@@ -25,11 +28,11 @@ menutrans &Version	      &Verzija
 menutrans &About	      &O\ programu
 
 " File menu
-menutrans &File			    &Datoteka
+menutrans &File			    &Fajl
 menutrans &Open\.\.\.<Tab>:e	    &Otvori\.\.\.<Tab>:e
 menutrans Sp&lit-Open\.\.\.<Tab>:sp &Podeli-otvori\.\.\.<Tab>:sp
 menutrans Open\ Tab\.\.\.<Tab>:tabnew	Otvori\ karticu\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew	    &Nova<Tab>:enew
+menutrans &New<Tab>:enew	    &Nov<Tab>:enew
 menutrans &Close<Tab>:close	    &Zatvori<Tab>:close
 menutrans &Save<Tab>:w		    &Sacuvaj<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav  Sacuvaj\ &kao\.\.\.<Tab>:sav
@@ -41,14 +44,14 @@ menutrans E&xit<Tab>:qa		    K&raj<Tab>:qa
 
 " Edit menu
 menutrans &Edit			 &Uredjivanje
-menutrans &Undo<Tab>u		 &Vrati<Tab>u
-menutrans &Redo<Tab>^R		 &Povrati<Tab>^R
+menutrans &Undo<Tab>u		 &Ponisti<Tab>u
+menutrans &Redo<Tab>^R		 &Vrati\ izmenu<Tab>^R
 menutrans Rep&eat<Tab>\.	 P&onovi<Tab>\.
 menutrans Cu&t<Tab>"+x		 Ise&ci<Tab>"+x
 menutrans &Copy<Tab>"+y		 &Kopiraj<Tab>"+y
 menutrans &Paste<Tab>"+gP	 &Ubaci<Tab>"+gP
-menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+gP
-menutrans Put\ &Before<Tab>[p	 Stavi\ pre&d<Tab>[p
+menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+P
+menutrans Put\ &Before<Tab>[p	 Stavi\ ispre&d<Tab>[p
 menutrans Put\ &After<Tab>]p	 Stavi\ &iza<Tab>]p
 menutrans &Delete<Tab>x		 Iz&brisi<Tab>x
 menutrans &Select\ all<Tab>ggVG  Izaberi\ sv&e<Tab>ggVG
@@ -57,11 +60,11 @@ menutrans Find\ and\ Rep&lace\.\.\. Nadji\ i\ &zameni\.\.\.
 menutrans Settings\ &Window	 P&rozor\ podesavanja
 menutrans Startup\ &Settings	 Po&desavanja\ pri\ pokretanju		
 menutrans &Global\ Settings	 Op&sta\ podesavanja
-menutrans F&ile\ Settings	 Podesavanja\ za\ da&toteke
-menutrans &Shiftwidth		 &Pomeraj
+menutrans F&ile\ Settings	 Podesavanja\ za\ faj&love
+menutrans &Shiftwidth		 &Korak\ uvlacenja
 menutrans Soft\ &Tabstop	 &Meka\ tabulacija
 menutrans Te&xt\ Width\.\.\.	 &Sirina\ teksta\.\.\.
-menutrans &File\ Format\.\.\.	 &Vrsta\ datoteke\.\.\.
+menutrans &File\ Format\.\.\.	 &Vrsta\ fajla\.\.\.
 menutrans Show\ C&olor\ Schemes\ in\ Menu	Prikazi\ seme\ bo&ja\ u\ meniju
 menutrans C&olor\ Scheme	\Seme\ bo&ja
 menutrans Show\ &Keymaps\ in\ Menu	Prikazi\ pres&likavanja\ tastature\ u\ meniju
@@ -69,15 +72,15 @@ menutrans &Keymap	Pres&likavanja\ tastature
 menutrans Select\ Fo&nt\.\.\.	 Izbor\ &fonta\.\.\.
 
 " Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Naglasi\ &obrazce\ (da/ne)<Tab>:set\ hls!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Isticanje\ &sablona\ (da/ne)<Tab>:set\ hls!
 menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! Zanemari\ velicinu\ &slova\ (da/ne)<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Proveri\ pratecu\ &zagradu\ (da/ne)<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Prikazi\ uparenu\ &zagradu\ (da/ne)<Tab>:set\ sm!
 menutrans &Context\ lines  Vidljivi\ &redovi
 menutrans &Virtual\ Edit   Virtuelno\ &uredjivanje
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Rezim\ u&nosa\ (da/ne)<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Rezim\ U&metanje\ (da/ne)<Tab>:set\ im!
 menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!     '&Vi'\ saglasno\ (da/ne)<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\. Putanja\ &pretrage\.\.\.
-menutrans Ta&g\ Files\.\.\.   &Datoteke\ oznaka\.\.\.
+menutrans Ta&g\ Files\.\.\.   &Fajlovi\ oznaka\.\.\.
 menutrans Toggle\ &Toolbar    Linija\ sa\ &alatkama\ (da/ne)
 menutrans Toggle\ &Bottom\ Scrollbar   Donja\ l&inija\ klizanja\ (da/ne)
 menutrans Toggle\ &Left\ Scrollbar  &Leva\ linija\ klizanja\ (da/ne)
@@ -86,8 +89,8 @@ menutrans Toggle\ &Right\ Scrollbar &Desna\ linija\ klizanja\ (da/ne)
 " Edit/Global Settings/Virtual Edit
 menutrans Never		      Nikad
 menutrans Block\ Selection    Izbor\ bloka
-menutrans Insert\ mode	      Rezim\ unosa
-menutrans Block\ and\ Insert  Blok\ i\ unos
+menutrans Insert\ mode	      Rezim\ Umetanje
+menutrans Block\ and\ Insert  Blok\ i\ Umetanje
 menutrans Always	      Uvek
 
 " Edit/File Settings
@@ -107,13 +110,13 @@ menutrans None Bez\ preslikavanja
 menutrans &Tools	&Alatke
 menutrans &Jump\ to\ this\ tag<Tab>g^] Skoci\ na\ &ovu\ oznaku<Tab>g^]
 menutrans Jump\ &back<Tab>^T	 Skoci\ &natrag<Tab>^T
-menutrans Build\ &Tags\ File	 Izgradi\ &datoteku\ oznaka
+menutrans Build\ &Tags\ File	 Izgradi\ &fajl\ oznaka
 menutrans &Spelling	 Pra&vopis
 menutrans &Folding	      &Podvijanje
-menutrans Create\ &Fold<Tab>zf		  S&tvori\ podvijutak<Tab>zf
-menutrans &Delete\ Fold<Tab>zd		  O&brisi\ podvijutak<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	  Obrisi\ sve\ po&dvijutke<Tab>zD
-menutrans Fold\ column\ &width		  Sirina\ &reda\ podvijutka
+menutrans Create\ &Fold<Tab>zf		  S&tvori\ svijutak<Tab>zf
+menutrans &Delete\ Fold<Tab>zd		  O&brisi\ svijutak<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD	  Obrisi\ sve\ sv&ijutke<Tab>zD
+menutrans Fold\ column\ &width		  Sirina\ &reda\ cvijutka
 "menutrans &Diff		      &Uporedjivanje
 menutrans &Make<Tab>:make     'mak&e'<Tab>:make
 menutrans &List\ Errors<Tab>:cl     Spisak\ &gresaka<Tab>:cl
@@ -144,15 +147,15 @@ menutrans Set\ Language\ to\ "en_us" 	Postavi\ jezik\ na\ "en_us"
 menutrans &Find\ More\ Languages	Pronadji\ jos\ jezika 
 
 " Tools/Folding
-menutrans &Enable/Disable\ folds<Tab>zi   &Omoguci/prekini\ podvijanje<Tab>zi
+menutrans &Enable/Disable\ folds<Tab>zi   &Omoguci/prekini\ svijanje<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv	  &Pokazi\ red\ sa\ kursorom<Tab>zv
 menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx Pokazi\ &samo\ red\ sa\ kursorom<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vise\ podvijutaka<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ podvijutke<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vis&e\ podvijutaka<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ podvijutke<Tab>zR
+menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vise\ svijutaka<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ svijutke<Tab>zM
+menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vis&e\ svijutaka<Tab>zr
+menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ svijutke<Tab>zR
 menutrans Fold\ Met&hod		       &Nacin\ podvijanja
-menutrans Fold\ Col&umn\ Width	Sirina\ kolone\ ispred\ podvijutaka
+menutrans Fold\ Col&umn\ Width	Sirina\ kolone\ ispred\ svijutaka
 
 " Tools/Folding/Fold Method
 menutrans M&anual	&Rucno
@@ -179,7 +182,7 @@ menutrans Delete	   &Obrisi
 menutrans &Alternate	   A&lternativni
 menutrans &Next		   &Sledeci
 menutrans &Previous	   &Prethodni
-menutrans [No\ File]	   [Nema\ datoteke]
+menutrans [No\ File]	   [Nema\ fajla]
 
 " Window menu
 menutrans &Window		    &Prozor
@@ -187,7 +190,7 @@ menutrans &New<Tab>^Wn		    &Novi<Tab>^Wn
 menutrans S&plit<Tab>^Ws	    &Podeli<Tab>^Ws
 menutrans Sp&lit\ To\ #<Tab>^W^^    Podeli\ sa\ &alternativnim<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv   Podeli\ &uspravno<Tab>^Wv
-menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &datoteka
+menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &fajlova
 menutrans &Close<Tab>^Wc	    &Zatvori<Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo  Zatvori\ &ostale<Tab>^Wo
 "menutrans Ne&xt<Tab>^Ww       &Sledeci<Tab>^Ww
@@ -208,7 +211,7 @@ menutrans &Left\ side<Tab>^WH	 U&levo<Tab>^WH
 menutrans &Right\ side<Tab>^WL	 U&desno<Tab>^WL
 
 " The popup menu
-menutrans &Undo		      &Vrati
+menutrans &Undo		      &Ponisti
 menutrans Cu&t		      &Iseci
 menutrans &Copy		      &Kopiraj
 menutrans &Paste	      &Ubaci
@@ -216,7 +219,7 @@ menutrans &Delete	      I&zbrisi
 menutrans Select\ Blockwise   Biraj\ b&lokovski
 menutrans Select\ &Word       Izaberi\ &rec
 menutrans Select\ &Sentence       Izaberi\ r&ecenicu
-menutrans Select\ Pa&ragraph       Izaberi\ &paragraf
+menutrans Select\ Pa&ragraph       Izaberi\ &pasus
 menutrans Select\ &Line       Izaberi\ r&ed
 menutrans Select\ &Block      Izaberi\ &blok
 menutrans Select\ &All	      Izaberi\ &sve
@@ -262,13 +265,13 @@ endif
 
 " Syntax menu
 menutrans &Syntax &Sintaksa
-menutrans &Show\ File\ Types\ in\ Menu  Prikazi\ tipove\ datoteka\ u\ &meniju
+menutrans &Show\ File\ Types\ in\ Menu  Prikazi\ tipove\ fajlova\ u\ &meniju
 menutrans Set\ '&syntax'\ only   Pode&si\ samo\ 'syntax' 
 menutrans Set\ '&filetype'\ too  Podesi\ &takodje\ i\ 'filetype'
 menutrans &Off       &Iskljuceno
 menutrans &Manual    &Rucno
 menutrans A&utomatic    &Automatski
-menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovu\ &datoteku
+menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovaj\ &fajl
 menutrans Co&lor\ test     Provera\ &boja
 menutrans &Highlight\ test Provera\ isti&canja
 menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
@@ -276,17 +279,17 @@ menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
 " dialog texts
 let menutrans_help_dialog = "Unesite naredbu ili rec cije pojasnjenje trazite:\n\nDodajte i_ za naredbe unosa (npr. i_CTRL-X)\nDodajte c_ za naredbe komandnog rezima (npr. s_<Del>)\nDodajte ' za imena opcija (npr. 'shiftwidth')"
 
-let g:menutrans_path_dialog = "Unesite put pretrage za datoteke\nRazdvojite zarezima imena direktorijuma."
+let g:menutrans_path_dialog = "Unesite putanju pretrage za fajlove\nRazdvojite zarezima imena direktorijuma."
 
-let g:menutrans_tags_dialog = "Unesite imena datoteka sa oznakama\nRazdvojite zarezima imena."
+let g:menutrans_tags_dialog = "Unesite imena fajlova sa oznakama\nRazdvojite zarezima imena."
 
 let g:menutrans_textwidth_dialog = "Unesite novu sirinu teksta (0 sprecava prelom)"
 
-let g:menutrans_fileformat_dialog = "Izaberite format zapisa datoteke"
+let g:menutrans_fileformat_dialog = "Izaberite format zapisa fajla"
 
 let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Otkazi"
 
-let menutrans_no_file = "[Nema datoteke]"
+let menutrans_no_file = "[Nema fajla]"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo

runtime/lang/menu_sr_rs.iso_8859-2.vim

@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: Ivan Pe¹iæ on 2017-12-28 12:05+0400
+" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -27,11 +28,11 @@ menutrans &Version	      &Verzija
 menutrans &About	      &O\ programu
 
 " File menu
-menutrans &File			    &Datoteka
+menutrans &File			    &Fajl
 menutrans &Open\.\.\.<Tab>:e	    &Otvori\.\.\.<Tab>:e
 menutrans Sp&lit-Open\.\.\.<Tab>:sp &Podeli-otvori\.\.\.<Tab>:sp
 menutrans Open\ Tab\.\.\.<Tab>:tabnew	Otvori\ karticu\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew	    &Nova<Tab>:enew
+menutrans &New<Tab>:enew	    &Nov<Tab>:enew
 menutrans &Close<Tab>:close	    &Zatvori<Tab>:close
 menutrans &Save<Tab>:w		    &Saèuvaj<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav  Saèuvaj\ &kao\.\.\.<Tab>:sav
@@ -43,14 +44,14 @@ menutrans E&xit<Tab>:qa		    K&raj<Tab>:qa
 
 " Edit menu
 menutrans &Edit			 &Ureðivanje
-menutrans &Undo<Tab>u		 &Vrati<Tab>u
-menutrans &Redo<Tab>^R		 &Povrati<Tab>^R
+menutrans &Undo<Tab>u		 &Poni¹ti<Tab>u
+menutrans &Redo<Tab>^R		 &Vrati\ izmenu<Tab>^R
 menutrans Rep&eat<Tab>\.	 P&onovi<Tab>\.
 menutrans Cu&t<Tab>"+x		 Ise&ci<Tab>"+x
 menutrans &Copy<Tab>"+y		 &Kopiraj<Tab>"+y
 menutrans &Paste<Tab>"+gP	 &Ubaci<Tab>"+gP
-menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+gP
-menutrans Put\ &Before<Tab>[p	 Stavi\ pre&d<Tab>[p
+menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+P
+menutrans Put\ &Before<Tab>[p	 Stavi\ ispre&d<Tab>[p
 menutrans Put\ &After<Tab>]p	 Stavi\ &iza<Tab>]p
 menutrans &Delete<Tab>x		 Iz&bri¹i<Tab>x
 menutrans &Select\ all<Tab>ggVG  Izaberi\ sv&e<Tab>ggVG
@@ -59,11 +60,11 @@ menutrans Find\ and\ Rep&lace\.\.\. Na
 menutrans Settings\ &Window	 P&rozor\ pode¹avanja
 menutrans Startup\ &Settings	 Po&de¹avanja\ pri\ pokretanju		
 menutrans &Global\ Settings	 Op&¹ta\ pode¹avanja
-menutrans F&ile\ Settings	 Pode¹avanja\ za\ da&toteke
-menutrans &Shiftwidth		 &Pomeraj
+menutrans F&ile\ Settings	 Pode¹avanja\ za\ faj&love
+menutrans &Shiftwidth		 &Korak\ uvlaèenja
 menutrans Soft\ &Tabstop	 &Meka\ tabulacija
 menutrans Te&xt\ Width\.\.\.	 &©irina\ teksta\.\.\.
-menutrans &File\ Format\.\.\.	 &Vrsta\ datoteke\.\.\.
+menutrans &File\ Format\.\.\.	 &Vrsta\ fajla\.\.\.
 menutrans Show\ C&olor\ Schemes\ in\ Menu	Prika¾i\ ¹eme\ bo&ja\ u\ meniju
 menutrans C&olor\ Scheme	\©eme\ bo&ja
 menutrans Show\ &Keymaps\ in\ Menu	Prika¾i\ pres&likavanja\ tastature\ u\ meniju
@@ -71,15 +72,15 @@ menutrans &Keymap	Pres&likavanja\ tastature
 menutrans Select\ Fo&nt\.\.\.	 Izbor\ &fonta\.\.\.
 
 " Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Naglasi\ &obrazce\ (da/ne)<Tab>:set\ hls!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Isticanje\ &¹ablona\ (da/ne)<Tab>:set\ hls!
 menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! Zanemari\ velièinu\ &slova\ (da/ne)<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Proveri\ prateæu\ &zagradu\ (da/ne)<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Prika¾i\ uparenu\ &zagradu\ (da/ne)<Tab>:set\ sm!
 menutrans &Context\ lines  Vidljivi\ &redovi
 menutrans &Virtual\ Edit   Virtuelno\ &ureðivanje
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Re¾im\ u&nosa\ (da/ne)<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Re¾im\ U&metanje\ (da/ne)<Tab>:set\ im!
 menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!     '&Vi'\ saglasno\ (da/ne)<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\. Putanja\ &pretrage\.\.\.
-menutrans Ta&g\ Files\.\.\.   &Datoteke\ oznaka\.\.\.
+menutrans Ta&g\ Files\.\.\.   &Fajlovi\ oznaka\.\.\.
 menutrans Toggle\ &Toolbar    Linija\ sa\ &alatkama\ (da/ne)
 menutrans Toggle\ &Bottom\ Scrollbar   Donja\ l&inija\ klizanja\ (da/ne)
 menutrans Toggle\ &Left\ Scrollbar  &Leva\ linija\ klizanja\ (da/ne)
@@ -88,8 +89,8 @@ menutrans Toggle\ &Right\ Scrollbar &Desna\ linija\ klizanja\ (da/ne)
 " Edit/Global Settings/Virtual Edit
 menutrans Never		      Nikad
 menutrans Block\ Selection    Izbor\ bloka
-menutrans Insert\ mode	      Re¾im\ unosa
-menutrans Block\ and\ Insert  Blok\ i\ unos
+menutrans Insert\ mode	      Re¾im\ Umetanje
+menutrans Block\ and\ Insert  Blok\ i\ Umetanje
 menutrans Always	      Uvek
 
 " Edit/File Settings
@@ -109,13 +110,13 @@ menutrans None Bez\ preslikavanja
 menutrans &Tools	&Alatke
 menutrans &Jump\ to\ this\ tag<Tab>g^] Skoèi\ na\ &ovu\ oznaku<Tab>g^]
 menutrans Jump\ &back<Tab>^T	 Skoèi\ &natrag<Tab>^T
-menutrans Build\ &Tags\ File	 Izgradi\ &datoteku\ oznaka
+menutrans Build\ &Tags\ File	 Izgradi\ &fajl\ oznaka
 menutrans &Spelling	 Pra&vopis
 menutrans &Folding	      &Podvijanje
-menutrans Create\ &Fold<Tab>zf		  S&tvori\ podvijutak<Tab>zf
-menutrans &Delete\ Fold<Tab>zd		  O&bri¹i\ podvijutak<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	  Obri¹i\ sve\ po&dvijutke<Tab>zD
-menutrans Fold\ column\ &width		  ©irina\ &reda\ podvijutka
+menutrans Create\ &Fold<Tab>zf		  S&tvori\ svijutak<Tab>zf
+menutrans &Delete\ Fold<Tab>zd		  O&bri¹i\ svijutak<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD	  Obri¹i\ sve\ sv&ijutke<Tab>zD
+menutrans Fold\ column\ &width		  ©irina\ &reda\ cvijutka
 "menutrans &Diff		      &Uporeðivanje
 menutrans &Make<Tab>:make     'mak&e'<Tab>:make
 menutrans &List\ Errors<Tab>:cl     Spisak\ &gre¹aka<Tab>:cl
@@ -146,15 +147,15 @@ menutrans Set\ Language\ to\ "en_us" 	Postavi\ jezik\ na\ "en_us"
 menutrans &Find\ More\ Languages	Pronaði\ jo¹\ jezika 
 
 " Tools/Folding
-menutrans &Enable/Disable\ folds<Tab>zi   &Omoguæi/prekini\ podvijanje<Tab>zi
+menutrans &Enable/Disable\ folds<Tab>zi   &Omoguæi/prekini\ svijanje<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv	  &Poka¾i\ red\ sa\ kursorom<Tab>zv
 menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx Poka¾i\ &samo\ red\ sa\ kursorom<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vi¹e\ podvijutaka<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ podvijutke<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vi¹&e\ podvijutaka<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ podvijutke<Tab>zR
+menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vi¹e\ svijutaka<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ svijutke<Tab>zM
+menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vi¹&e\ svijutaka<Tab>zr
+menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ svijutke<Tab>zR
 menutrans Fold\ Met&hod		       &Naèin\ podvijanja
-menutrans Fold\ Col&umn\ Width	©irina\ kolone\ ispred\ podvijutaka
+menutrans Fold\ Col&umn\ Width	©irina\ kolone\ ispred\ svijutaka
 
 " Tools/Folding/Fold Method
 menutrans M&anual	&Ruèno
@@ -181,7 +182,7 @@ menutrans Delete	   &Obri
 menutrans &Alternate	   A&lternativni
 menutrans &Next		   &Sledeæi
 menutrans &Previous	   &Prethodni
-menutrans [No\ File]	   [Nema\ datoteke]
+menutrans [No\ File]	   [Nema\ fajla]
 
 " Window menu
 menutrans &Window		    &Prozor
@@ -189,7 +190,7 @@ menutrans &New<Tab>^Wn		    &Novi<Tab>^Wn
 menutrans S&plit<Tab>^Ws	    &Podeli<Tab>^Ws
 menutrans Sp&lit\ To\ #<Tab>^W^^    Podeli\ sa\ &alternativnim<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv   Podeli\ &uspravno<Tab>^Wv
-menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &datoteka
+menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &fajlova
 menutrans &Close<Tab>^Wc	    &Zatvori<Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo  Zatvori\ &ostale<Tab>^Wo
 "menutrans Ne&xt<Tab>^Ww       &Sledeæi<Tab>^Ww
@@ -210,7 +211,7 @@ menutrans &Left\ side<Tab>^WH	 U&levo<Tab>^WH
 menutrans &Right\ side<Tab>^WL	 U&desno<Tab>^WL
 
 " The popup menu
-menutrans &Undo		      &Vrati
+menutrans &Undo		      &Poni¹ti
 menutrans Cu&t		      &Iseci
 menutrans &Copy		      &Kopiraj
 menutrans &Paste	      &Ubaci
@@ -218,7 +219,7 @@ menutrans &Delete	      I&zbri
 menutrans Select\ Blockwise   Biraj\ b&lokovski
 menutrans Select\ &Word       Izaberi\ &reè
 menutrans Select\ &Sentence       Izaberi\ r&eèenicu
-menutrans Select\ Pa&ragraph       Izaberi\ &paragraf
+menutrans Select\ Pa&ragraph       Izaberi\ &pasus
 menutrans Select\ &Line       Izaberi\ r&ed
 menutrans Select\ &Block      Izaberi\ &blok
 menutrans Select\ &All	      Izaberi\ &sve
@@ -264,13 +265,13 @@ endif
 
 " Syntax menu
 menutrans &Syntax &Sintaksa
-menutrans &Show\ File\ Types\ in\ Menu  Prika¾i\ tipove\ datoteka\ u\ &meniju
+menutrans &Show\ File\ Types\ in\ Menu  Prika¾i\ tipove\ fajlova\ u\ &meniju
 menutrans Set\ '&syntax'\ only   Pode&si\ samo\ 'syntax' 
 menutrans Set\ '&filetype'\ too  Podesi\ &takoðe\ i\ 'filetype'
 menutrans &Off       &Iskljuèeno
 menutrans &Manual    &Ruèno
 menutrans A&utomatic    &Automatski
-menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovu\ &datoteku
+menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovaj\ &fajl
 menutrans Co&lor\ test     Provera\ &boja
 menutrans &Highlight\ test Provera\ isti&canja
 menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
@@ -278,17 +279,17 @@ menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
 " dialog texts
 let menutrans_help_dialog = "Unesite naredbu ili reè èije poja¹njenje tra¾ite:\n\nDodajte i_ za naredbe unosa (npr. i_CTRL-X)\nDodajte c_ za naredbe komandnog re¾ima (npr. s_<Del>)\nDodajte ' za imena opcija (npr. 'shiftwidth')"
 
-let g:menutrans_path_dialog = "Unesite put pretrage za datoteke\nRazdvojite zarezima imena direktorijuma."
+let g:menutrans_path_dialog = "Unesite putanju pretrage za fajlove\nRazdvojite zarezima imena direktorijuma."
 
-let g:menutrans_tags_dialog = "Unesite imena datoteka sa oznakama\nRazdvojite zarezima imena."
+let g:menutrans_tags_dialog = "Unesite imena fajlova sa oznakama\nRazdvojite zarezima imena."
 
 let g:menutrans_textwidth_dialog = "Unesite novu ¹irinu teksta (0 spreèava prelom)"
 
-let g:menutrans_fileformat_dialog = "Izaberite format zapisa datoteke"
+let g:menutrans_fileformat_dialog = "Izaberite format zapisa fajla"
 
 let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Otka¾i"
 
-let menutrans_no_file = "[Nema datoteke]"
+let menutrans_no_file = "[Nema fajla]"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo

runtime/lang/menu_sr_rs.iso_8859-5.vim

@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: ¸ÒÐÝ ¿ÕèØû on 2017-12-28 12:05+0400
+" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -27,11 +28,11 @@ menutrans &Version	      &
 menutrans &About	      &¾\ ßàÞÓàÐÜã
 
 " File menu
-menutrans &File			    &´ÐâÞâÕÚÐ
+menutrans &File			    &ÄÐøÛ
 menutrans &Open\.\.\.<Tab>:e	    &¾âÒÞàØ\.\.\.<Tab>:e
 menutrans Sp&lit-Open\.\.\.<Tab>:sp &¿ÞÔÕÛØ-ÞâÒÞàØ\.\.\.<Tab>:sp
 menutrans Open\ Tab\.\.\.<Tab>:tabnew	¾âÒÞàØ\ ÚÐàâØæã\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew	    &½ÞÒÐ<Tab>:enew
+menutrans &New<Tab>:enew	    &½ÞÒ<Tab>:enew
 menutrans &Close<Tab>:close	    &·ÐâÒÞàØ<Tab>:close
 menutrans &Save<Tab>:w		    &ÁÐçãÒÐø<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav  ÁÐçãÒÐø\ &ÚÐÞ\.\.\.<Tab>:sav
@@ -43,14 +44,14 @@ menutrans E&xit<Tab>:qa
 
 " Edit menu
 menutrans &Edit			 &ÃàÕòØÒÐúÕ
-menutrans &Undo<Tab>u		 &²àÐâØ<Tab>u
-menutrans &Redo<Tab>^R		 &¿ÞÒàÐâØ<Tab>^R
+menutrans &Undo<Tab>u		 &¿ÞÝØèâØ<Tab>u
+menutrans &Redo<Tab>^R		 &²àÐâØ\ Ø×ÜÕÝã<Tab>^R
 menutrans Rep&eat<Tab>\.	 ¿&ÞÝÞÒØ<Tab>\.
 menutrans Cu&t<Tab>"+x		 ¸áÕ&æØ<Tab>"+x
 menutrans &Copy<Tab>"+y		 &ºÞßØàÐø<Tab>"+y
 menutrans &Paste<Tab>"+gP	 &ÃÑÐæØ<Tab>"+gP
-menutrans &Paste<Tab>"+P	&ÃÑÐæØ<Tab>"+gP
-menutrans Put\ &Before<Tab>[p	 ÁâÐÒØ\ ßàÕ&Ô<Tab>[p
+menutrans &Paste<Tab>"+P	&ÃÑÐæØ<Tab>"+P
+menutrans Put\ &Before<Tab>[p	 ÁâÐÒØ\ ØáßàÕ&Ô<Tab>[p
 menutrans Put\ &After<Tab>]p	 ÁâÐÒØ\ &Ø×Ð<Tab>]p
 menutrans &Delete<Tab>x		 ¸×&ÑàØèØ<Tab>x
 menutrans &Select\ all<Tab>ggVG  ¸×ÐÑÕàØ\ áÒ&Õ<Tab>ggVG
@@ -59,11 +60,11 @@ menutrans Find\ and\ Rep&lace\.\.\.
 menutrans Settings\ &Window	 ¿&àÞ×Þà\ ßÞÔÕèÐÒÐúÐ
 menutrans Startup\ &Settings	 ¿Þ&ÔÕèÐÒÐúÐ\ ßàØ\ ßÞÚàÕâÐúã		
 menutrans &Global\ Settings	 ¾ß&èâÐ\ ßÞÔÕèÐÒÐúÐ
-menutrans F&ile\ Settings	 ¿ÞÔÕèÐÒÐúÐ\ ×Ð\ ÔÐ&âÞâÕÚÕ
-menutrans &Shiftwidth		 &¿ÞÜÕàÐø
+menutrans F&ile\ Settings	 ¿ÞÔÕèÐÒÐúÐ\ ×Ð\ äÐø&ÛÞÒÕ
+menutrans &Shiftwidth		 &ºÞàÐÚ\ ãÒÛÐçÕúÐ
 menutrans Soft\ &Tabstop	 &¼ÕÚÐ\ âÐÑãÛÐæØøÐ
 menutrans Te&xt\ Width\.\.\.	 &ÈØàØÝÐ\ âÕÚáâÐ\.\.\.
-menutrans &File\ Format\.\.\.	 &²àáâÐ\ ÔÐâÞâÕÚÕ\.\.\.
+menutrans &File\ Format\.\.\.	 &²àáâÐ\ äÐøÛÐ\.\.\.
 menutrans Show\ C&olor\ Schemes\ in\ Menu	¿àØÚÐÖØ\ èÕÜÕ\ ÑÞ&øÐ\ ã\ ÜÕÝØøã
 menutrans C&olor\ Scheme	\ÈÕÜÕ\ ÑÞ&øÐ
 menutrans Show\ &Keymaps\ in\ Menu	¿àØÚÐÖØ\ ßàÕá&ÛØÚÐÒÐúÐ\ âÐáâÐâãàÕ\ ã\ ÜÕÝØøã
@@ -71,15 +72,15 @@ menutrans &Keymap
 menutrans Select\ Fo&nt\.\.\.	 ¸×ÑÞà\ &äÞÝâÐ\.\.\.
 
 " Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! ½ÐÓÛÐáØ\ &ÞÑàÐ×æÕ\ (ÔÐ/ÝÕ)<Tab>:set\ hls!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! ¸áâØæÐúÕ\ &èÐÑÛÞÝÐ\ (ÔÐ/ÝÕ)<Tab>:set\ hls!
 menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! ·ÐÝÕÜÐàØ\ ÒÕÛØçØÝã\ &áÛÞÒÐ\ (ÔÐ/ÝÕ)<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! ¿àÞÒÕàØ\ ßàÐâÕûã\ &×ÐÓàÐÔã\ (ÔÐ/ÝÕ)<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! ¿àØÚÐÖØ\ ãßÐàÕÝã\ &×ÐÓàÐÔã\ (ÔÐ/ÝÕ)<Tab>:set\ sm!
 menutrans &Context\ lines  ²ØÔùØÒØ\ &àÕÔÞÒØ
 menutrans &Virtual\ Edit   ²ØàâãÕÛÝÞ\ &ãàÕòØÒÐúÕ
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   ÀÕÖØÜ\ ã&ÝÞáÐ\ (ÔÐ/ÝÕ)<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   ÀÕÖØÜ\ Ã&ÜÕâÐúÕ\ (ÔÐ/ÝÕ)<Tab>:set\ im!
 menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!     '&Vi'\ áÐÓÛÐáÝÞ\ (ÔÐ/ÝÕ)<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\. ¿ãâÐúÐ\ &ßàÕâàÐÓÕ\.\.\.
-menutrans Ta&g\ Files\.\.\.   &´ÐâÞâÕÚÕ\ Þ×ÝÐÚÐ\.\.\.
+menutrans Ta&g\ Files\.\.\.   &ÄÐøÛÞÒØ\ Þ×ÝÐÚÐ\.\.\.
 menutrans Toggle\ &Toolbar    »ØÝØøÐ\ áÐ\ &ÐÛÐâÚÐÜÐ\ (ÔÐ/ÝÕ)
 menutrans Toggle\ &Bottom\ Scrollbar   ´ÞúÐ\ Û&ØÝØøÐ\ ÚÛØ×ÐúÐ\ (ÔÐ/ÝÕ)
 menutrans Toggle\ &Left\ Scrollbar  &»ÕÒÐ\ ÛØÝØøÐ\ ÚÛØ×ÐúÐ\ (ÔÐ/ÝÕ)
@@ -88,8 +89,8 @@ menutrans Toggle\ &Right\ Scrollbar &
 " Edit/Global Settings/Virtual Edit
 menutrans Never		      ½ØÚÐÔ
 menutrans Block\ Selection    ¸×ÑÞà\ ÑÛÞÚÐ
-menutrans Insert\ mode	      ÀÕÖØÜ\ ãÝÞáÐ
-menutrans Block\ and\ Insert  ±ÛÞÚ\ Ø\ ãÝÞá
+menutrans Insert\ mode	      ÀÕÖØÜ\ ÃÜÕâÐúÕ
+menutrans Block\ and\ Insert  ±ÛÞÚ\ Ø\ ÃÜÕâÐúÕ
 menutrans Always	      ÃÒÕÚ
 
 " Edit/File Settings
@@ -109,13 +110,13 @@ menutrans None
 menutrans &Tools	&°ÛÐâÚÕ
 menutrans &Jump\ to\ this\ tag<Tab>g^] ÁÚÞçØ\ ÝÐ\ &ÞÒã\ Þ×ÝÐÚã<Tab>g^]
 menutrans Jump\ &back<Tab>^T	 ÁÚÞçØ\ &ÝÐâàÐÓ<Tab>^T
-menutrans Build\ &Tags\ File	 ¸×ÓàÐÔØ\ &ÔÐâÞâÕÚã\ Þ×ÝÐÚÐ
+menutrans Build\ &Tags\ File	 ¸×ÓàÐÔØ\ &äÐøÛ\ Þ×ÝÐÚÐ
 menutrans &Spelling	 ¿àÐ&ÒÞßØá
 menutrans &Folding	      &¿ÞÔÒØøÐúÕ
-menutrans Create\ &Fold<Tab>zf		  Á&âÒÞàØ\ ßÞÔÒØøãâÐÚ<Tab>zf
-menutrans &Delete\ Fold<Tab>zd		  ¾&ÑàØèØ\ ßÞÔÒØøãâÐÚ<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	  ¾ÑàØèØ\ áÒÕ\ ßÞ&ÔÒØøãâÚÕ<Tab>zD
-menutrans Fold\ column\ &width		  ÈØàØÝÐ\ &àÕÔÐ\ ßÞÔÒØøãâÚÐ
+menutrans Create\ &Fold<Tab>zf		  Á&âÒÞàØ\ áÒØøãâÐÚ<Tab>zf
+menutrans &Delete\ Fold<Tab>zd		  ¾&ÑàØèØ\ áÒØøãâÐÚ<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD	  ¾ÑàØèØ\ áÒÕ\ áÒ&ØøãâÚÕ<Tab>zD
+menutrans Fold\ column\ &width		  ÈØàØÝÐ\ &àÕÔÐ\ æÒØøãâÚÐ
 "menutrans &Diff		      &ÃßÞàÕòØÒÐúÕ
 menutrans &Make<Tab>:make     'mak&Õ'<Tab>:make
 menutrans &List\ Errors<Tab>:cl     ÁßØáÐÚ\ &ÓàÕèÐÚÐ<Tab>:cl
@@ -146,15 +147,15 @@ menutrans Set\ Language\ to\ "en_us"
 menutrans &Find\ More\ Languages	¿àÞÝÐòØ\ øÞè\ øÕ×ØÚÐ 
 
 " Tools/Folding
-menutrans &Enable/Disable\ folds<Tab>zi   &¾ÜÞÓãûØ/ßàÕÚØÝØ\ ßÞÔÒØøÐúÕ<Tab>zi
+menutrans &Enable/Disable\ folds<Tab>zi   &¾ÜÞÓãûØ/ßàÕÚØÝØ\ áÒØøÐúÕ<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv	  &¿ÞÚÐÖØ\ àÕÔ\ áÐ\ ÚãàáÞàÞÜ<Tab>zv
 menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx ¿ÞÚÐÖØ\ &áÐÜÞ\ àÕÔ\ áÐ\ ÚãàáÞàÞÜ<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm   &·ÐâÒÞàØ\ ÒØèÕ\ ßÞÔÒØøãâÐÚÐ<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM    ·ÐâÒÞàØ\ á&ÒÕ\ ßÞÔÒØøãâÚÕ<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr    ¾âÒÞàØ\ ÒØè&Õ\ ßÞÔÒØøãâÐÚÐ<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR     ¾&âÒÞàØ\ áÒÕ\ ßÞÔÒØøãâÚÕ<Tab>zR
+menutrans C&lose\ more\ folds<Tab>zm   &·ÐâÒÞàØ\ ÒØèÕ\ áÒØøãâÐÚÐ<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM    ·ÐâÒÞàØ\ á&ÒÕ\ áÒØøãâÚÕ<Tab>zM
+menutrans O&pen\ more\ folds<Tab>zr    ¾âÒÞàØ\ ÒØè&Õ\ áÒØøãâÐÚÐ<Tab>zr
+menutrans &Open\ all\ folds<Tab>zR     ¾&âÒÞàØ\ áÒÕ\ áÒØøãâÚÕ<Tab>zR
 menutrans Fold\ Met&hod		       &½ÐçØÝ\ ßÞÔÒØøÐúÐ
-menutrans Fold\ Col&umn\ Width	ÈØàØÝÐ\ ÚÞÛÞÝÕ\ ØáßàÕÔ\ ßÞÔÒØøãâÐÚÐ
+menutrans Fold\ Col&umn\ Width	ÈØàØÝÐ\ ÚÞÛÞÝÕ\ ØáßàÕÔ\ áÒØøãâÐÚÐ
 
 " Tools/Folding/Fold Method
 menutrans M&anual	&ÀãçÝÞ
@@ -181,7 +182,7 @@ menutrans Delete	   &
 menutrans &Alternate	   °&ÛâÕàÝÐâØÒÝØ
 menutrans &Next		   &ÁÛÕÔÕûØ
 menutrans &Previous	   &¿àÕâåÞÔÝØ
-menutrans [No\ File]	   [½ÕÜÐ\ ÔÐâÞâÕÚÕ]
+menutrans [No\ File]	   [½ÕÜÐ\ äÐøÛÐ]
 
 " Window menu
 menutrans &Window		    &¿àÞ×Þà
@@ -189,7 +190,7 @@ menutrans &New<Tab>^Wn		    &
 menutrans S&plit<Tab>^Ws	    &¿ÞÔÕÛØ<Tab>^Ws
 menutrans Sp&lit\ To\ #<Tab>^W^^    ¿ÞÔÕÛØ\ áÐ\ &ÐÛâÕàÝÐâØÒÝØÜ<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv   ¿ÞÔÕÛØ\ &ãáßàÐÒÝÞ<Tab>^Wv
-menutrans Split\ File\ E&xplorer    ¿ÞÔÕÛØ\ ×Ð\ ßàÕÓÛÕÔ\ &ÔÐâÞâÕÚÐ
+menutrans Split\ File\ E&xplorer    ¿ÞÔÕÛØ\ ×Ð\ ßàÕÓÛÕÔ\ &äÐøÛÞÒÐ
 menutrans &Close<Tab>^Wc	    &·ÐâÒÞàØ<Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo  ·ÐâÒÞàØ\ &ÞáâÐÛÕ<Tab>^Wo
 "menutrans Ne&xt<Tab>^Ww       &ÁÛÕÔÕûØ<Tab>^Ww
@@ -210,7 +211,7 @@ menutrans &Left\ side<Tab>^WH
 menutrans &Right\ side<Tab>^WL	 Ã&ÔÕáÝÞ<Tab>^WL
 
 " The popup menu
-menutrans &Undo		      &²àÐâØ
+menutrans &Undo		      &¿ÞÝØèâØ
 menutrans Cu&t		      &¸áÕæØ
 menutrans &Copy		      &ºÞßØàÐø
 menutrans &Paste	      &ÃÑÐæØ
@@ -218,7 +219,7 @@ menutrans &Delete
 menutrans Select\ Blockwise   ±ØàÐø\ Ñ&ÛÞÚÞÒáÚØ
 menutrans Select\ &Word       ¸×ÐÑÕàØ\ &àÕç
 menutrans Select\ &Sentence       ¸×ÐÑÕàØ\ à&ÕçÕÝØæã
-menutrans Select\ Pa&ragraph       ¸×ÐÑÕàØ\ &ßÐàÐÓàÐä
+menutrans Select\ Pa&ragraph       ¸×ÐÑÕàØ\ &ßÐáãá
 menutrans Select\ &Line       ¸×ÐÑÕàØ\ à&ÕÔ
 menutrans Select\ &Block      ¸×ÐÑÕàØ\ &ÑÛÞÚ
 menutrans Select\ &All	      ¸×ÐÑÕàØ\ &áÒÕ
@@ -264,13 +265,13 @@ endif
 
 " Syntax menu
 menutrans &Syntax &ÁØÝâÐÚáÐ
-menutrans &Show\ File\ Types\ in\ Menu  ¿àØÚÐÖØ\ âØßÞÒÕ\ ÔÐâÞâÕÚÐ\ ã\ &ÜÕÝØøã
+menutrans &Show\ File\ Types\ in\ Menu  ¿àØÚÐÖØ\ âØßÞÒÕ\ äÐøÛÞÒÐ\ ã\ &ÜÕÝØøã
 menutrans Set\ '&syntax'\ only   ¿ÞÔÕ&áØ\ áÐÜÞ\ 'syntax' 
 menutrans Set\ '&filetype'\ too  ¿ÞÔÕáØ\ &âÐÚÞòÕ\ Ø\ 'filetype'
 menutrans &Off       &¸áÚùãçÕÝÞ
 menutrans &Manual    &ÀãçÝÞ
 menutrans A&utomatic    &°ãâÞÜÐâáÚØ
-menutrans on/off\ for\ &This\ file     ´Ð/ÝÕ\ ×Ð\ ÞÒã\ &ÔÐâÞâÕÚã
+menutrans on/off\ for\ &This\ file     ´Ð/ÝÕ\ ×Ð\ ÞÒÐø\ &äÐøÛ
 menutrans Co&lor\ test     ¿àÞÒÕàÐ\ &ÑÞøÐ
 menutrans &Highlight\ test ¿àÞÒÕàÐ\ ØáâØ&æÐúÐ
 menutrans &Convert\ to\ HTML  ¿àÕâÒÞàØ\ &ã\ HTML
@@ -278,17 +279,17 @@ menutrans &Convert\ to\ HTML
 " dialog texts
 let menutrans_help_dialog = "ÃÝÕáØâÕ ÝÐàÕÔÑã ØÛØ àÕç çØøÕ ßÞøÐèúÕúÕ âàÐÖØâÕ:\n\n´ÞÔÐøâÕ i_ ×Ð ÝÐàÕÔÑÕ ãÝÞáÐ (Ýßà. i_CTRL-X)\n´ÞÔÐøâÕ c_ ×Ð ÝÐàÕÔÑÕ ÚÞÜÐÝÔÝÞÓ àÕÖØÜÐ (Ýßà. á_<Del>)\n´ÞÔÐøâÕ ' ×Ð ØÜÕÝÐ ÞßæØøÐ (Ýßà. 'shiftwidth')"
 
-let g:menutrans_path_dialog = "ÃÝÕáØâÕ ßãâ ßàÕâàÐÓÕ ×Ð ÔÐâÞâÕÚÕ\nÀÐ×ÔÒÞøØâÕ ×ÐàÕ×ØÜÐ ØÜÕÝÐ ÔØàÕÚâÞàØøãÜÐ."
+let g:menutrans_path_dialog = "ÃÝÕáØâÕ ßãâÐúã ßàÕâàÐÓÕ ×Ð äÐøÛÞÒÕ\nÀÐ×ÔÒÞøØâÕ ×ÐàÕ×ØÜÐ ØÜÕÝÐ ÔØàÕÚâÞàØøãÜÐ."
 
-let g:menutrans_tags_dialog = "ÃÝÕáØâÕ ØÜÕÝÐ ÔÐâÞâÕÚÐ áÐ Þ×ÝÐÚÐÜÐ\nÀÐ×ÔÒÞøØâÕ ×ÐàÕ×ØÜÐ ØÜÕÝÐ."
+let g:menutrans_tags_dialog = "ÃÝÕáØâÕ ØÜÕÝÐ äÐøÛÞÒÐ áÐ Þ×ÝÐÚÐÜÐ\nÀÐ×ÔÒÞøØâÕ ×ÐàÕ×ØÜÐ ØÜÕÝÐ."
 
 let g:menutrans_textwidth_dialog = "ÃÝÕáØâÕ ÝÞÒã èØàØÝã âÕÚáâÐ (0 áßàÕçÐÒÐ ßàÕÛÞÜ)"
 
-let g:menutrans_fileformat_dialog = "¸×ÐÑÕàØâÕ äÞàÜÐâ ×ÐßØáÐ ÔÐâÞâÕÚÕ"
+let g:menutrans_fileformat_dialog = "¸×ÐÑÕàØâÕ äÞàÜÐâ ×ÐßØáÐ äÐøÛÐ"
 
 let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&¾âÚÐÖØ"
 
-let menutrans_no_file = "[½ÕÜÐ ÔÐâÞâÕÚÕ]"
+let menutrans_no_file = "[½ÕÜÐ äÐøÛÐ]"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo

runtime/lang/menu_sr_rs.utf-8.vim

@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: Иван Пешић on 2017-12-28 12:05+0400
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_sv_se.latin1.vim

@@ -1,6 +1,7 @@
 " Menu Translations:    Swedish
 " Maintainer:		Johan Svedberg <johan@svedberg.com>
 " Last Change:		2020 Apr 22
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_tr_tr.cp1254.vim

@@ -1,5 +1,6 @@
 " Menu Translations:	Turkish
 " Maintainer:		Emir SARI <bitigchi@me.com>
+" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT
 
 if exists("did_menu_trans")
    finish

runtime/lang/menu_tr_tr.iso_8859-9.vim

@@ -1,5 +1,6 @@
 " Menu Translations:	Turkish
 " Maintainer:		Emir SARI <bitigchi@me.com>
+" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT
 
 if exists("did_menu_trans")
    finish
@@ -8,7 +9,7 @@ endif
 let did_menu_trans = 1
 let s:keepcpo= &cpo
 set cpo&vim
-scriptencoding iso-8859-9
+scriptencoding iso8859-9
 
 " Top
 menutrans &File	&Dosya

runtime/lang/menu_tr_tr.utf-8.vim

@@ -1,5 +1,6 @@
 " Menu Translations:	Turkish
 " Maintainer:		Emir SARI <bitigchi@me.com>
+" Original translations
 
 if exists("did_menu_trans")
    finish

runtime/lang/menu_uk_ua.cp1251.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Ukrainian
 " Maintainer:		Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 " Last Change:		11 Oct 2001
+" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT
 
 "
 " Please, see readme at htpp://www.vstu.edu.ua/~bohdan/vim before any

runtime/lang/menu_uk_ua.koi8-u.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Ukrainian
 " Maintainer:		Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 " Last Change:		11 Oct 2001
+" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT
 
 "
 " Please, see readme at htpp://www.vstu.edu.ua/~bohdan/vim before any

runtime/lang/menu_uk_ua.utf-8.vim

@@ -0,0 +1,252 @@
+" Menu Translations:	Ukrainian
+" Maintainer:		Bohdan Vlasyuk <bohdan@vstu.edu.ua>
+" Last Change:		11 Oct 2001
+" Original translations
+
+"
+" Please, see readme at htpp://www.vstu.edu.ua/~bohdan/vim before any
+" complains, and even if you won't complain, read it anyway.
+"
+
+" Quit when menu translations have already been done.
+if exists("did_menu_trans")
+  finish
+endif
+let did_menu_trans = 1
+let s:keepcpo= &cpo
+set cpo&vim
+
+scriptencoding utf-8
+
+" Help menu
+menutrans &Help			&Допомога
+menutrans &Overview<Tab><F1>	&Загальна\ Інформація<Tab><F1>
+menutrans &User\ Manual		&Керівництво\ для\ користувача
+menutrans &How-to\ links	&Як-Зробити?
+"menutrans &GUI			&GIU
+menutrans &Credits		&Подяки
+menutrans Co&pying		&Розповсюдження
+menutrans O&rphans		&Допомога\ сиротам
+menutrans &Version		&Версія
+menutrans &About		Про\ &програму
+
+" File menu
+menutrans &File				&Файл
+menutrans &Open\.\.\.<Tab>:e	    &Відкрити\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp &Розділити\ вікно\.\.\.<Tab>:sp
+menutrans &New<Tab>:enew	    &Новий<Tab>:enew
+menutrans &Close<Tab>:close	    &Закрити<Tab>:close
+menutrans &Save<Tab>:w		    За&пам'ятати<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav	Запам'ятати\ &як\.\.\.<Tab>:sav
+menutrans Split\ &Diff\ with\.\.\.	По&рівняти\ з\.\.\.
+menutrans Split\ Patched\ &By\.\.\.	За&латати\.\.\.
+menutrans &Print					&Друкувати
+menutrans Sa&ve-Exit<Tab>:wqa		Записати\ і\ ви&йти<Tab>:wqa
+menutrans E&xit<Tab>:qa			&Вихід<Tab>:qa
+
+" Edit menu
+menutrans &Edit				&Редагувати
+menutrans &Undo<Tab>u			&Відмінити<Tab>u
+menutrans &Redo<Tab>^R			&Повернути<Tab>^R
+menutrans Rep&eat<Tab>\.		П&овторити<Tab>\.
+menutrans Cu&t<Tab>"+x			Ви&різати<Tab>"+x
+menutrans &Copy<Tab>"+y			&Копіювати<Tab>"+y
+menutrans &Paste<Tab>"+gP		В&ставити<Tab>"+gP
+menutrans Put\ &Before<Tab>[p		Вставити\ попе&реду<Tab>[p
+menutrans Put\ &After<Tab>]p		Вставити\ п&ісля<Tab>]p
+menutrans &Select\ all<Tab>ggVG		Ви&брати\ усе<Tab>ggVG
+menutrans &Find\.\.\.			&Знайти\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.	За&мінити\.\.\.
+menutrans Settings\ &Window		Вікно\ &налаштувань
+menutrans &Global\ Settings		Загальні\ на&лаштування
+menutrans F&ile\ Settings		Налаштування\ для\ &файлу
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	&Нумерація\ рядків<Tab>:set\ nu!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!		Режим\ на&длишкового\ відображення<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		Режим\ &переносу<Tab>:set\ wrap!
+menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	Переносити\ усе\ &слово<Tab>:set\ lbr!
+menutrans Toggle\ &expand-tab<Tab>:set\ et!			Користуватися\ символом\ &табуляції<Tab>:set\ et!
+menutrans Toggle\ &auto-indent<Tab>:set\ ai!		Автоматичний\ &відступ<Tab>:set\ ai!
+menutrans Toggle\ &C-indenting<Tab>:set\ cin!		Відступи\ для\ мови\ &C<Tab>:set\ cin!
+menutrans &Shiftwidth								&Зсув
+menutrans Te&xt\ Width\.\.\.						&Ширина\ тексту\.\.\.
+menutrans &File\ Format\.\.\.			&Формат\ файлу\.\.\.
+menutrans Soft\ &Tabstop				Позиція\ &табуляції
+menutrans C&olor\ Scheme		&Кольори
+menutrans Select\ Fo&nt\.\.\.		Вибрати\ &шрифт\.\.\.
+
+
+menutrans &Keymap			Режим\ клавіатури
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	Виділяти\ &зразок<Tab>:set\ hls!
+menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		&Розрізняти\ \великі\ та\ малі\ літери<Tab>:set\ ic!
+menutrans Toggle\ &Showmatch<Tab>:set\ sm!		&Негайний\ пошук<Tab>:set\ sm!
+menutrans &Context\ lines	Кількість\ &важливих\ рядків
+menutrans &Virtual\ Edit	Курсор\ &рухається\ без\ меж
+
+menutrans Never			Ніколи
+menutrans Block\ Selection	Вибір\ Блоку
+menutrans Insert\ mode		Режим\ вставки
+menutrans Block\ and\ Insert	Вибір\ і\ вставка
+menutrans Always		Завжди
+
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!	Режим\ &вставки<Tab>:set\ im!
+menutrans Search\ &Path\.\.\.	&Шлях\ пошуку\.\.\.
+menutrans Ta&g\ Files\.\.\.	Файли\ &поміток\.\.\.
+
+
+"
+" GUI options
+menutrans Toggle\ &Toolbar		Панель\ &інструментів
+menutrans Toggle\ &Bottom\ Scrollbar	&Нижня\ лінійка\ зсуву
+menutrans Toggle\ &Left\ Scrollbar	&Ліва\ лінійка\ зсуву
+menutrans Toggle\ &Right\ Scrollbar	&Права\ лінійка\ зсуву
+
+" Programming menu
+menutrans &Tools			&Інструменти
+menutrans &Jump\ to\ this\ tag<Tab>g^]	&Перейти\ до\ помітки<Tab>g^]
+menutrans Jump\ &back<Tab>^T		По&вернутися<Tab>^T
+menutrans Build\ &Tags\ File		&Створити\ файл\ поміток
+" Folding
+menutrans &Folding				&Згортки
+menutrans &Enable/Disable\ folds<Tab>zi		&Дозволити/заборонити\ згортки<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv			&Бачити\ рядок\ з\ курсором<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx			Бачити\ &лише\ рядок\ з\ курсором<Tab>zMzx
+menutrans C&lose\ more\ folds<Tab>zm				Закрити\ &більше\ згортків<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM				Закрити\ &усі\ згортки<Tab>zM
+menutrans &Open\ all\ folds<Tab>zR				Відкрити\ у&сі\ згортки<Tab>zR
+menutrans O&pen\ more\ folds<Tab>zr				Відкрити\ б&ільше\ згортків<Tab>zr
+
+menutrans Create\ &Fold<Tab>zf				С&творити\ згорток<Tab>zf
+menutrans &Delete\ Fold<Tab>zd				&Видалити\ згорток<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD		Видалит&и\ усі\ згортки<Tab>zD
+menutrans Fold\ column\ &width				&Товщина\ рядка\ згортків
+menutrans Fold\ Met&hod		&Метод\ згортання
+menutrans M&anual			&Ручний
+menutrans I&ndent			&Відступ
+menutrans E&xpression       В&ираз
+menutrans S&yntax			&Синтаксично
+menutrans Ma&rker			По&значки
+
+" Diff
+menutrans &Diff					По&рівняння
+menutrans &Update				&Поновити
+menutrans &Get\ Block			&Запозичити\ різницю
+menutrans &Put\ Block			&Впровадити\ різницю
+
+" Make and stuff...
+menutrans &Make<Tab>:make		&Будувати(make)<Tab>:make
+menutrans &List\ Errors<Tab>:cl		&Список\ помилок<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!	Сп&исок\ повідомлень<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn		&Наступна\ помилка<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp	&Попередня\ помилка<Tab>:cp
+menutrans &Older\ List<Tab>:cold	&Бувші\ помилки<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew	&Майбутні\ помилки<Tab>:cnew
+menutrans Error\ &Window	    &Вікно\ помилок
+menutrans &Update<Tab>:cwin			&Поновити<Tab>:cwin
+menutrans &Close<Tab>:cclose		&Закрити<Tab>:cclose
+menutrans &Open<Tab>:copen			&Відкрити<Tab>:copen
+
+menutrans &Set\ Compiler				Встановити\ &компілятор
+menutrans &Convert\ to\ HEX<Tab>:%!xxd     Перевести\ в\ шістнадцяткові\ коди<Tab>:%!xxd
+menutrans Conve&rt\ back<Tab>:%!xxd\ -r     Повернути\ в\ двійкову\ форму<Tab>:%!xxd\ -r
+
+" Names for buffer menu.
+menutrans &Buffers	&Буфери
+menutrans &Refresh\ menu &Поновити
+menutrans Delete	&Видалити
+menutrans &Alternate	&Вторинний
+menutrans &Next		&Слідуючий
+menutrans &Previous	&Попередній
+menutrans [No\ File]	[Немає\ Файла]
+
+" Window menu
+menutrans &Window			&Вікно
+menutrans &New<Tab>^Wn			&Нове<Tab>^Wn
+menutrans S&plit<Tab>^Ws		&Розділити<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^	Розділити\ для\ &вторинного\ файлу<Tab>^W^^
+menutrans Split\ &Vertically<Tab>^Wv	Розділити\ &поперек<Tab>^Wv
+"menutrans Split\ &Vertically<Tab>^Wv	&Розділити\ поперек<Tab>^Wv
+menutrans Split\ File\ E&xplorer		Розділити\ для\ &перегляду\ файлів
+
+menutrans &Close<Tab>^Wc		&Закрити<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo	Закрити\ усі\ &інші<Tab>^Wo
+menutrans Ne&xt<Tab>^Ww			&Наступне<Tab>^Ww
+menutrans P&revious<Tab>^WW		&Попереднє<Tab>^WW
+menutrans &Equal\ Size<Tab>^W=		&Вирівняти\ розмір<Tab>^W=
+menutrans &Max\ Height<Tab>^W_		Най&більша\ висота<Tab>^W_
+menutrans M&in\ Height<Tab>^W1_		Най&менша\ висота<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\|		Найбі&льша\ ширина<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\|		Наймен&ша\ ширина<Tab>^W1\|
+menutrans Move\ &To			&Змістити
+menutrans &Top<Tab>^WK			До&гори<Tab>^WK
+menutrans &Bottom<Tab>^WJ		До&низу<Tab>^WJ
+menutrans &Left\ side<Tab>^WH		У&ліво<Tab>^WH
+menutrans &Right\ side<Tab>^WL		В&право<Tab>^WL
+menutrans Rotate\ &Up<Tab>^WR		&Циклічно\ догори<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr		Ц&иклічно\ униз<Tab>^Wr
+
+" The popup menu
+menutrans &Undo			&Відмінити
+menutrans Cu&t			Ви&різати
+menutrans &Copy			&Копіювати
+menutrans &Paste		В&ставити
+menutrans &Delete		Ви&далити
+menutrans Select\ &Word		Вибрати\ &слово
+menutrans Select\ &Line		Вибрати\ &рядок
+menutrans Select\ &Block	Вибрати\ &блок
+menutrans Select\ &All		Вибрати\ &усе
+
+
+
+" The GUI toolbar
+if has("toolbar")
+  if exists("*Do_toolbar_tmenu")
+    delfun Do_toolbar_tmenu
+  endif
+  fun Do_toolbar_tmenu()
+    tmenu ToolBar.Open		Відкрити файл
+    tmenu ToolBar.Save		Запам'ятати файл
+    tmenu ToolBar.SaveAll		Запам'ятати усі файли
+    tmenu ToolBar.Print		Друкувати
+    tmenu ToolBar.Undo		Відмінити
+    tmenu ToolBar.Redo		Повернути
+    tmenu ToolBar.Cut		Вирізати
+    tmenu ToolBar.Copy		Копіювати
+    tmenu ToolBar.Paste		Вставити
+    tmenu ToolBar.Find		Знайти...
+    tmenu ToolBar.FindNext	Знайти наступний
+    tmenu ToolBar.FindPrev	Знайти попередній
+    tmenu ToolBar.Replace	Замінити...
+    tmenu ToolBar.LoadSesn	Завантажити сеанс редагування
+    tmenu ToolBar.SaveSesn	Запам'ятати сеанс редагування
+    tmenu ToolBar.RunScript	Виконати файл команд
+    tmenu ToolBar.Make		Збудувати проект
+    tmenu ToolBar.Shell		Shell
+    tmenu ToolBar.RunCtags	Створити файл поміток
+    tmenu ToolBar.TagJump	Перейти до помітки
+    tmenu ToolBar.Help		Допомога
+    tmenu ToolBar.FindHelp	Пошук у допомозі
+  endfun
+endif
+
+" Syntax menu
+menutrans &Syntax &Синтаксис
+menutrans Set\ '&syntax'\ only	Встановлювати\ лише\ '&syntax'
+menutrans Set\ '&filetype'\ too	Встановлювати\ '&filetype'\ також
+menutrans &Off			&Вимкнено
+menutrans &Manual		&Ручний
+menutrans A&utomatic		&Автоматично
+menutrans on/off\ for\ &This\ file		Перемкнути\ для\ цього\ &файла
+menutrans Co&lor\ test		Перевірка\ &кольорів
+menutrans &Highlight\ test	&Перевірка\ виділення
+menutrans &Convert\ to\ HTML	Створити\ &HTML
+
+" dialog texts
+let menutrans_no_file = "[Немає\ Файла]"
+let menutrans_help_dialog = "Вкажіть команду або слово для пошуку:\n\nДодайте i_ для команд режиму вставки (напр. i_CTRL-X)\nДодайте i_ для командного режиму (напр. с_<Del>)\nДодайте ' для позначення назви опції (напр. 'shiftwidth')"
+let g:menutrans_path_dialog = "Вкажіть шлях пошуку файлів\nРозділяйте назви директорій комами."
+let g:menutrans_tags_dialog = "Вкажіть назви файлів поміток\nРозділяйте назви комами."
+let g:menutrans_textwidth_dialog = "Вкажіть нову ширину тексту (0 для відміни фоматування)"
+let g:menutrans_fileformat_dialog = "Виберіть формат файлу"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo

runtime/lang/menu_vi_vn.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Vietnamese
 " Maintainer:		Phan Vinh Thinh <teppi@vnlinux.org>
 " Last Change:		12 Mar 2005
+" Original translations
 " URL:			http://iatp.vspu.ac.ru/phan/vietvim/lang/menu_vi_vn.vim
 "
 "

runtime/lang/menu_zh_cn.utf-8.vim

@@ -1,7 +1,8 @@
 " Menu Translations:    Simplified Chinese
 " Maintainer:           Shun Bai <baishunde@gmail.com>
 " Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
-" Last Change:          2020 Apr 23
+" Last Change:          2022 Feb 19
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -435,8 +436,8 @@ menutrans Set\ '&filetype'\ Too			也设置\ 'filetype'(&F)
   menutrans Sorting\ Method					排序方式
   " Netrw.Style.Sorting Method menuitems {{{3
   menutrans Name<tab>s		文件名<tab>s
-  menutrans Time<tab>s  	修改时间<tab>s
-  menutrans Size<tab>s  	大小<tab>s
+  menutrans Time<tab>s		修改时间<tab>s
+  menutrans Size<tab>s		大小<tab>s
   menutrans Exten<tab>s		扩展名<tab>s
   " }}}
   " }}}

runtime/lang/menu_zh_tw.utf-8.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Traditional Chinese
 " Translated By:	Hung-Te Lin	<piaip@csie.ntu.edu.tw>
 " Last Change:		2012 May 01
+" Original translations
 
 " {{{ Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/makemenu.vim

@@ -1,52 +1,54 @@
-" Script to define the syntax menu in synmenu.vim
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Dec 07
+vim9script
 
-" This is used by "make menu" in the src directory.
+# Script to define the syntax menu in synmenu.vim
+# Maintainer:	Bram Moolenaar <Bram@vim.org>
+# Last Change:	2022 Feb 04
+
+# This is used by "make menu" in the src directory.
 edit <sfile>:p:h/synmenu.vim
 
-/The Start Of The Syntax Menu/+1,/The End Of The Syntax Menu/-1d
-let s:lnum = line(".") - 1
-call append(s:lnum, "")
-let s:lnum = s:lnum + 1
+:/The Start Of The Syntax Menu/+1,/The End Of The Syntax Menu/-1d
+var lnum = line(".") - 1
+call append(lnum, "")
+lnum += 1
 
-" Use the SynMenu command and function to define all menu entries
-command! -nargs=* SynMenu call <SID>Syn(<q-args>)
+# Use the SynMenu command and function to define all menu entries
+command! -nargs=* SynMenu call Syn(<q-args>)
 
-let s:cur_menu_name = ""
-let s:cur_menu_nr = 0
-let s:cur_menu_item = 0
-let s:cur_menu_char = ""
+var cur_menu_name = ""
+var cur_menu_nr = 0
+var cur_menu_item = 0
+var cur_menu_char = ""
 
-fun! <SID>Syn(arg)
-  " isolate menu name: until the first dot
-  let i = match(a:arg, '\.')
-  let menu_name = strpart(a:arg, 0, i)
-  let r = strpart(a:arg, i + 1, 999)
-  " isolate submenu name: until the colon
-  let i = match(r, ":")
-  let submenu_name = strpart(r, 0, i)
-  " after the colon is the syntax name
-  let syntax_name = strpart(r, i + 1, 999)
+def Syn(arg: string)
+  # isolate menu name: until the first dot
+  var i = match(arg, '\.')
+  var menu_name = strpart(arg, 0, i)
+  var r = strpart(arg, i + 1, 999)
+  # isolate submenu name: until the colon
+  i = match(r, ":")
+  var submenu_name = strpart(r, 0, i)
+  # after the colon is the syntax name
+  var syntax_name = strpart(r, i + 1, 999)
 
-  if s:cur_menu_name != menu_name
-    let s:cur_menu_name = menu_name
-    let s:cur_menu_nr = s:cur_menu_nr + 10
-    let s:cur_menu_item = 100
-    let s:cur_menu_char = submenu_name[0]
+  if cur_menu_name != menu_name
+    cur_menu_name = menu_name
+    cur_menu_nr += 10
+    cur_menu_item = 100
+    cur_menu_char = submenu_name[0]
   else
-    " When starting a new letter, insert a menu separator.
-    let c = submenu_name[0]
+    # When starting a new letter, insert a menu separator.
+    var c = submenu_name[0]
     if c != s:cur_menu_char
-      exe 'an 50.' . s:cur_menu_nr . '.' . s:cur_menu_item . ' &Syntax.' . menu_name . ".-" . c . '- <nul>'
-      let s:cur_menu_item = s:cur_menu_item + 10
-      let s:cur_menu_char = c
+      exe 'an 50.' .. s:cur_menu_nr .. '.' .. s:cur_menu_item .. ' &Syntax.' .. menu_name .. ".-" .. c .. '- <nul>'
+      cur_menu_item += 10
+      cur_menu_char = c
     endif
   endif
-  call append(s:lnum, 'an 50.' . s:cur_menu_nr . '.' . s:cur_menu_item . ' &Syntax.' . menu_name . "." . submenu_name . ' :cal SetSyn("' . syntax_name . '")<CR>')
-  let s:cur_menu_item = s:cur_menu_item + 10
-  let s:lnum = s:lnum + 1
-endfun
+  append(lnum, 'an 50.' .. s:cur_menu_nr .. '.' .. s:cur_menu_item .. ' &Syntax.' .. menu_name .. "." .. submenu_name .. ' :cal SetSyn("' .. syntax_name .. '")<CR>')
+  cur_menu_item += 10
+  lnum += 1
+enddef
 
 SynMenu AB.A2ps\ config:a2ps
 SynMenu AB.Aap:aap
@@ -676,6 +678,6 @@ SynMenu WXYZ.YAML:yaml
 SynMenu WXYZ.Yacc:yacc
 SynMenu WXYZ.Zimbu:zimbu
 
-call append(s:lnum, "")
+append(lnum, "")
 
 wq

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

@@ -7,51 +7,57 @@
 " Attached is a Vim script file for turning gvim into a shell script editor.
 " It may also be used as an example how to use menus in Vim.
 "
-" Written by: Lennart Schultz <les@dmi.min.dk>
+" Maintainer: Ada (Haowen) Yu <me@yuhaowen.com>
+" Original author: Lennart Schultz <les@dmi.min.dk> (mail unreachable)
 
-imenu Stmts.for	for  in 
-do
-
-doneki	kk0elli
-imenu Stmts.case	case  in
-) ;;
+" Make sure the '<' and 'C' flags are not included in 'cpoptions', otherwise
+" <CR> would not be recognized.  See ":help 'cpoptions'".
+let s:cpo_save = &cpo
+set cpo&vim
+
+imenu Stmts.for	for  in <CR>do<CR><CR>done<esc>ki	<esc>kk0elli
+imenu Stmts.case	case  in<CR>) ;;<CR>esac<esc>bki	<esc>k0elli
+imenu Stmts.if	if   <CR>then<CR><CR>fi<esc>ki	<esc>kk0elli
+imenu Stmts.if-else	if   <CR>then<CR><CR>else<CR><CR>fi<esc>ki	<esc>kki	<esc>kk0elli
+imenu Stmts.elif	elif   <CR>then<CR><CR><esc>ki	<esc>kk0elli
+imenu Stmts.while	while   do<CR><CR>done<esc>ki	<esc>kk0elli
 imenu Stmts.break	break 
 imenu Stmts.continue	continue 
-then
+imenu Stmts.function	() {<CR><CR>}<esc>ki	<esc>k0i
 imenu Stmts.return	return 
 imenu Stmts.return-true	return 0
 imenu Stmts.return-false	return 1
 imenu Stmts.exit	exit 
 imenu Stmts.shift	shift 
 imenu Stmts.trap	trap 
-
-fiki	kki	kk0elli
-imenu Stmts.elif	elif   
-then
-
-ki	kk0elli
-imenu Stmts.while	while   
-do
-
-doneki	kk0elli
-imenu Stmts.break	break 
-imenu Stmts.continue	continue 
-imenu Stmts.function	() {
-
-}ki	k0i
-imenu Stmts.return	return 
-imenu Stmts.return-true	return 0
-imenu Stmts.return-false	return 1
-imenu Stmts.exit	exit 
-imenu Stmts.shift	shift 
-imenu Stmts.trap	trap 
-imenu Test.existence	[ -e  ]hi
-imenu Test.existence - file		[ -f  ]hi
-imenu Test.existence - file (not empty)	[ -s  ]hi
-imenu Test.existence - directory	[ -d  ]hi
-imenu Test.existence - executable	[ -x  ]hi
-imenu Test.existence - readable	[ -r  ]hi
-imenu Test.existence - writable	[ -w  ]hi
+imenu Test.existence	[ -e  ]<esc>hi
+imenu Test.existence\ -\ file		[ -f  ]<esc>hi
+imenu Test.existence\ -\ file\ (not\ empty)	[ -s  ]<esc>hi
+imenu Test.existence\ -\ directory	[ -d  ]<esc>hi
+imenu Test.existence\ -\ executable	[ -x  ]<esc>hi
+imenu Test.existence\ -\ readable	[ -r  ]<esc>hi
+imenu Test.existence\ -\ writable	[ -w  ]<esc>hi
+imenu Test.String\ is\ empty [ x = "x$" ]<esc>hhi
+imenu Test.String\ is\ not\ empty [ x != "x$" ]<esc>hhi
+imenu Test.Strings\ is\ equal [ "" = "" ]<esc>hhhhhhhi
+imenu Test.Strings\ is\ not\ equal [ "" != "" ]<esc>hhhhhhhhi
+imenu Test.Values\ is\ greater\ than [  -gt  ]<esc>hhhhhhi
+imenu Test.Values\ is\ greater\ equal [  -ge  ]<esc>hhhhhhi
+imenu Test.Values\ is\ equal [  -eq  ]<esc>hhhhhhi
+imenu Test.Values\ is\ not\ equal [  -ne  ]<esc>hhhhhhi
+imenu Test.Values\ is\ less\ than [  -lt  ]<esc>hhhhhhi
+imenu Test.Values\ is\ less\ equal [  -le  ]<esc>hhhhhhi
+imenu ParmSub.Substitute\ word\ if\ parm\ not\ set ${:-}<esc>hhi
+imenu ParmSub.Set\ parm\ to\ word\ if\ not\ set ${:=}<esc>hhi
+imenu ParmSub.Substitute\ word\ if\ parm\ set\ else\ nothing ${:+}<esc>hhi
+imenu ParmSub.If\ parm\ not\ set\ print\ word\ and\ exit ${:?}<esc>hhi
+imenu SpShVars.Number\ of\ positional\ parameters ${#}
+imenu SpShVars.All\ positional\ parameters\ (quoted\ spaces) ${*}
+imenu SpShVars.All\ positional\ parameters\ (unquoted\ spaces) ${@}
+imenu SpShVars.Flags\ set ${-}
+imenu SpShVars.Return\ code\ of\ last\ command ${?}
+imenu SpShVars.Process\ number\ of\ this\ shell ${$}
+imenu SpShVars.Process\ number\ of\ last\ background\ command ${!}
 imenu Environ.HOME ${HOME}
 imenu Environ.PATH ${PATH}
 imenu Environ.CDPATH ${CDPATH}
@@ -82,13 +88,17 @@ imenu Builtins.umask umask
 imenu Builtins.wait wait
 imenu Set.set set
 imenu Set.unset unset
-imenu Environ.SHELL ${SHELL}
-imenu Environ.LC_CTYPE ${LC_CTYPE}
-imenu Environ.LC_MESSAGES ${LC_MESSAGES}
-imenu Builtins.cd cd
-imenu Builtins.echo echo
-imenu Builtins.eval eval
-imenu Builtins.exec exec
-imenu Builtins.export export
-imenu Builtins.getopts getopts
-imenu Builtins.hash hash
+imenu Set.mark\ modified\ or\ modified\ variables set -a
+imenu Set.exit\ when\ command\ returns\ non-zero\ exit\ code set -e
+imenu Set.Disable\ file\ name\ generation set -f
+imenu Set.remember\ function\ commands set -h
+imenu Set.All\ keyword\ arguments\ are\ placed\ in\ the\ environment set -k
+imenu Set.Read\ commands\ but\ do\ not\ execute\ them set -n
+imenu Set.Exit\ after\ reading\ and\ executing\ one\ command set -t
+imenu Set.Treat\ unset\ variables\ as\ an\ error\ when\ substituting set -u
+imenu Set.Print\ shell\ input\ lines\ as\ they\ are\ read set -v
+imenu Set.Print\ commands\ and\ their\ arguments\ as\ they\ are\ executed set -x
+
+" Restore the previous value of 'cpoptions'.
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/scripts.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types in scripts
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2021 Jan 22
+" Last change:	2022 Feb 13
 
 " This file is called by an autocommand for every file that has just been
 " loaded into a buffer.  It checks if the type of file can be recognized by
@@ -12,7 +12,7 @@
 " =~? instead.  Do not use =~ anywhere.
 
 
-" Only do the rest when the FileType autocommand has not been triggered yet.
+" Bail out when a FileType autocommand has already set the filetype.
 if did_filetype()
   finish
 endif
@@ -26,422 +26,5 @@ if exists("myscriptsfile") && filereadable(expand(myscriptsfile))
   endif
 endif
 
-" Line continuation is used here, remove 'C' from 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
-
-let s:line1 = getline(1)
-
-if s:line1 =~# "^#!"
-  " A script that starts with "#!".
-
-  " Check for a line like "#!/usr/bin/env {options} bash".  Turn it into
-  " "#!/usr/bin/bash" to make matching easier.
-  " Recognize only a few {options} that are commonly used.
-  if s:line1 =~# '^#!\s*\S*\<env\s'
-    let s:line1 = substitute(s:line1, '\S\+=\S\+', '', 'g')
-    let s:line1 = substitute(s:line1, '\(-[iS]\|--ignore-environment\|--split-string\)', '', '')
-    let s:line1 = substitute(s:line1, '\<env\s\+', '', '')
-  endif
-
-  " Get the program name.
-  " Only accept spaces in PC style paths: "#!c:/program files/perl [args]".
-  " If the word env is used, use the first word after the space:
-  " "#!/usr/bin/env perl [path/args]"
-  " If there is no path use the first word: "#!perl [path/args]".
-  " Otherwise get the last word after a slash: "#!/usr/bin/perl [path/args]".
-  if s:line1 =~# '^#!\s*\a:[/\\]'
-    let s:name = substitute(s:line1, '^#!.*[/\\]\(\i\+\).*', '\1', '')
-  elseif s:line1 =~# '^#!.*\<env\>'
-    let s:name = substitute(s:line1, '^#!.*\<env\>\s\+\(\i\+\).*', '\1', '')
-  elseif s:line1 =~# '^#!\s*[^/\\ ]*\>\([^/\\]\|$\)'
-    let s:name = substitute(s:line1, '^#!\s*\([^/\\ ]*\>\).*', '\1', '')
-  else
-    let s:name = substitute(s:line1, '^#!\s*\S*[/\\]\(\i\+\).*', '\1', '')
-  endif
-
-  " tcl scripts may have #!/bin/sh in the first line and "exec wish" in the
-  " third line.  Suggested by Steven Atkinson.
-  if getline(3) =~# '^exec wish'
-    let s:name = 'wish'
-  endif
-
-  " Bourne-like shell scripts: bash bash2 ksh ksh93 sh
-  if s:name =~# '^\(bash\d*\|\|ksh\d*\|sh\)\>'
-    call dist#ft#SetFileTypeSH(s:line1)	" defined in filetype.vim
-
-    " csh scripts
-  elseif s:name =~# '^csh\>'
-    if exists("g:filetype_csh")
-      call dist#ft#SetFileTypeShell(g:filetype_csh)
-    else
-      call dist#ft#SetFileTypeShell("csh")
-    endif
-
-    " tcsh scripts
-  elseif s:name =~# '^tcsh\>'
-    call dist#ft#SetFileTypeShell("tcsh")
-
-    " Z shell scripts
-  elseif s:name =~# '^zsh\>'
-    set ft=zsh
-
-    " TCL scripts
-  elseif s:name =~# '^\(tclsh\|wish\|expectk\|itclsh\|itkwish\)\>'
-    set ft=tcl
-
-    " Expect scripts
-  elseif s:name =~# '^expect\>'
-    set ft=expect
-
-    " Gnuplot scripts
-  elseif s:name =~# '^gnuplot\>'
-    set ft=gnuplot
-
-    " Makefiles
-  elseif s:name =~# 'make\>'
-    set ft=make
-
-    " Pike
-  elseif s:name =~# '^pike\%(\>\|[0-9]\)'
-    set ft=pike
-
-    " Lua
-  elseif s:name =~# 'lua'
-    set ft=lua
-
-    " Perl
-  elseif s:name =~# 'perl'
-    set ft=perl
-
-    " PHP
-  elseif s:name =~# 'php'
-    set ft=php
-
-    " Python
-  elseif s:name =~# 'python'
-    set ft=python
-
-    " Groovy
-  elseif s:name =~# '^groovy\>'
-    set ft=groovy
-
-    " Raku
-  elseif s:name =~# 'raku'
-    set ft=raku
-
-    " Ruby
-  elseif s:name =~# 'ruby'
-    set ft=ruby
-
-    " JavaScript
-  elseif s:name =~# 'node\(js\)\=\>\|js\>' || s:name =~# 'rhino\>'
-    set ft=javascript
-
-    " BC calculator
-  elseif s:name =~# '^bc\>'
-    set ft=bc
-
-    " sed
-  elseif s:name =~# 'sed\>'
-    set ft=sed
-
-    " OCaml-scripts
-  elseif s:name =~# 'ocaml'
-    set ft=ocaml
-
-    " Awk scripts; also finds "gawk"
-  elseif s:name =~# 'awk\>'
-    set ft=awk
-
-    " Website MetaLanguage
-  elseif s:name =~# 'wml'
-    set ft=wml
-
-    " Scheme scripts
-  elseif s:name =~# 'scheme'
-    set ft=scheme
-
-    " CFEngine scripts
-  elseif s:name =~# 'cfengine'
-    set ft=cfengine
-
-    " Erlang scripts
-  elseif s:name =~# 'escript'
-    set ft=erlang
-
-    " Haskell
-  elseif s:name =~# 'haskell'
-    set ft=haskell
-
-    " Scala
-  elseif s:name =~# 'scala\>'
-    set ft=scala
-
-    " Clojure
-  elseif s:name =~# 'clojure'
-    set ft=clojure
-
-    " Free Pascal
-  elseif s:name =~# 'instantfpc\>'
-    set ft=pascal
-
-    " Fennel
-  elseif s:name =~# 'fennel\>'
-    set ft=fennel
-
-    " MikroTik RouterOS script
-  elseif s:name =~# 'rsc\>'
-    set ft=routeros
-
-    " Fish shell
-  elseif s:name =~# 'fish\>'
-    set ft=fish
-
-    " Gforth
-  elseif s:name =~# 'gforth\>'
-    set ft=forth
-
-  endif
-  unlet s:name
-
-else
-  " File does not start with "#!".
-
-  let s:line2 = getline(2)
-  let s:line3 = getline(3)
-  let s:line4 = getline(4)
-  let s:line5 = getline(5)
-
-  " Bourne-like shell scripts: sh ksh bash bash2
-  if s:line1 =~# '^:$'
-    call dist#ft#SetFileTypeSH(s:line1)	" defined in filetype.vim
-
-  " Z shell scripts
-  elseif s:line1 =~# '^#compdef\>' || s:line1 =~# '^#autoload\>' ||
-        \ "\n".s:line1."\n".s:line2."\n".s:line3."\n".s:line4."\n".s:line5 =~# '\n\s*emulate\s\+\%(-[LR]\s\+\)\=[ckz]\=sh\>'
-    set ft=zsh
-
-  " ELM Mail files
-  elseif s:line1 =~# '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .* \(19\|20\)\d\d$'
-    set ft=mail
-
-  " Mason
-  elseif s:line1 =~# '^<[%&].*>'
-    set ft=mason
-
-  " Vim scripts (must have '" vim' as the first line to trigger this)
-  elseif s:line1 =~# '^" *[vV]im$'
-    set ft=vim
-
-  " libcxx and libstdc++ standard library headers like "iostream" do not have
-  " an extension, recognize the Emacs file mode.
-  elseif s:line1 =~? '-\*-.*C++.*-\*-'
-    set ft=cpp
-
-  " MOO
-  elseif s:line1 =~# '^\*\* LambdaMOO Database, Format Version \%([1-3]\>\)\@!\d\+ \*\*$'
-    set ft=moo
-
-    " Diff file:
-    " - "diff" in first line (context diff)
-    " - "Only in " in first line
-    " - "--- " in first line and "+++ " in second line (unified diff).
-    " - "*** " in first line and "--- " in second line (context diff).
-    " - "# It was generated by makepatch " in the second line (makepatch diff).
-    " - "Index: <filename>" in the first line (CVS file)
-    " - "=== ", line of "=", "---", "+++ " (SVK diff)
-    " - "=== ", "--- ", "+++ " (bzr diff, common case)
-    " - "=== (removed|added|renamed|modified)" (bzr diff, alternative)
-    " - "# HG changeset patch" in first line (Mercurial export format)
-  elseif s:line1 =~# '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\>\|# It was generated by makepatch \|Index:\s\+\f\+\r\=$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\|# HG changeset patch\)'
-	\ || (s:line1 =~# '^--- ' && s:line2 =~# '^+++ ')
-	\ || (s:line1 =~# '^\* looking for ' && s:line2 =~# '^\* comparing to ')
-	\ || (s:line1 =~# '^\*\*\* ' && s:line2 =~# '^--- ')
-	\ || (s:line1 =~# '^=== ' && ((s:line2 =~# '^=\{66\}' && s:line3 =~# '^--- ' && s:line4 =~# '^+++') || (s:line2 =~# '^--- ' && s:line3 =~# '^+++ ')))
-	\ || (s:line1 =~# '^=== \(removed\|added\|renamed\|modified\)')
-    set ft=diff
-
-    " PostScript Files (must have %!PS as the first line, like a2ps output)
-  elseif s:line1 =~# '^%![ \t]*PS'
-    set ft=postscr
-
-    " M4 scripts: Guess there is a line that starts with "dnl".
-  elseif s:line1 =~# '^\s*dnl\>'
-	\ || s:line2 =~# '^\s*dnl\>'
-	\ || s:line3 =~# '^\s*dnl\>'
-	\ || s:line4 =~# '^\s*dnl\>'
-	\ || s:line5 =~# '^\s*dnl\>'
-    set ft=m4
-
-    " AmigaDos scripts
-  elseif $TERM == "amiga"
-	\ && (s:line1 =~# "^;" || s:line1 =~? '^\.bra')
-    set ft=amiga
-
-    " SiCAD scripts (must have procn or procd as the first line to trigger this)
-  elseif s:line1 =~? '^ *proc[nd] *$'
-    set ft=sicad
-
-    " Purify log files start with "****  Purify"
-  elseif s:line1 =~# '^\*\*\*\*  Purify'
-    set ft=purifylog
-
-    " XML
-  elseif s:line1 =~# '<?\s*xml.*?>'
-    set ft=xml
-
-    " XHTML (e.g.: PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN")
-  elseif s:line1 =~# '\<DTD\s\+XHTML\s'
-    set ft=xhtml
-
-    " HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
-    " Avoid "doctype html", used by slim.
-  elseif s:line1 =~? '<!DOCTYPE\s\+html\>'
-    set ft=html
-
-    " PDF
-  elseif s:line1 =~# '^%PDF-'
-    set ft=pdf
-
-    " XXD output
-  elseif s:line1 =~# '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} '
-    set ft=xxd
-
-    " RCS/CVS log output
-  elseif s:line1 =~# '^RCS file:' || s:line2 =~# '^RCS file:'
-    set ft=rcslog
-
-    " CVS commit
-  elseif s:line2 =~# '^CVS:' || getline("$") =~# '^CVS: '
-    set ft=cvs
-
-    " Prescribe
-  elseif s:line1 =~# '^!R!'
-    set ft=prescribe
-
-    " Send-pr
-  elseif s:line1 =~# '^SEND-PR:'
-    set ft=sendpr
-
-    " SNNS files
-  elseif s:line1 =~# '^SNNS network definition file'
-    set ft=snnsnet
-  elseif s:line1 =~# '^SNNS pattern definition file'
-    set ft=snnspat
-  elseif s:line1 =~# '^SNNS result file'
-    set ft=snnsres
-
-    " Virata
-  elseif s:line1 =~# '^%.\{-}[Vv]irata'
-	\ || s:line2 =~# '^%.\{-}[Vv]irata'
-	\ || s:line3 =~# '^%.\{-}[Vv]irata'
-	\ || s:line4 =~# '^%.\{-}[Vv]irata'
-	\ || s:line5 =~# '^%.\{-}[Vv]irata'
-    set ft=virata
-
-    " Strace
-  elseif s:line1 =~# '[0-9:.]* *execve(' || s:line1 =~# '^__libc_start_main'
-    set ft=strace
-
-    " VSE JCL
-  elseif s:line1 =~# '^\* $$ JOB\>' || s:line1 =~# '^// *JOB\>'
-    set ft=vsejcl
-
-    " TAK and SINDA
-  elseif s:line4 =~# 'K & K  Associates' || s:line2 =~# 'TAK 2000'
-    set ft=takout
-  elseif s:line3 =~# 'S Y S T E M S   I M P R O V E D '
-    set ft=sindaout
-  elseif getline(6) =~# 'Run Date: '
-    set ft=takcmp
-  elseif getline(9) =~# 'Node    File  1'
-    set ft=sindacmp
-
-    " DNS zone files
-  elseif s:line1.s:line2.s:line3.s:line4 =~# '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
-    set ft=bindzone
-
-    " BAAN
-  elseif s:line1 =~# '|\*\{1,80}' && s:line2 =~# 'VRC '
-	\ || s:line2 =~# '|\*\{1,80}' && s:line3 =~# 'VRC '
-    set ft=baan
-
-  " Valgrind
-  elseif s:line1 =~# '^==\d\+== valgrind' || s:line3 =~# '^==\d\+== Using valgrind'
-    set ft=valgrind
-
-  " Go docs
-  elseif s:line1 =~# '^PACKAGE DOCUMENTATION$'
-    set ft=godoc
-
-  " Renderman Interface Bytestream
-  elseif s:line1 =~# '^##RenderMan'
-    set ft=rib
-
-  " Scheme scripts
-  elseif s:line1 =~# 'exec\s\+\S*scheme' || s:line2 =~# 'exec\s\+\S*scheme'
-    set ft=scheme
-
-  " Git output
-  elseif s:line1 =~# '^\(commit\|tree\|object\) \x\{40,\}\>\|^tag \S\+$'
-    set ft=git
-
-   " Gprof (gnu profiler)
-   elseif s:line1 == 'Flat profile:'
-     \ && s:line2 == ''
-     \ && s:line3 =~# '^Each sample counts as .* seconds.$'
-     set ft=gprof
-
-  " Erlang terms
-  " (See also: http://www.gnu.org/software/emacs/manual/html_node/emacs/Choosing-Modes.html#Choosing-Modes)
-  elseif s:line1 =~? '-\*-.*erlang.*-\*-'
-    set ft=erlang
-
-  " YAML
-  elseif s:line1 =~# '^%YAML'
-    set ft=yaml
-
-  " MikroTik RouterOS script
-  elseif s:line1 =~# '^#.*by RouterOS.*$'
-    set ft=routeros
-
-  " Sed scripts
-  " #ncomment is allowed but most likely a false positive so require a space
-  " before any trailing comment text
-  elseif s:line1 =~# '^#n\%($\|\s\)'
-    set ft=sed
-
-  " CVS diff
-  else
-    let s:lnum = 1
-    while getline(s:lnum) =~# "^? " && s:lnum < line("$")
-      let s:lnum += 1
-    endwhile
-    if getline(s:lnum) =~# '^Index:\s\+\f\+$'
-      set ft=diff
-
-      " locale input files: Formal Definitions of Cultural Conventions
-      " filename must be like en_US, fr_FR@euro or en_US.UTF-8
-    elseif expand("%") =~# '\a\a_\a\a\($\|[.@]\)\|i18n$\|POSIX$\|translit_'
-      let s:lnum = 1
-      while s:lnum < 100 && s:lnum < line("$")
-	if getline(s:lnum) =~# '^LC_\(IDENTIFICATION\|CTYPE\|COLLATE\|MONETARY\|NUMERIC\|TIME\|MESSAGES\|PAPER\|TELEPHONE\|MEASUREMENT\|NAME\|ADDRESS\)$'
-	  setf fdcc
-	  break
-	endif
-	let s:lnum += 1
-      endwhile
-    endif
-    unlet s:lnum
-
-  endif
-
-  unlet s:line2 s:line3 s:line4 s:line5
-
-endif
-
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-
-unlet s:cpo_save s:line1
+" The main code is in a compiled function for speed.
+call dist#script#DetectFiletype()