Merge remote-tracking branch 'vim/master'

Problem:  After a menubar popover (e.g. File, Edit) was opened and then
          dismissed without selecting an item, keyboard focus remained
          outside the drawing area, leaving the cursor stuck in the
          unfocused (outline) shape until the pointer was moved over the
          drawarea (Foxe Chen)
Solution: Install an emission hook on GtkPopover::closed and, when a
          popover that descends from gui.menubar closes, queue an idle
          callback that grabs focus back to the drawing area. The grab
          must be deferred because GTK is still completing the close
          transition when the signal fires (Yasuhiro Matsumoto).

fixes:  #20274
closes: #20291

Co-Authored-by: Claude <noreply@anthropic.com>
Signed-off-by: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

.appveyor.yml

@@ -1,52 +0,0 @@
-version: "{build}"
-
-image: Visual Studio 2015
-
-skip_tags: true
-
-environment:
-  matrix:
-    - FEATURE: HUGE
-  
-    # Alternate environments, not used right now.  2022 is a lot slower.
-    #
-    # - job_name: VS-2015
-    #   appveyor_build_worker_image: Visual Studio 2015
-    #   FEATURE: HUGE
-
-    # - job_name: VS-2017
-    #   appveyor_build_worker_image: Visual Studio 2017
-    #   FEATURE: HUGE
-
-    # - job_name: VS-2019
-    #   appveyor_build_worker_image: Visual Studio 2019
-    #   FEATURE: HUGE
-
-    # - job_name: VS-2022
-    #   appveyor_build_worker_image: Visual Studio 2022
-    #   FEATURE: HUGE
-
-# disabled
-#    - FEATURE: TINY
-#    - FEATURE: NORMAL
-
-matrix:
-  fast_finish: true
-
-before_build:
-  - call ver
-  - ci\appveyor.bat install
-
-build_script:
-  - ci\appveyor.bat build
-
-test_script:
-  - ci\appveyor.bat test
-
-artifacts:
-  - path: src/vim.exe
-    name: vim
-  - path: src/gvim.exe
-    name: gvim
-
-# vim: sw=2 sts=2 et ts=8 sr

.cirrus.yml

@@ -5,12 +5,12 @@ env:
 freebsd_task:
   name: FreeBSD
   matrix:
-    - name: FreeBSD 14.1
+    - name: FreeBSD 15.0
       freebsd_instance:
-        image_family: freebsd-14-1
+        image_family: freebsd-15-0-amd64-ufs
   timeout_in: 20m
   install_script:
-    - pkg install -y gettext
+    - pkg install -y gettext diffutils
   build_script:
     - NPROC=$(getconf _NPROCESSORS_ONLN)
     - ./configure --with-features=${FEATURES}
@@ -21,3 +21,11 @@ freebsd_task:
     - pw useradd cirrus -m
     - chown -R cirrus:cirrus .
     - sudo -u cirrus make test
+  on_failure:
+    test_artifacts:
+      name: "Cirrus-${CIRRUS_BUILD_ID}-freebsd-failed-tests"
+      path: |
+        runtime/indent/testdir/*.fail
+        runtime/syntax/testdir/failed/*
+        src/testdir/failed/*
+      type: application/octet-stream

.clang-format

@@ -0,0 +1,254 @@
+---
+Language: Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  AlignFunctionPointers: false
+  PadOperators: false
+AlignConsecutiveBitFields:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  AlignFunctionPointers: false
+  PadOperators: false
+AlignConsecutiveDeclarations:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  AlignFunctionPointers: false
+  PadOperators: false
+AlignConsecutiveMacros:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  AlignFunctionPointers: false
+  PadOperators: false
+AlignConsecutiveShortCaseStatements:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCaseColons: false
+AlignEscapedNewlines: DontAlign
+AlignOperands: Align
+AlignTrailingComments:
+  Kind: Leave
+  OverEmptyLines: 0
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowBreakBeforeNoexceptSpecifier: Never
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortCompoundRequirementOnASingleLine: true
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: None
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: All
+AlwaysBreakAfterReturnType: AllDefinitions
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
+BinPackArguments: true
+BinPackParameters: false
+BitFieldColonSpacing: Both
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterExternBlock: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: true
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeLambdaBody: false
+  BeforeWhile: true
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakAdjacentStringLiterals: true
+BreakAfterAttributes: Leave
+BreakAfterJavaFieldAnnotations: false
+BreakArrays: true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Custom
+BreakBeforeInlineASMColon: OnlyMultiline
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: true
+ColumnLimit: 80
+CommentPragmas: '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: false
+DerivePointerAlignment: false
+DisableFormat: false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: false
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks: Preserve
+IncludeCategories:
+  - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority: 2
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: '^(<|"(gtest|gmock|isl|json)/)'
+    Priority: 3
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: '.*'
+    Priority: 1
+    SortPriority: 0
+    CaseSensitive: false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseBlocks: false
+IndentCaseLabels: true
+IndentExternBlock: AfterExternBlock
+IndentGotoLabels: true
+IndentPPDirectives: AfterHash
+IndentRequiresClause: true
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+InsertBraces: false
+InsertNewlineAtEOF: false
+InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary: 0
+  BinaryMinDigits: 0
+  Decimal: 0
+  DecimalMinDigits: 0
+  Hex: 0
+  HexMinDigits: 0
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+KeepEmptyLinesAtEOF: false
+LambdaBodyIndentation: Signature
+LineEnding: DeriveLF
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 4
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: BinPack
+PenaltyBreakAssignment: 4
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 1000000000
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakScopeResolution: 500
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+PPIndentWidth: 1
+QualifierAlignment: Leave
+ReferenceAlignment: Pointer
+ReflowComments: false
+RemoveBracesLLVM: false
+RemoveParentheses: Leave
+RemoveSemicolon: false
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SkipMacroDefinitionBody: false
+SortIncludes: CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: LexicographicNumeric
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeJsonColon: false
+SpaceBeforeParens: ControlStatementsExceptControlMacros 
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: Never
+SpacesInContainerLiterals: true
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: -1
+SpacesInParens: Never
+SpacesInParensOptions:
+  InCStyleCasts: false
+  InConditionalStatements: false
+  InEmptyParentheses: false
+  Other: false
+SpacesInSquareBrackets: false
+Standard: c++03
+TabWidth: 8
+UseTab: Never
+VerilogBreakBetweenInstancePorts: true
+WhitespaceSensitiveMacros:
+  - BOOST_PP_STRINGIZE
+  - CF_SWIFT_NAME
+  - NS_SWIFT_NAME
+  - PP_STRINGIZE
+  - STRINGIZE
+
+# Taken from:
+#   git grep '^#define *FOR_*' src | cut -d':' -f2 | grep -o '[A-Z]*_.*(' \
+#   | tr -d '(' | LC_ALL=C sort -u
+ForEachMacros:
+  - 'FOR_ALL_AUTOCMD_PATTERNS'
+  - 'FOR_ALL_BUFFERS'
+  - 'FOR_ALL_BUFS_FROM_LAST'
+  - 'FOR_ALL_BUF_WININFO'
+  - 'FOR_ALL_CHANNELS'
+  - 'FOR_ALL_CHILD_MENUS'
+  - 'FOR_ALL_DIFFBLOCKS_IN_TAB'
+  - 'FOR_ALL_FRAMES'
+  - 'FOR_ALL_HASHTAB_ITEMS'
+  - 'FOR_ALL_JOBS'
+  - 'FOR_ALL_LIST_ITEMS'
+  - 'FOR_ALL_MENUS'
+  - 'FOR_ALL_NODE_SIBLINGS'
+  - 'FOR_ALL_POPUPWINS'
+  - 'FOR_ALL_POPUPWINS_IN_TAB'
+  - 'FOR_ALL_QFL_ITEMS'
+  - 'FOR_ALL_SIGNS'
+  - 'FOR_ALL_SIGNS_IN_BUF'
+  - 'FOR_ALL_SPELL_LANGS'
+  - 'FOR_ALL_SYNSTATES'
+  - 'FOR_ALL_TABPAGES'
+  - 'FOR_ALL_TAB_WINDOWS'
+  - 'FOR_ALL_TERMS'
+  - 'FOR_ALL_TIMERS'
+  - 'FOR_ALL_WATCHERS'
+  - 'FOR_ALL_WINDOWS'
+  - 'FOR_ALL_WINDOWS_IN_TAB'
+...

.editorconfig

@@ -0,0 +1,50 @@
+# https://spec.editorconfig.org/#supported-pairs
+root = true
+
+[*]
+indent_style = tab
+tab_width = 8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{c,h,proto}]
+indent_size = 4
+
+[src/MacVim/**]
+indent_style = space
+indent_size = 4
+
+[*.{md,yml,sh,bat}]
+# This will become the default after we migrate the codebase
+indent_style = space
+indent_size = 2
+
+[*.md]
+# Markdown uses trailing whitespaces to do an hard line break
+# https://spec.commonmark.org/0.31.2/#hard-line-breaks
+trim_trailing_whitespace = false
+
+[*.vim]
+indent_style = space
+indent_size = 2
+
+[runtime/pack/dist/opt/{comment,nohlsearch}/**.vim]
+indent_style = space
+indent_size = 4
+
+[runtime/doc/**.txt]
+# It can mess up some documentation by trying to strip trailing whitespaces
+trim_trailing_whitespace = false
+
+[src/testdir/test*.vim]
+# Some tests need trailing whitespaces, for example `set showbreak=>>\ `
+trim_trailing_whitespace = false
+
+#
+# Some custom files do not use tabs
+#
+[src/sign.c]
+indent_style = space
+
+[src/sound.c]
+indent_style = space

.git-blame-ignore-revs

@@ -0,0 +1,27 @@
+# When making commits that are strictly formatting/style changes, add the
+# commit hash here, so git blame can ignore the change. See docs for more details:
+#
+# https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile
+#
+# Run this command to always ignore formatting commits in git blame
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Patch v9.1.0829 expanded tabs to spaces in sound.c
+8ce738de3fd7192fa6274730594305cde780074c
+# Patch v9.1.0879 reformated sound.c and sign.c
+3cf094edaff815141d9941b8dba52b9e77d8dfc1
+# change indentation style of netrw plugin
+c363ca1ecd1f8db03663ef98dcf41eeacc3c22c7
+c673b805ad80d0aef07e745d412a2bf298ba1c07
+# fix indentation style in insexpand.c v9.1.1352
+355db99d12a89f05765948b33eecd6d9733e16bb
+# fix indentation styles in various files v9.1.1363
+c2a9000bc1b4a2cbcfeef55450c184b16906d910
+# indentation style in various files v9.1.1364
+562610cfa327c8ebff12a1700525e17a070d5e2c
+# Patch v9.1.1371
+19e1dd6b6aeb96d64122332a8c3d17b9d5ca007b
+# Patch v9.1.1372
+a4a00a7ad0cfa26685c057c11a09bec2c962346a
+# Patch v9.1.1390
+e89aef3f65388a8b627c77f250525f2a264716c5

.gitattributes

@@ -1 +1,43 @@
-src/testdir/test42.in diff
+# The old test .ok files are expected to use LF line endings, even on Windows.
+# In src/testdir/Make_mvc.mak and src/testdir/Make_ming.mak, the test result
+# files .out are converted to LF line endings before being compared.
+# Therefore, if the .ok files' line endings are not specified and are
+# converted to CRLF, the comparison between .ok and .out will fail.
+src/testdir/test*.ok text eol=lf
+
+# This ok file contains literal CR LF endings. Should not be touched by git,
+# so handle as binary
+src/testdir/test21.ok -text
+
+# `vim.pot` is updated every time any of the *.c files are modified.  And as it
+# contains line numbers for strings from *.c files, inserting a line into a
+# single .c file may cause many lines in the `vim.pot` file to be updated.
+#
+# This generates a lot of "noise" in the diffs.  And especially considering that
+# `vim.pot` is a generated file, looking at changes in this file is not useful.
+#
+# By marking it as binary we tell the git machinery that it should not be
+# presented to the user in patches, use "git diff --text" to override
+src/po/vim.pot -diff
+
+# Although vim.pot has been marked as binary, you may want to check the textual differences
+# using git --text but still want to ignore some noisy output like:
+# - POT-Creation Date
+# - comments pointing to the message source location in
+#   *.c/*.h/*.vim/*.cpp/*.in/*.xs files followed by line numbers
+# Note: location comments should be no longer part of vim.pot, since commit 2844765e903214490e1
+# which add the --no-location argument for xgettext to no longer ouput such comments
+#
+# To ignore certain changes, setup a custom textconv filter using:
+# git config diff.ignore_vim_pot.textconv "grep -Ev '^.(POT-Creation-Date:|.*\\.([ch]|vim|in|xs|cpp):).*$'"
+src/po/vim.pot diff=ignore_vim_pot
+
+# GitHub reacts to the `linguist-generated` attribute, by ignoring marked files
+# for the repository's language statistics and hiding changes in these files
+# by default in diffs.
+#
+# https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github
+src/po/vim.pot linguist-generated=true
+*.dump linguist-generated=true
+
+runtime/syntax/testdir/input/vim_ex_help.vim -text diff linguist-language=vim linguist-detectable=true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,6 +10,8 @@ body:
         Thanks for reporting issues of MacVim!
 
         If you want to report a security issue, instead of reporting it here publicly, please disclose it using the steps listed at https://github.com/macvim-dev/macvim/security/policy.
+
+        For general Vim issues that are not specific to MacVim, please file them at https://github.com/vim/vim.
         
         To make it easier for us to help you please enter detailed information below.
   - type: textarea
@@ -30,56 +32,48 @@ body:
       required: true
   - type: input
     attributes:
-      label: Version of Vim and architecture
+      label: Version of MacVim
       description: >
-        Including patch level, use ":version" to see it [e.g. 8.2.1234, GUI, arm64]
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Environment
-      description: >
-        OS and architecture [e.g. Big Sur, arm64], terminal [e.g. Apple Terminal/iTerm], value of $TERM, shell [e.g. zsh 5.8]; anything that might matter
-      placeholder: |
-        Operating system:
-        Terminal:
-        Value of $TERM:
-        Shell:
+        MacVim release number (e.g. r181). Use "About MacVim" to find out which one you are using. If building manually from source, provide the Git commit hash instead (e.g. a4466fe3b695).
     validations:
       required: true
   - type: input
     attributes:
-      label: How MacVim was installed
+      label: MacVim installation method
       description: >
-        MacVim has been downloaded from GitHub, installed via Homebrew, MacPorts or builed from git
+        Was MacVim downloaded from GitHub release, installed via Homebrew / Homebrew Cask / MacPorts, or built from source manually?
+  - type: textarea
+    attributes:
+      label: Environment
+      description: >
+        macOS version (e.g. macOS 15.3.2 Sequoia), Mac type (e.g. MacBook Air M2), terminal (e.g. Apple Terminal/iTerm); anything that might matter
+      placeholder: |
+        macOS version:
+        Mac:
+        Terminal:
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Logs and stack traces
       placeholder: Insert log or other text here (if necessary)
       render: shell
-  - type: input
+  - type: textarea
     attributes:
-      label: Vim configuration where issue is reproducable
-      description: 'e.g. link to your vimrc configuration: url to file/gist/repo..'
+      label: Vim and MacVim configuration where issue is reproducable
+      description: Provide a link to vimrc and/or MacVim settings (see https://github.com/macvim-dev/macvim/wiki/Reporting-an-Issue for how to obtain it).
   - type: checkboxes
     attributes:
-      label: Issue has been tested with given configuration
-      description: This will help us to narrow down the problem more quickly
+      label: How was MacVim launched?
+      description: Different ways of opening MacVim can have an impact on the behavior.
       options:
-        - label: by running MacVim.app from GUI macOS interface
-        - label: by running vim/gvim/etc installed by MacVim
-        - label: by running other versions of vim (e.g. /usr/bin/vim)
+        - label: by launching MacVim.app in macOS (by using the Dock, Spotlight, or the `open` command)
+        - label: by running mvim/gvim in the terminal
   - type: checkboxes
     attributes:
-      label: Issue has been tested with no configuration
-      description: This will help us to narrow down the problem more quickly
+      label: Issue has been tested with clean configuration
+      description: Running MacVim and Vim with clean configurations allow us to narrow down whether this is a configuration issue.
       options:
-        - label: by running `mvim --clean` (or `gvim`, supplied by MacVim distribution)
+        - label: by running `mvim --clean` (or `gvim`, supplied by MacVim distribution). You can also use the File → "New Clean Window" menu item within MacVim.
         - label: by running `vim --clean` (in terminal, supplied by MacVim distribution)
         - label: by running `vim --clean` (in terminal, other suppliers, e.g. /usr/bin/vim)
-  - type: checkboxes
-    attributes:
-      label: Other conditions
-      description: This will help us to narrow down the problem more quickly
-      options:
-        - label: The both Homebrew packages "vim" and "macvim" are installed

.github/actions/build_vim_on_linux/action.yml

@@ -0,0 +1,325 @@
+name: Build Vim on Linux
+description: Build Vim on Linux
+
+inputs:
+  features:
+    description: Vim features
+    required: true
+  compiler:
+    description: Compiler
+    required: true
+  architecture:
+    description: Architecture
+    required: false
+  extra:
+    description: Extra flags
+    required: true
+  shadow:
+    description: Shadow directory
+    required: false
+  interface:
+    description: Interface of language interpreter
+    required: false
+  lua_ver:
+    description: Lua version
+    required: false
+  python3:
+    description: Python3 ABI type
+    required: false
+  coverage:
+    description: Enable coverage
+    required: false
+
+runs:
+  using: "composite"
+  steps:
+    - name: Check Filelist (for packaging)
+      shell: bash
+      run: |
+        echo '::group::Check Filelist (for packaging)'
+        # If any files in the repository are not listed in Filelist this will
+        # exit with an error code and list the missing entries.
+        make -f ci/unlisted.make
+        echo '::endgroup::'
+
+    - name: Check hlgroups (are any new hlgroups added, but not handled in highlight.c)
+      shell: bash
+      run: |
+        echo '::group::Check hlgroups (are any new hlgroups added, but not handled in highlight.c)'
+        # If any highlight groups have been documented, but not handled in
+        # highlight.c, nor listed as 'intentionally left out' in hlgroups.ignore,
+        # exit with an error code and list the missing entries.
+        make -C ci -f hlgroups.make
+        echo '::endgroup::'
+
+    - name: Report executable syntax tests
+      if: contains(fromJSON(inputs.extra), 'syn_test_execs')
+      shell: bash
+      run: |
+        echo '::group::Report executable syntax tests'
+        # Search and list all found executable syntax tests, and exit with
+        # an error code.
+        make -C runtime/syntax executables
+        echo '::endgroup::'
+
+    - name: Add i386 packages to dpkg
+      if: inputs.architecture == 'i386'
+      shell: bash
+      run: |
+        echo '::group::Add i386 packages to dpkg'
+        sudo dpkg --add-architecture i386
+        echo '::endgroup::'
+
+    - name: Uninstall snap
+      shell: bash
+      run: |
+        echo '::group::Uninstall snap'
+        sudo bash ci/remove_snap.sh
+        echo '::endgroup::'
+
+    - name: Enable debug packages
+      shell: bash
+      run: |
+        echo '::group::Enable debug packages'
+        # Some of the ASAN suppressions are in libraries linked with dlopen
+        # and symbolization of them requires these debug packages.
+        sudo apt install ubuntu-dbgsym-keyring
+        sudo cp ci/ddebs.list /etc/apt/sources.list.d/ddebs.list
+        sudo cp ci/pinned-pkgs /etc/apt/preferences.d/pinned-pkgs
+        echo '::endgroup::'
+
+    # TODO: switch to GTK4 GUI
+    - name: Install packages
+      shell: bash
+      run: |
+        echo '::group::Install packages'
+        # This is added by default, and it is often broken, but we don't need anything from it
+        sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+        PKGS=( \
+          gettext \
+          x11-utils \
+          labwc \
+          wl-clipboard \
+          wayland-utils \
+          libgtk-3-dev:${{ inputs.architecture }} \
+          libgtk-3-bin:${{ inputs.architecture }} \
+          desktop-file-utils \
+          libc6-dbgsym:${{ inputs.architecture }} \
+          libtool-bin \
+          libncurses-dev:${{ inputs.architecture }} \
+          libxt-dev:${{ inputs.architecture }} \
+          libegl-mesa0:${{ inputs.architecture }} \
+          libegl1:${{ inputs.architecture }} \
+          libegl1-mesa-dev:${{ inputs.architecture }} \
+          libepoxy-dev:${{ inputs.architecture }} \
+          libwayland-egl1:${{ inputs.architecture }} \
+          libwayland-client0:${{ inputs.architecture }} \
+          libwayland-cursor0:${{ inputs.architecture }} \
+          locales-all \
+          software-properties-common \
+        )
+        if ${{ contains(fromJSON(inputs.extra), 'asan') }} && ${{ contains(inputs.architecture, 'native') }}; then
+        PKGS+=( \
+          libepoxy0-dbgsym:${{ inputs.architecture }} \
+          libxdamage1-dbgsym:${{ inputs.architecture }} \
+          libxcb1-dbgsym:${{ inputs.architecture }} \
+          libgtk-3-bin-dbgsym:${{ inputs.architecture }} \
+          libgtk-3-0t64-dbgsym:${{ inputs.architecture }} \
+          libglib2.0-0t64-dbgsym:${{ inputs.architecture }} \
+          libglib2.0-bin-dbgsym:${{ inputs.architecture }} \
+          libglib2.0-dev-bin-dbgsym:${{ inputs.architecture }} \
+        )
+        fi
+        if ${{ inputs.features == 'huge' }}; then
+          LUA_VER=${{ inputs.lua_ver || '5.4' }}
+          PKGS+=( \
+            autoconf \
+            gdb \
+            lcov \
+            libcanberra-dev \
+            libperl-dev \
+            python3-dev \
+            liblua${LUA_VER}-dev \
+            lua${LUA_VER} \
+            ruby-dev \
+            tcl-dev \
+            cscope \
+            libsodium-dev \
+            attr \
+            libattr1-dev
+          )
+        fi
+        if ${{ contains(fromJSON(inputs.extra), 'proto') }}; then
+          PKGS+=( python3-clang )
+        fi
+        sudo apt-get update && sudo apt-get upgrade -y --allow-downgrades && sudo apt-get install -y --allow-downgrades "${PKGS[@]}"
+
+    - name: Install gcc-${{ env.GCC_VER }}
+      if: inputs.compiler == 'gcc'
+      shell: bash
+      run: |
+        echo '::group::Install gcc-${{ env.GCC_VER }}'
+        # ubuntu-toolchain-r/test PPA for gcc-13 compiler
+        # disabled because the installation failed, causing test failures
+        # sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+        sudo apt-get update -y
+        sudo apt-get install -y gcc-${{ env.GCC_VER }}:${{ inputs.architecture }}
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GCC_VER }} 100
+        sudo update-alternatives --set gcc /usr/bin/gcc-${{ env.GCC_VER }}
+        echo '::endgroup::'
+
+    - name: Install clang-${{ env.CLANG_VER }}
+      if: inputs.compiler == 'clang'
+      shell: bash
+      run: |
+        echo '::group::Install clang-${{ env.CLANG_VER }}'
+        . /etc/lsb-release
+        curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo tee /usr/share/keyrings/llvm-archive-keyring.gpg > /dev/null
+        echo "Types: deb
+        URIs: https://apt.llvm.org/${DISTRIB_CODENAME}/
+        Suites: llvm-toolchain-${DISTRIB_CODENAME}-${{ env.CLANG_VER }}
+        Components: main
+        Signed-By: /usr/share/keyrings/llvm-archive-keyring.gpg" | sudo tee /etc/apt/sources.list.d/llvm-toolchain.sources > /dev/null
+        sudo apt-get update -y
+        sudo apt-get install -y clang-${{ env.CLANG_VER }} llvm-${{ env.CLANG_VER }}
+        sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ env.CLANG_VER }} 100
+        sudo update-alternatives --set clang /usr/bin/clang-${{ env.CLANG_VER }}
+        sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${{ env.CLANG_VER }} 100
+        sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-${{ env.CLANG_VER }} 100
+        echo '::endgroup::'
+
+    - name: Set up environment
+      shell: bash
+      run: |
+        echo '::group::Set up environment'
+        mkdir -p "${LOG_DIR}"
+        mkdir -p "${HOME}/bin"
+        echo "${HOME}/bin" >> $GITHUB_PATH
+        (
+        echo "LINUX_VERSION=$(uname -r)"
+        echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
+        echo "TMPDIR=$(mktemp -d -p /tmp)"
+
+        case "${{ inputs.features }}" in
+        tiny)
+          echo "TEST=testtiny"
+          if ${{ contains(fromJSON(inputs.extra), 'nogui') }}; then
+            CONFOPT="--disable-gui"
+          fi
+          ;;
+        normal)
+          ;;
+        huge)
+          echo "TEST=scripttests test_libvterm indenttest syntaxtest"
+          INTERFACE=${{ inputs.interface || 'yes' }}
+          if ${{ inputs.python3 == 'stable-abi' }}; then
+            PYTHON3_CONFOPT="--with-python3-stable-abi=3.8"
+          fi
+          # The ubuntu-24.04 CI runner does not provide a python2 package.
+          CONFOPT="--enable-perlinterp=${INTERFACE} --enable-pythoninterp=no --enable-python3interp=${INTERFACE} --enable-rubyinterp=${INTERFACE} --enable-luainterp=${INTERFACE} --enable-tclinterp=${INTERFACE} ${PYTHON3_CONFOPT}"
+          ;;
+        esac
+
+        if ${{ contains(fromJSON(inputs.extra), 'no_x11_wl') }}; then
+          CONFOPT="${CONFOPT} --without-x --disable-gui --without-wayland --enable-socketserver"
+        fi
+        if ${{ inputs.coverage == true }}; then
+          CFLAGS="${CFLAGS} --coverage -DUSE_GCOV_FLUSH"
+          echo "LDFLAGS=--coverage"
+        fi
+        if ${{ contains(fromJSON(inputs.extra), 'uchar') }}; then
+          CFLAGS="${CFLAGS} -funsigned-char"
+        fi
+        if ${{ contains(fromJSON(inputs.extra), 'testgui') }}; then
+          echo "TEST=-C src testgui"
+        fi
+        if ${{ contains(fromJSON(inputs.extra), 'unittests') }}; then
+          echo "TEST=unittests"
+        fi
+        if ${{ contains(fromJSON(inputs.extra), 'asan') }}; then
+          echo "SANITIZER_CFLAGS=-g -O0 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize-recover=all -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer"
+          echo "ASAN_OPTIONS=print_stacktrace=1:log_path=${LOG_DIR}/asan"
+          echo "UBSAN_OPTIONS=print_stacktrace=1:log_path=${LOG_DIR}/ubsan"
+          echo "LSAN_OPTIONS=suppressions=${GITHUB_WORKSPACE}/src/testdir/lsan-suppress.txt"
+        fi
+        if ${{ contains(fromJSON(inputs.extra), 'vimtags') }}; then
+          echo "TEST=-C runtime/doc vimtags VIMEXE=../../${SRCDIR}/vim"
+        fi
+        if ${{ contains(fromJSON(inputs.extra), 'proto') }}; then
+          echo "TEST=-C src protoclean proto"
+        fi
+        echo "CFLAGS=${CFLAGS}"
+        echo "CONFOPT=${CONFOPT}"
+        # Disables GTK attempt to integrate with the accessibility service that does run in CI.
+        echo "NO_AT_BRIDGE=1"
+        ) >> $GITHUB_ENV
+        echo '::endgroup::'
+
+    - name: Set up system
+      shell: bash
+      run: |
+        echo '::group::Set up system'
+        if [[ ${CC} = clang ]]; then
+          # Use llvm-cov instead of gcov when compiler is clang.
+          ln -fs /usr/bin/llvm-cov ${HOME}/bin/gcov
+        fi
+        sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
+        sudo usermod -a -G audio "${USER}"
+        sudo bash ci/setup-xvfb.sh
+        echo '::endgroup::'
+
+    - name: Check autoconf
+      if: contains(fromJSON(inputs.extra), 'unittests')
+      shell: bash
+      run: |
+        echo '::group::Check autoconf'
+        make -C src autoconf
+        echo '::endgroup::'
+
+    - name: Set up shadow dir
+      if: inputs.shadow
+      shell: bash
+      run: |
+        echo '::group::Set up shadow dir'
+        make -C src shadow
+        echo "SRCDIR=${{ inputs.shadow }}" >> $GITHUB_ENV
+        echo "SHADOWOPT=-C ${{ inputs.shadow }}" >> $GITHUB_ENV
+        echo '::endgroup::'
+
+    - name: Configure
+      shell: bash
+      run: |
+        echo '::group::Configure'
+        ./configure --with-features=${{ inputs.features }} ${CONFOPT} --enable-fail-if-missing
+        # Append various warning flags to CFLAGS.
+        sed -i -f ci/config.mk.sed ${SRCDIR}/auto/config.mk
+        sed -i -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk
+        if [[ ${CC} = clang ]]; then
+          # Suppress some warnings produced by clang 12 and later.
+          sed -i -f ci/config.mk.clang-12.sed ${SRCDIR}/auto/config.mk
+        fi
+        echo '::endgroup::'
+
+    - name: Build
+      if: (!contains(fromJSON(inputs.extra), 'unittests'))
+      shell: bash
+      run: |
+        echo '::group::Build'
+        make ${SHADOWOPT} -j${NPROC}
+        echo '::endgroup::'
+
+    - name: Check version
+      if: (!contains(fromJSON(inputs.extra), 'unittests'))
+      shell: bash
+      run: |
+        echo '::group::Check version'
+        "${SRCDIR}"/vim --version
+        "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
+        "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
+        if ${{ inputs.features == 'huge' }}; then
+          # Also check that optional and dynamic features are configured and working
+          "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 \
+            -c "let g:required=['gettext', 'sodium', 'sound', 'perl', 'python3', 'lua', 'ruby', 'tcl']" \
+            -S ci/if_feat_check.vim -c quit
+        fi
+        echo '::endgroup::'

.github/actions/screendump/action.yml

@@ -1,26 +0,0 @@
-name: 'screendump'
-description: "Upload failed screendump tests"
-runs:
-  using: "composite"
-  steps:
-    - name: Upload failed tests
-      uses: actions/upload-artifact@v4
-      with:
-        # Name of the artifact to upload.
-        name: ${{ github.workflow }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-tests
-
-        # A file, directory or wildcard pattern that describes what
-        # to upload.
-        path: |
-         ${{ github.workspace }}/runtime/syntax/testdir/failed/*
-         ${{ github.workspace }}/src/testdir/failed/*
-        # The desired behavior if no files are found using the
-        # provided path.
-        if-no-files-found: ignore
-
-        # Duration after which artifact will expire in days. 0 means
-        # using repository settings.
-        retention-days: 0
-
-        # If true, an artifact with a matching name will be deleted
-        overwrite: true

.github/actions/test_artifacts/action.yml

@@ -0,0 +1,66 @@
+name: "test_artifacts"
+description: "Upload failed test artifacts"
+inputs:
+  artifact-name:
+    description: Name of the artifact
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+# MacVim: We don't use a matrix within the reused
+# workflow, and so would prefer to manually pass
+# in the name of the artifact rather than deriving
+# it from the matrix automatically like in Vim
+# upstream.
+#    - name: Collect matrix properties for naming
+#      uses: actions/github-script@v9
+#      id: matrix-props
+#      env:
+#        MATRIX_PROPS: ${{ toJSON(inputs) }}
+#      with:
+#        # An array-flattening-to-string JavaScript function.
+#        script: |
+#          const f = function (x) { return x.toString().length > 0; }
+#          const g = function (x) {
+#            return (Array.isArray(x))
+#              ? x.filter(f)
+#                .map((function (h) { return function (y) { return h(y); }; })(g))
+#                .join('-')
+#              : x;
+#          }
+#          return Object.values(JSON.parse(process.env.MATRIX_PROPS))
+#            .filter(f)
+#            .map(g)
+#            .join('-');
+#        # By default, the JSON-encoded return value of the function is
+#        # set as the "result".
+#        result-encoding: string
+    - name: Upload failed tests
+      uses: actions/upload-artifact@v7
+      with:
+        # Name of the artifact to upload.
+        name: ${{ format('GH-{0}-{1}-{2}-{3}-{4}-failed-tests',
+          github.run_id,
+          github.run_attempt,
+          github.job,
+          strategy.job-index,
+          inputs.artifact-name) }}
+
+        # A file, directory or wildcard pattern that describes what
+        # to upload.
+        path: |
+          ${{ github.workspace }}/logs/**/*.symbolized
+          ${{ github.workspace }}/runtime/indent/testdir/*.fail
+          ${{ github.workspace }}/runtime/syntax/testdir/failed/*
+          ${{ github.workspace }}/src/testdir/failed/*
+        # The desired behavior if no files are found using the
+        # provided path.
+        if-no-files-found: ignore
+
+        # Duration after which artifact will expire in days. 0 means
+        # using repository settings.
+        retention-days: 0
+
+        # If true, an artifact with a matching name will be deleted
+        overwrite: true

.github/actions/test_macvim_artifacts/action.yml

@@ -0,0 +1,39 @@
+# This is a clone of test_artifacts for MacVim-specific files
+# This should be almost identical to test_artifacts, other than the artifact
+# name/path. In the future we could potentially combine the two, but for now
+# it's simpler to keep them separate to ease upstream merging.
+name: 'test_macvim_artifacts'
+description: "Upload failed MacVim test artifacts"
+inputs:
+  artifact-name:
+    description: Name of the artifact
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Upload failed tests
+      uses: actions/upload-artifact@v7
+      with:
+        # Name of the artifact to upload.
+        name: ${{ format('GH-{0}-{1}-{2}-{3}-{4}-failed-macvim-tests',
+          github.run_id,
+          github.run_attempt,
+          github.job,
+          strategy.job-index,
+          inputs.artifact-name) }}
+
+        # A file, directory or wildcard pattern that describes what
+        # to upload.
+        path: |
+         /Users/runner/Library/Developer/Xcode/DerivedData/MacVim-*/Logs/Test/*.xcresult
+        # The desired behavior if no files are found using the
+        # provided path.
+        if-no-files-found: ignore
+
+        # Duration after which artifact will expire in days. 0 means
+        # using repository settings.
+        retention-days: 0
+
+        # If true, an artifact with a matching name will be deleted
+        overwrite: true

.github/actions/universal-package/action.yml

@@ -7,15 +7,19 @@ description: Create universal Homebrew package which contains x86_64 and arm64
 # that has both x86_64 and arm64 arch, as Homebrew's distributed bottles are thin binaries with only one arch.
 #
 # We still use Homebrew to manage the library because their formulas are up to date and have correct build instructions
-# that will work. This way we don't have to manually configuring and building and updating the package info.
+# that will work. This way we don't have to manually configure, build, and update the package info.
 
 inputs:
   formula:
-    description: Formura name
+    description: Formula name
     required: true
   contents:
     description: Path for contents in package's keg
     required: true
+  gnuiconv:
+    description: Use the Homebrew GNU libiconv instead of system one
+    type: boolean
+    required: false
 runs:
   using: 'composite'
   steps:
@@ -31,14 +35,31 @@ runs:
         # version and stomp what we have here.
         brew update
 
+        brew cat ${formula} >${formula}.rb
+
+        if [[ "${{ inputs.gnuiconv }}" == "true" ]]; then
+          # Modify formula to build using Homebrew libiconv. Usually just adding "depends_on" is enough, but since we
+          # override "CC" to use vanilla system clang, we need to manually inject the compilation/link flags to specify
+          # the locations.
+          sed -i.bak '/^[[:blank:]]*def install$/i\'$'\n  depends_on "libiconv"\n' ${formula}.rb
+          sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] += " -I'$(brew --prefix)$'/opt/libiconv/include"\n' ${formula}.rb
+          sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["LDFLAGS"] += " -L'$(brew --prefix)$'/opt/libiconv/lib"\n' ${formula}.rb
+        fi
+
         # Patch the official Homebrew formula to explicitly build for min deployment target and a universal binary. We
         # also need to explicitly use system Clang because Homebrew's bundled clang script tries to inject -march
         # compiler flags that will cause universal builds to fail as Clang does not like that.
-        brew cat ${formula} | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["MACOSX_DEPLOYMENT_TARGET"] = "'${MACOSX_DEPLOYMENT_TARGET}$'"\n' | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["CC"] = "/usr/bin/clang"\n' | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] = "-arch x86_64 -arch arm64"\n' | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["LDFLAGS"] = "-arch x86_64 -arch arm64"\n' >${formula}.rb
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["MACOSX_DEPLOYMENT_TARGET"] = "'${MACOSX_DEPLOYMENT_TARGET}$'"\n' ${formula}.rb
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["CC"] = "/usr/bin/clang"\n' ${formula}.rb
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] = "-arch x86_64 -arch arm64"\n' ${formula}.rb
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["LDFLAGS"] = "-arch x86_64 -arch arm64"\n' ${formula}.rb
+
+        # Homebrew requires formula files to be placed in taps and disallows
+        # installing from raw paths, so we manually create a taps folder for a
+        # 'macvim-dev/deps' tap.
+        FORMULA_DIR="$(brew --repository)/Library/Taps/macvim-dev/homebrew-deps/Formula/"
+        mkdir -p "$FORMULA_DIR"
+        cp ${formula}.rb "$FORMULA_DIR"
 
         # Uninstall the already installed formula because we want to build our own
         brew uninstall --ignore-dependencies ${formula} || true
@@ -53,14 +74,15 @@ runs:
 
         echo '::endgroup::'
 
-    - name: Cache keg
-      id: cache-keg
-      uses: actions/cache@v4
+    - name: Restore keg cache
+      id: cache-keg-restore
+      uses: actions/cache/restore@v5
       with:
         path: ${{ steps.setup-formula.outputs.brew_prefix }}/Cellar/${{ inputs.formula }}
         key: ${{ inputs.formula }}-homebrew-cache-custom-unified-prefix${{ steps.setup-formula.outputs.brew_prefix }}-xcode${{ steps.setup-formula.outputs.xcode_version }}-${{ hashFiles(format('{0}.rb', inputs.formula)) }}
 
     - name: Install formula
+      id: install-formula
       shell: bash
       run: |
         echo '::group::Install formula'
@@ -72,11 +94,14 @@ runs:
         # which cause brew install to return non-zero and fail the build.
         export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
 
-        # This will be a no-op if formula was cached
-        brew install --quiet --formula -s ./${formula}.rb
+        # This will be a no-op if formula was cached. We check if the package
+        # exists first just to avoid an "already installed" warning.
+        brew list ${formula} &>/dev/null || brew install --quiet --formula -s macvim-dev/deps/${formula}
 
         # If formula was cached, this step is necessary to relink it to brew prefix (e.g. /usr/local)
-        brew unlink ${formula} && brew link ${formula}
+        # The "-f" is there to force link keg-only formulas. Homebrew doesn't provide a command to just link in the
+        # optional /opt/homebrew/opt/... folders, so we have to resort to doing this.
+        brew unlink ${formula} && brew link -f ${formula}
         echo '::endgroup::'
 
         echo '::group::Verify built version'
@@ -92,3 +117,16 @@ runs:
         done
 
         echo '::endgroup::'
+
+    - name: Save keg cache
+      id: cache-keg-save
+      uses: actions/cache/save@v5
+      # We always save the generated artifact even if the whole run
+      # fails due to other issues. This helps debugging build
+      # failure issues faster if the cache doesn't already exist as
+      # we want subsequent runs to not have to re-generate this
+      # artifact again.
+      if: always() && steps.cache-keg-restore.outputs.cache-hit != 'true' && steps.install-formula.conclusion == 'success'
+      with:
+        path: ${{ steps.setup-formula.outputs.brew_prefix }}/Cellar/${{ inputs.formula }}
+        key: ${{ steps.cache-keg-restore.outputs.cache-primary-key }}

.github/dependabot.yml

@@ -1,8 +1,16 @@
 version: 2
 updates:
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directories:
+      - "/"
+      - "/.github/actions/**/*"
     schedule:
       interval: "weekly"
     commit-message:
       prefix: "CI"
+    cooldown:
+      default-days: 7
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/labeler.yml

@@ -8,7 +8,6 @@ CI:
         - '.github/dependabot.yml'
         - '.github/labeler.yml'
         - '.github/workflows/*'
-        - '.appveyor.yml'
         - '.codecov.yml'
 
 documentation:
@@ -45,9 +44,7 @@ if_perl:
     - changed-files:
       - any-glob-to-any-file:
         - 'src/if_perl.xs'
-        - 'src/if_perlsfio.c'
         - 'src/proto/if_perl.pro'
-        - 'src/proto/if_perlsfio.pro'
         - 'runtime/doc/if_perl.txt'
 
 if_python:
@@ -130,9 +127,12 @@ runtime:
   - all:
     - changed-files:
       - any-glob-to-any-file:
-        - 'runtime/ftplugin'
-        - 'runtime/syntax'
-        - 'runtime/indent'
+        - 'runtime/autoload/**/*.vim'
+        - 'runtime/colors/**/*.vim'
+        - 'runtime/compiler/**/*.vim'
+        - 'runtime/ftplugin/**/*.vim'
+        - 'runtime/indent/**/*.vim'
+        - 'runtime/syntax/**/*.vim'
         - 'runtime/pack/dist/opt/termdebug/plugin/termdebug.vim'
 
 termdebug:
@@ -146,7 +146,7 @@ plugin-netrw:
     - changed-files:
       - any-glob-to-any-file:
         - 'runtime/plugin/netrwPlugin.vim'
-        - 'runtime/autoload/netrw*'
+        - 'runtime/pack/dist/opt/netrw/**'
 
 xxd:
   - all:

.github/workflows/ci-linux.yml

@@ -0,0 +1,176 @@
+name: CI for Linux
+
+on:
+  workflow_call:
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for
+  # pull requests or the commit hash for any other events.
+  group: ${{ github.workflow }}-linux-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  linux:
+    runs-on: ${{ matrix.architecture == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
+
+    env:
+      CC: ${{ matrix.compiler }}
+      GCC_VER: 14
+      CLANG_VER: 22
+      TEST: test
+      SRCDIR: ./src
+      LEAK_CFLAGS: -DEXITFREE
+      LOG_DIR: ${{ github.workspace }}/logs
+      TERM: xterm
+      DISPLAY: ":99"
+      DEBIAN_FRONTEND: noninteractive
+
+    strategy:
+      fail-fast: false
+      matrix:
+        features: [tiny, normal, huge]
+        compiler: [clang, gcc]
+        extra: [[]]
+        # Only use non-native architecture when features != huge.
+        # features=huge tries to install python3-dev, which fails to install
+        # for the non-native architecture.
+        architecture: [native]
+        include:
+          - features: tiny
+            compiler: clang
+            extra: [nogui]
+          - features: tiny
+            compiler: gcc
+            extra: [nogui, syn_test_execs]
+          - features: tiny
+            compiler: gcc
+            extra: [nogui]
+            architecture: arm64
+          - features: normal
+            shadow: ./src/shadow
+            compiler: gcc
+            architecture: i386
+          - features: huge
+            coverage: true
+          - features: huge
+            compiler: clang
+            interface: dynamic
+            python3: stable-abi
+          - features: huge
+            compiler: gcc
+            coverage: true
+            interface: dynamic
+            extra: [uchar, testgui]
+          - features: huge
+            compiler: gcc
+            coverage: true
+            extra: [unittests]
+          - features: huge
+            compiler: gcc
+            coverage: true
+            extra: [unittests]
+            architecture: arm64
+          - features: normal
+            compiler: gcc
+            extra: [vimtags, proto, preproc_indent, encoding, codestyle]
+          - features: huge
+            compiler: gcc
+            extra: [no_x11_wl]
+
+    steps:
+      - name: Checkout repository from GitHub
+        uses: actions/checkout@v6
+
+      - name: Build
+        timeout-minutes: 15
+        uses: ./.github/actions/build_vim_on_linux
+        with:
+          features: ${{ matrix.features }}
+          compiler: ${{ matrix.compiler }}
+          architecture: ${{ matrix.architecture }}
+          extra: ${{ toJSON(matrix.extra) }}
+          shadow: ${{ matrix.shadow }}
+          interface: ${{ matrix.interface }}
+          lua_ver: ${{ matrix.lua_ver }}
+          python3: ${{ matrix.python3 }}
+          coverage: ${{ matrix.coverage }}
+
+      - name: Test
+        timeout-minutes: 20
+        run: make ${SHADOWOPT} ${TEST}
+
+      # Enable to debug failing tests live and ssh into the CI runners
+      # - name: Setup tmate session
+      #   if: ${{ failure() }}
+      #   uses: mxschmitt/action-tmate@v3
+      #   with:
+      #     limit-access-to-actor: true
+
+      - name: Upload failed test artifacts
+        if: ${{ !cancelled() }}
+        uses: ./.github/actions/test_artifacts
+
+      - name: Vim tags
+        if: contains(matrix.extra, 'vimtags')
+        run: |
+          # This will exit with an error code if the generated vim tags differs from source.
+          (
+            cd runtime/doc
+            git diff --exit-code -- tags
+            make html; rm *.html tags.ref;
+            test -f errors.log && exit 3;
+            true
+          )
+
+      - name: Generate Proto files
+        if: contains(matrix.extra, 'proto')
+        run: |
+          # This will exit with an error code if the generated proto files differ from source
+          (
+            git diff --exit-code -- src/proto/
+            true
+          )
+
+      - name: Check Source Code style
+        if: contains(matrix.extra, 'codestyle')
+        run: |
+          make -C src/testdir codestyle
+
+      - name: Check preprocessor indent
+        if: contains(matrix.extra, 'preproc_indent')
+        run: |
+          # This will exit with an error code if the files differ from source
+          (
+            "${SRCDIR}"/vim -u NONE --not-a-term -esNX +"cd runtime/tools" -S preproc_indent.vim
+            git diff --exit-code -- src/*.[ch] src/xxd/xxd.c
+            true
+          )
+
+      - name: Check encoding of utf-8 runtime files
+        if: contains(matrix.extra, 'encoding')
+        run: |
+          # This will exit with an error code if utf-8 runtime files are not in utf-8 encoding
+          (
+            find . -type f -name "*utf-8*.vim" -exec sh -c \
+              'iconv -f utf-8 -t utf-8 "$1" >/dev/null 2>&1 || echo "non utf-8 encoding detected in $1"' \
+              find-sh {} \; |grep  "non utf-8 encoding" && exit 3
+            true
+          )
+
+      - name: Generate gcov files
+        if: matrix.coverage
+        run: |
+          cd "${SRCDIR}"
+          find . -type f -name '*.gcno' -exec gcov -pb {} + || true
+
+      - name: Codecov
+        timeout-minutes: 20
+        if: matrix.coverage
+        uses: codecov/codecov-action@v6
+        with:
+          flags: linux,${{ matrix.features }}-${{ matrix.compiler }}-${{ join(matrix.extra, '-') }}
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ci-linux_asan.yml

@@ -0,0 +1,82 @@
+name: CI for Linux ASan
+
+on:
+  workflow_call:
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for
+  # pull requests or the commit hash for any other events.
+  group: ${{ github.workflow }}-linux_asan-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  linux-asan:
+    runs-on: ubuntu-24.04
+
+    env:
+      CC: clang
+      CLANG_VER: 21
+      SRCDIR: ./src
+      LEAK_CFLAGS: -DEXITFREE
+      LOG_DIR: ${{ github.workspace }}/logs
+      TERM: xterm
+      DISPLAY: ":99"
+      DEBIAN_FRONTEND: noninteractive
+
+    strategy:
+      fail-fast: false
+      matrix:
+        testset:
+          - tinytests
+          - newtests.1
+          - newtests.2
+
+    steps:
+      - name: Checkout repository from GitHub
+        uses: actions/checkout@v6
+
+      - name: Build
+        timeout-minutes: 15
+        uses: ./.github/actions/build_vim_on_linux
+        with:
+          features: huge
+          compiler: clang
+          extra: '["asan"]'
+          # Lua5.1 is the most widely used version (since it's what LuaJIT is
+          # compatible with), so ensure it works
+          lua_ver: "5.1"
+
+      - name: Test (tinytests)
+        if: matrix.testset == 'tinytests'
+        timeout-minutes: 20
+        run: make ${TEST} NEW_TESTS_RES=
+
+      - name: Test (newtests)
+        if: startsWith(matrix.testset, 'newtests')
+        timeout-minutes: 20
+        env:
+          JOB_INDEX: ${{ strategy.job-index }}
+          JOB_TOTAL: ${{ strategy.job-total }}
+        run: |
+          set -x
+          make -C src/testdir SCRIPTS_TINY_OUT= \
+            NEW_TESTS_RES="$(python3 ci/gen_testset.py $((JOB_TOTAL-1)) | jq -r --argjson i $((JOB_INDEX-1)) '.[$i]|join(" ")')"
+
+      - name: ASan logs
+        if: ${{ !cancelled() }}
+        run: |
+          for f in $(grep -lR '#[[:digit:]]* *0x[[:xdigit:]]*' "${LOG_DIR}"); do
+            (
+              echo "$f"
+              asan_symbolize -l "$f"
+            ) | tee "$f".symbolized
+            false # in order to fail a job
+          done
+
+      - name: Upload failed test artifacts
+        if: ${{ !cancelled() }}
+        uses: ./.github/actions/test_artifacts

.github/workflows/ci-macos.yml

@@ -0,0 +1,103 @@
+name: CI for macOS
+
+on:
+  workflow_call:
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for
+  # pull requests or the commit hash for any other events.
+  group: ${{ github.workflow }}-macos-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  macos:
+    runs-on: ${{ matrix.runner }}
+
+    env:
+      CC: clang
+      TEST: test
+      SRCDIR: ./src
+      LEAK_CFLAGS: -DEXITFREE
+      TERM: xterm
+
+    strategy:
+      fail-fast: false
+      matrix:
+        features: [tiny, normal, huge]
+        runner: [macos-15-intel, macos-26]
+
+    steps:
+      - name: Checkout repository from GitHub
+        uses: actions/checkout@v6
+
+      - name: Install packages
+        if: matrix.features == 'huge'
+        run: |
+          brew install lua libtool
+          echo "LUA_PREFIX=$(brew --prefix)" >> $GITHUB_ENV
+
+      - name: Set up environment
+        run: |
+          (
+          echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
+          case "${{ matrix.features }}" in
+          tiny)
+            echo "TEST=testtiny"
+            echo "CONFOPT=--disable-gui"
+            ;;
+          normal)
+            ;;
+          huge)
+            echo "CONFOPT=--enable-perlinterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
+            ;;
+          esac
+          ) >> $GITHUB_ENV
+
+      - name: Configure
+        run: |
+          ./configure --with-features=${{ matrix.features }} ${CONFOPT} --enable-fail-if-missing
+          # Append various warning flags to CFLAGS.
+          # BSD sed needs backup extension specified.
+          sed -i.bak -f ci/config.mk.sed ${SRCDIR}/auto/config.mk
+          # On macOS, the entity of gcc is clang.
+          sed -i.bak -f ci/config.mk.clang.sed ${SRCDIR}/auto/config.mk
+          # Suppress some warnings produced by clang 12 and later.
+          if clang --version | grep -qs 'Apple clang version \(1[3-9]\|[2-9]\)\.'; then
+            sed -i.bak -f ci/config.mk.clang-12.sed ${SRCDIR}/auto/config.mk
+          fi
+
+      - name: Build
+        env:
+          LC_ALL: C
+        run: |
+          make -j${NPROC}
+
+      - name: Check version
+        run: |
+          "${SRCDIR}"/vim --version
+          "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
+          "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
+          if ${{ matrix.features == 'huge' }}; then
+            # Also check that optional and dynamic features are configured and working
+            "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 \
+              -c "let g:required=['sound', 'perl', 'python3', 'lua', 'ruby', 'tcl']" \
+              -S ci/if_feat_check.vim -c quit
+          fi
+
+      - name: Install packages for testing
+        run: |
+          # Apple diff is broken. Use GNU diff instead. See #14032.
+          brew install diffutils
+
+      - name: Test
+        timeout-minutes: 25
+        run: |
+          make ${TEST}
+
+      - name: Upload failed test artifacts
+        if: ${{ !cancelled() }}
+        uses: ./.github/actions/test_artifacts

.github/workflows/ci-macvim.yaml

@@ -1,5 +1,7 @@
 name: MacVim GitHub CI
 
+# Main CI workflow for MacVim. Will build and test MacVim on different platforms.
+
 on:
   push:
   pull_request:
@@ -11,386 +13,42 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
-env:
-  MACOSX_DEPLOYMENT_TARGET: '10.13'
-  MACOSX_DEPLOYMENT_TARGET_LEGACY: '10.9'
-
-  MACVIM_ARCHS: "x86_64 arm64"  # Universal app for Intel/Apple Silicon
-  MACVIM_ARCHS_LEGACY: "x86_64" # Legacy builds only need to build x86-64 because Apple Silicon can't run on these old OSes
-
-  CC: clang
-
-  MAKE_BUILD_ARGS: LINK_AS_NEEDED=yes # In macOS we never over-specify link dependencies and we already check against external deps in smoketest. With LTO, linking takes a while, so we want to avoid using link.sh.
-
-  VERSIONER_PERL_VERSION: '5.30'  # macOS default Perl installation uses this to determine which one to use
-
-  vi_cv_path_python: /Library/Frameworks/Python.framework/Versions/2.7/bin/python
-  vi_cv_path_python3: "%s/bin/python3"
-  vi_cv_path_plain_lua: "%s/bin/lua"
-  vi_cv_path_ruby: "%s/opt/ruby/bin/ruby"
-  vi_cv_dll_name_perl: /System/Library/Perl/%s/darwin-thread-multi-2level/CORE/libperl.dylib
-  vi_cv_dll_name_python: /Library/Frameworks/Python.framework/Versions/2.7/Python
-  vi_cv_dll_name_python3: /usr/local/Frameworks/Python.framework/Versions/Current/Python
-  vi_cv_dll_name_python3_arm64: /opt/homebrew/Frameworks/Python.framework/Versions/Current/Python
-  vi_cv_dll_name_ruby: /usr/local/opt/ruby/lib/libruby.dylib
-  vi_cv_dll_name_ruby_arm64: /opt/homebrew/opt/ruby/lib/libruby.dylib
-  vi_cv_dll_name_lua: /usr/local/lib/liblua.dylib
-  vi_cv_dll_name_lua_arm64: /opt/homebrew/lib/liblua.dylib
-
-  MACVIM_APP: src/MacVim/build/Release/MacVim.app
-  VIM_BIN: src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
-  MACVIM_BIN: src/MacVim/build/Release/MacVim.app/Contents/MacOS/MacVim
-
-  TERM: xterm
-  BASH_SILENCE_DEPRECATION_WARNING: 1
-
 jobs:
   # Builds and test MacVim
   build-and-test:
-
-    # Test on macOS 11.x / 12.x, and also older versions of Xcode for compatibility testing.
     strategy:
       fail-fast: false
       matrix:
         include:
-          # Oldest version of Xcode supported on GitHub Action to test source code backwards compatibility
-          # This version of Xcode can run on macOS 11 where as 13.3 has to run on macOS 12.
-          - os: macos-12
-            xcode: '13.2.1'
+          # Self-hosted runner with old enough software (Xcode 14.0.1) to be
+          # able to make legacy builds. We only run this when making a full
+          # release build.
+          - os: macos-13-xcode14-self-hosted
+            publish: true
+            publish_postfix: '_10.9'
+            skip: ${{ ! startswith(github.ref, 'refs/tags/release') }}
+            legacy: true
+
+          - os: macos-14
+            xcode: '15.4'
+            testgui: true
             extra: [vimtags, check-xcodeproj-compat]
 
-          # Older version of Xcode, and used to publish legacy builds (for macOS 10.9 - 10.12)
-          - os: macos-12
-            xcode: '14.0' # last version of Xcode that uses the macOS 12 SDK, which still supports deploying to macOS 10.9
-            publish: true
-            legacy: true
-            publish_postfix: '_10.9'
-
-          - os: macos-13
-            xcode: '15.2'
-            optimized: true
-
-          # Most up to date OS and Xcode. Used to publish release for the main build.
-          # This runner uses Apple Silicon.
-          - os: macos-14
-            xcode: '15.2'
+          - os: macos-15
+            xcode: '16.4'
+            testgui: false
             publish: true
             optimized: true
 
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up legacy build
-        if: matrix.legacy
-        run: |
-          # Set the correct build env vars to target the correct architectures and min OS targets.
-          echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET_LEGACY" >> $GITHUB_ENV
-          echo "MACVIM_ARCHS=$MACVIM_ARCHS_LEGACY" >> $GITHUB_ENV
-
-          # Use Sparkle 1 because Sparkle 2 requires newer OS version than our legacy build.
-          # Later, we pass the --enable-sparkle_1 flag to configure to set the corresponding ifdef.
-          ln -fhs Sparkle_1.framework src/MacVim/Sparkle.framework
-
-          # Sparkle shows a dialog asking if the user wants to check for updates on 2nd launch of
-          # MacVim. On Sparkle 1 this is annoyingly a modal dialog box and interferes with tests.
-          # Just disable it by pre-setting to not check for updates.
-          defaults write org.vim.MacVim SUEnableAutomaticChecks 0
-
-      - name: Set up Xcode
-        if: matrix.xcode != ''
-        run: |
-          sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
-          xcode-select -p
-          xcodebuild -version
-
-      # Set up, install, and cache gettext library for localization.
-      #
-      - name: Set up gettext
-        if: matrix.publish
-        uses: ./.github/actions/universal-package
-        with:
-          formula: gettext
-          contents: lib/libintl.a,lib/libintl.dylib
-
-      # Set up, install, and cache libsodium library for encryption.
-
-      - name: Set up libsodium
-        if: matrix.publish
-        uses: ./.github/actions/universal-package
-        with:
-          formula: libsodium
-          contents: lib/libsodium.a,lib/libsodium.dylib
-
-      # Set up remaining packages and tools
-
-      - name: Install packages
-        run: |
-          brew install --quiet libtool
-
-      - name: Install packages for testing
-        run: |
-          # Apple diff is broken. Use GNU diff instead. See http://github.com/vim/vim/issues/14056.
-          brew install --quiet diffutils
-
-      - name: Grant microphone access for macos-14
-        if: matrix.os == 'macos-14'
-        run: |
-          # Temporary fix to fix microphone permission issues for macos-14 when playing sound.
-          sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR IGNORE INTO access VALUES ('kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159,NULL,NULL,'UNUSED',1687786159);"
-
-      - name: Install scripting runtimes
-        if: matrix.publish
-        run: |
-          # We no longer need to install/update Python 3, as it's guaranteed to
-          # be installed on runners. Since we use stable ABI, the exact version
-          # on CI does not matter.
-
-          brew install --quiet ruby
-          brew install --quiet lua
-
-          if [[ -d $(brew --prefix)/Cellar/perl ]]; then
-            # We just use system perl to reduce dependencies
-            brew unlink perl
-          fi
-
-          echo "vi_cv_path_python3=$(printf $vi_cv_path_python3 $(brew --prefix))" >> $GITHUB_ENV
-          echo "vi_cv_path_plain_lua=$(printf $vi_cv_path_plain_lua $(brew --prefix))" >> $GITHUB_ENV
-          echo "vi_cv_path_ruby=$(printf $vi_cv_path_ruby $(brew --prefix))" >> $GITHUB_ENV
-
-          # With Perl, we need to manually specify the version number because the dylib path depends on it.
-          echo "vi_cv_dll_name_perl=$(printf $vi_cv_dll_name_perl $VERSIONER_PERL_VERSION)" >> $GITHUB_ENV
-
-          # New runner images (macos-13) no longer have Python2 installed. We
-          # need to install Python2 manually. Installing from the official
-          # installer is the easiest way as Homebrew no longer ships python@2
-          # and this way does not invole manual building from source. We
-          # mostly only need the headers to build a dynamic build anyway.
-          #
-          # This will be removed in the future as Python2 has been completely
-          # unsupported for years.
-          curl https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg -o ~/Downloads/python-2.7.18-macosx10.9.pkg
-          sudo installer -pkg ~/Downloads/python-2.7.18-macosx10.9.pkg -target /
-
-      # All set up steps are done. Build and test MacVim below.
-
-      - name: Configure
-        run: |
-          set -o verbose
-
-          CONFOPT=(
-            --with-local-dir=$(brew --prefix)
-            --with-features=huge
-            --enable-netbeans
-            --with-tlib=ncurses
-            --enable-cscope
-            --enable-gui=macvim
-            --with-compiledby="GitHub Actions"
-          )
-          if ${{ matrix.publish == true }}; then
-            CONFOPT+=(
-              --enable-perlinterp=dynamic
-              --enable-pythoninterp=dynamic
-              --enable-python3interp=dynamic
-              --with-python3-stable-abi=3.9 # macOS and Xcode currently ships 3.9, so we don't want go higher than that.
-              --enable-rubyinterp=dynamic
-              --enable-luainterp=dynamic
-              --with-lua-prefix=$(brew --prefix)
-              --with-macarchs="$MACVIM_ARCHS"
-            )
-          else
-            CONFOPT+=(
-              --disable-sparkle       # Disable Sparkle for testing that this flag builds and works
-            )
-          fi
-          if ${{ matrix.legacy == true }}; then
-            CONFOPT+=(
-              --enable-sparkle_1
-            )
-          fi
-          echo "CONFOPT: ${CONFOPT[@]}"
-
-          ./configure "${CONFOPT[@]}" --enable-fail-if-missing
-
-          sed -i.bak -f ci/config.mk.sed -f ci/config.mk.clang.sed -f ci/config.mk.xcode.sed src/auto/config.mk
-          if clang --version | grep -qs '^Apple clang version \(1[3-9]\|[2-9]\d\)\.'; then
-            sed -i.bak -f ci/config.mk.clang-12.sed src/auto/config.mk
-          fi
-
-          if ${{ matrix.optimized == true }}; then
-            # Additional optimizations like link-time optimizations that are a bit slower to build.
-            sed -i.bak -f ci/config.mk.optimized.sed src/auto/config.mk
-          fi
-
-      - name: Modify configure result
-        if: matrix.publish
-        run: |
-          # Ruby is keg-only in Homebrew, so need to manually link in the path so Vim will know where to look for the binaries.
-          perl -p -i -e "s#(?<=-DDYNAMIC_RUBY_DLL=\\\\\").*?(?=\\\\\")#${vi_cv_dll_name_ruby}#" src/auto/config.mk
-          grep -q -- "-DDYNAMIC_PERL_DLL=\\\\\"${vi_cv_dll_name_perl}\\\\\"" src/auto/config.mk
-          grep -q -- "-DDYNAMIC_PYTHON_DLL=\\\\\"${vi_cv_dll_name_python}\\\\\"" src/auto/config.mk
-          grep -q -- "-DDYNAMIC_PYTHON3_DLL=\\\\\"${vi_cv_dll_name_python3}\\\\\"" src/auto/config.mk
-          grep -q -- "-DDYNAMIC_RUBY_DLL=\\\\\"${vi_cv_dll_name_ruby}\\\\\"" src/auto/config.mk
-
-          # Also search for the arm64 overrides for the default library locations, which are different from x86_64
-          # because Homebrew puts them at a different place.
-          grep -q -- "-DDYNAMIC_PYTHON3_DLL_ARM64=\\\\\"${vi_cv_dll_name_python3_arm64}\\\\\"" src/auto/config.mk
-          grep -q -- "-DDYNAMIC_RUBY_DLL_ARM64=\\\\\"${vi_cv_dll_name_ruby_arm64}\\\\\"" src/auto/config.mk
-          grep -q -- "-DDYNAMIC_LUA_DLL_ARM64=\\\\\"${vi_cv_dll_name_lua_arm64}\\\\\"" src/auto/config.mk
-
-      - name: Show configure output
-        run: |
-          cat src/auto/config.mk
-          cat src/auto/config.h
-
-      - name: Build
-        env:
-          LC_ALL: C
-        run: |
-          NPROC=$(getconf _NPROCESSORS_ONLN)
-          echo "Building MacVim with ${NPROC} cores"
-
-          set -o verbose
-          make ${MAKE_BUILD_ARGS} -j${NPROC}
-
-      - name: Check version
-        run: |
-          ${VIM_BIN} --version
-          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -c 'echo "\nprof_nsec:" .. has("prof_nsec") .. "\n"' -c quit
-          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
-          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
-
-      - name: Smoketest
-        run: |
-          set -o verbose
-
-          # Make sure there isn't any dynamic linkage to third-party dependencies in the built binary, as we should only use
-          # static linkage to avoid dependency hell. Test that all those dylib's are in /usr/lib which is bundled with macOS and not third-party.
-          if otool -L ${VIM_BIN} | grep '\.dylib\s' | grep -v '^\s*/usr/lib/'; then
-            echo 'Found external dynamic linkage!'; false
-          fi
-
-          # Make sure that --disable-sparkle flag will properly exclude all references to Sparkle symbols. This is
-          # necessary because we still use weak linking to Sparkle when that flag is set and so references to Sparkle
-          # wouldn't fail the build (we just remove Sparkle.framework from the built app after the fact).
-          if ${{ matrix.publish == false }}; then
-            # Currently we pass --disable-sparkle flag when publish==false
-            if objdump -t ${MACVIM_BIN} | grep "_SPU\|_SUUpdate"; then
-              echo 'Found references to Sparkle even when using --disable-sparkle'; false
-            fi
-          fi
-
-          # Make sure man pages were bundled
-          man -M `pwd`/${MACVIM_APP}/Contents/man -w mvim
-
-          # Make sure xxd was bundled
-          echo "AB" | ${MACVIM_APP}/Contents/bin/xxd | grep "4142"
-
-      - name: Smoketest (publish)
-        if: matrix.publish
-        run: |
-          set -o verbose
-
-          macvim_excmd() {
-            ${VIM_BIN} -u NONE -i NONE -g -f -X -V1 -es "$@" -c 'echo ""' -c 'qall!' 2>&1
-          }
-
-          # Smoketest scripting languages
-          macvim_excmd -c 'lua print("Test")'     | grep Test
-          macvim_excmd -c 'perl VIM::Msg("Test")' | grep Test
-          macvim_excmd -c 'py3 print("Test")'     | grep Test
-          macvim_excmd -c 'ruby puts("Test")'     | grep Test
-
-          if [[ "$(uname -m)" == "x86_64" ]]; then
-            macvim_excmd -c 'py print "x86 Test"' | grep Test
-          else
-            # Python2 doesn't work in Apple Silicon, test under Rosetta
-            (VIM_BIN="arch -x86_64 ${VIM_BIN}"; macvim_excmd -c 'py print "rosetta Test"' | grep Test)
-          fi
-
-          # Check that localized messages work by printing ':version' and checking against localized word
-          macvim_excmd -c 'lang es_ES' -c 'version' | grep Enlazado
-
-          # Check that libsodium is working
-          macvim_excmd -c 'set cryptmethod=xchacha20v2'
-
-          # Make sure we are building universal x86_64 / arm64 builds and didn't accidentally create a thin app.
-          check_arch() {
-            local archs=($(lipo -archs "$1"))
-            if [[ ${archs[@]} != "$MACVIM_ARCHS" ]]; then
-              echo "Wrong arch(s) in $1: ${archs[@]}"; false
-            else
-              lipo -info "$1"
-            fi
-          }
-          check_arch "${VIM_BIN}"
-          check_arch "${MACVIM_BIN}"
-
-      - name: Check Vim help tags
-        if: contains(matrix.extra, 'vimtags')
-        run: |
-          # Confirm that we can build the help tags, and they match what's in source.
-          make -C runtime/doc vimtags VIMEXE=../../${VIM_BIN}
-          git diff --exit-code -- runtime/doc/tags
-
-      - name: Check Xcode project compatibility version
-        if: contains(matrix.extra, 'check-xcodeproj-compat')
-        run: |
-          # Confirm that the compatibility version of xcodeproj is correct and not outdated.
-          rm -rf src/MacVim/MacVim_xcode8.xcodeproj
-          make -C src macvim-xcodeproj-compat
-          if ! git diff --exit-code -- src/MacVim/MacVim_xcode8.xcodeproj; then
-            echo 'MacVim_xcode8.xcodeproj is outdated. Run "make -C src macvim-xcodeproj-compat" to re-generate it.'; false
-          fi
-
-      - name: Test MacVim
-        timeout-minutes: 10
-        run: |
-          make ${MAKE_BUILD_ARGS} -C src macvim-tests
-
-      - name: Build Vim test binaries
-        run: |
-          # Build the unit test binaries first. With link-time-optimization they take some time to link. Running them
-          # separately de-couples them from the timeout in tests, and allow us to build in parallel jobs (since tests
-          # can't run in parallel).
-          NPROC=$(getconf _NPROCESSORS_ONLN)
-
-          set -o verbose
-          make ${MAKE_BUILD_ARGS} -j${NPROC} -C src unittesttargets
-
-      - name: Test Vim
-        timeout-minutes: 20
-        run: make ${MAKE_BUILD_ARGS} test
-
-      - name: Test Vim (GUI)
-        timeout-minutes: 20
-        run: |
-          make ${MAKE_BUILD_ARGS} -C src/testdir clean
-          make ${MAKE_BUILD_ARGS} -C src testgui
-
-      # Creates a DMG package of MacVim. Note that this doesn't create a GitHub release for us, because we would prefer to
-      # do it manually, for two reasons: 1) signing / notarization are currently done out of CI, 2) we want to manually
-      # format our release notes and add pictures to make them look nice.
-      - name: Build MacVim dmg image
-        if: startsWith(github.ref, 'refs/tags/') && matrix.publish
-        run: |
-          # Use the --skip-jenkins flag to skip the prettify osascript calls which could fail due to permission issues in
-          # CI environment.
-          if ${{ matrix.legacy == true }}; then
-            make -C src macvim-dmg-legacy CREATEDMG_FLAGS=--skip-jenkins
-          else
-            make -C src macvim-dmg CREATEDMG_FLAGS=--skip-jenkins
-          fi
-
-          if ${{ matrix.publish_postfix != '' }}; then
-            mv src/MacVim/build/Release/MacVim.dmg src/MacVim/build/Release/MacVim${{ matrix.publish_postfix }}.dmg
-          fi
-
-      - name: Upload MacVim image
-        if: startsWith(github.ref, 'refs/tags/') && matrix.publish
-        uses: actions/upload-artifact@v4
-        with:
-          name: MacVim${{ matrix.publish_postfix  }}.dmg
-          path: src/MacVim/build/Release/MacVim${{ matrix.publish_postfix }}.dmg
+    uses: ./.github/workflows/macvim-buildtest.yaml
+    with:
+      skip: ${{ matrix.skip && true || false }}
+      os: ${{ matrix.os }}
+      legacy: ${{ matrix.legacy && true || false }}
+      xcode: ${{ matrix.xcode }}
+      testgui: ${{ matrix.testgui && true || false }}
+      publish: ${{ matrix.publish && true || false }}
+      publish_postfix: ${{ matrix.publish_postfix }}
+      optimized: ${{ matrix.optimized && true || false }}
+      vimtags: ${{ contains(matrix.extra, 'vimtags') }}
+      check-xcodeproj-compat: ${{ contains(matrix.extra, 'check-xcodeproj-compat') }}

.github/workflows/ci-windows.yml

@@ -0,0 +1,362 @@
+name: CI for Windows
+
+on:
+  workflow_call:
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for
+  # pull requests or the commit hash for any other events.
+  group: ${{ github.workflow }}-windows-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  windows:
+    runs-on: windows-2022
+
+    env:
+      # Interfaces
+      # Lua
+      LUA_VER: 54
+      LUA_VER_DOT: "5.4"
+      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
+      # do not want \L to end up in pathdef.c and compiler complaining about unknown escape sequences \l
+      LUA_DIR_SLASH: D:/Lua
+      # Python 2
+      PYTHON_VER: 27
+      PYTHON_VER_DOT: "2.7"
+      PYTHON_DIR: 'C:\Python27'
+      # Python 3
+      PYTHON3_VER: 313
+      PYTHON3_VER_DOT: "3.13"
+      # Other dependencies
+      # winpty
+      WINPTY_URL: https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip
+      # libsodium
+      SODIUM_VER: "1.0.20"
+      # SODIUM_MSVC_URL: https://download.libsodium.org/libsodium/releases/libsodium-%SODIUM_VER%-stable-msvc.zip
+      SODIUM_MSVC_URL: https://github.com/jedisct1/libsodium/releases/download/%SODIUM_VER%-RELEASE/libsodium-%SODIUM_VER%-msvc.zip
+      SODIUM_MSVC_VER: v143
+      # SODIUM_MINGW_URL: https://download.libsodium.org/libsodium/releases/libsodium-%SODIUM_VER%-stable-mingw.tar.gz
+      SODIUM_MINGW_URL: https://github.com/jedisct1/libsodium/releases/download/%SODIUM_VER%-RELEASE/libsodium-%SODIUM_VER%-mingw.tar.gz
+      SODIUM_MINGW_VER: 26
+      # Gettext-tools, iconv and libraries
+      GETTEXT32_URL: https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-shared-32.zip
+      GETTEXT64_URL: https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-shared-64.zip
+      # Escape sequences
+      COL_RED: "\x1b[31m"
+      COL_GREEN: "\x1b[32m"
+      COL_YELLOW: "\x1b[33m"
+      COL_RESET: "\x1b[m"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { features: HUGE,   toolchain: msvc,  VIMDLL: no,  GUI: no,  arch: x64, python3: stable }
+          - { features: HUGE,   toolchain: mingw, VIMDLL: yes, GUI: yes, arch: x86, python3: stable, coverage: yes }
+          - { features: HUGE,   toolchain: msvc,  VIMDLL: no,  GUI: yes, arch: x86 }
+          - { features: HUGE,   toolchain: mingw, VIMDLL: yes, GUI: no,  arch: x64, coverage: yes }
+          - { features: HUGE,   toolchain: msvc,  VIMDLL: no,  GUI: no,  arch: x64, ttytype: conpty }
+          - { features: NORMAL, toolchain: msvc,  VIMDLL: yes, GUI: no,  arch: x86 }
+          - { features: NORMAL, toolchain: mingw, VIMDLL: no,  GUI: yes, arch: x64 }
+          - { features: TINY,   toolchain: msvc,  VIMDLL: yes, GUI: yes, arch: x64 }
+          - { features: TINY,   toolchain: mingw, VIMDLL: no,  GUI: no,  arch: x86 }
+
+    steps:
+      - name: Initialize
+        id: init
+        shell: bash
+        run: |
+          # Show Windows version
+          cmd /c ver
+
+          if ${{ matrix.arch == 'x64' }}; then
+            cygreg=registry
+            pyreg=
+            echo "VCARCH=amd64" >> $GITHUB_ENV
+            echo "WARCH=x64" >> $GITHUB_ENV
+            echo "BITS=64" >> $GITHUB_ENV
+            echo "MSYSTEM=MINGW64" >> $GITHUB_ENV
+          else
+            cygreg=registry32
+            pyreg=-32
+            echo "VCARCH=x86" >> $GITHUB_ENV
+            echo "WARCH=ia32" >> $GITHUB_ENV
+            echo "BITS=32" >> $GITHUB_ENV
+            echo "MSYSTEM=MINGW32" >> $GITHUB_ENV
+          fi
+
+          echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
+          if ${{ matrix.features != 'TINY' }}; then
+            if ${{ matrix.arch == 'x86' }}; then
+              choco install python2 --no-progress --forcex86
+            else
+              choco install python2 --no-progress
+            fi
+          fi
+          python3_dir=$(cat "/proc/$cygreg/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}$pyreg/InstallPath/@")
+          echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV
+
+          if ${{ matrix.toolchain == 'msvc' }}; then
+            SODIUM_DIR=D:\\libsodium
+            echo "SODIUM_LIB=${SODIUM_DIR}\\${{ matrix.arch == 'x64' && 'x64' || 'Win32' }}\\Release\\${SODIUM_MSVC_VER}\\dynamic" >> $GITHUB_ENV
+          else
+            SODIUM_DIR=D:\\libsodium-win${{ matrix.arch == 'x64' && '64' || '32' }}
+            # do not want \L to end up in pathdef.c and compiler complaining about unknown escape sequences \l
+            SODIUM_DIR_SLASH=D:/libsodium-win${{ matrix.arch == 'x64' && '64' || '32' }}
+            echo "SODIUM_LIB=${SODIUM_DIR}\\bin" >> $GITHUB_ENV
+            echo "SODIUM_DIR_SLASH=${SODIUM_DIR_SLASH}" >> $GITHUB_ENV
+          fi
+          echo "SODIUM_DIR=${SODIUM_DIR}" >> $GITHUB_ENV
+          echo "GETTEXT_PATH=D:\gettext${{ matrix.arch == 'x64' && '64' || '32' }}" >> $GITHUB_ENV
+
+      - uses: msys2/setup-msys2@v2.31.1
+        if: matrix.toolchain == 'mingw'
+        with:
+          update: true
+          install: tar
+          pacboy: >-
+            make:p gcc:p
+          msystem: ${{ env.MSYSTEM }}
+          release: false
+
+      - name: Checkout repository from GitHub
+        uses: actions/checkout@v6
+
+      - name: Create a list of download URLs
+        shell: cmd
+        run: |
+          type NUL > urls.txt
+          echo %LUA_RELEASE%>> urls.txt
+          echo %WINPTY_URL%>> urls.txt
+          echo %SODIUM_VER%>> urls.txt
+          echo %GETTEXT32_URL%>> urls.txt
+          echo %GETTEXT64_URL%>> urls.txt
+
+      - name: Cache downloaded files
+        uses: actions/cache@v5.0.5
+        with:
+          path: downloads
+          key: ${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('urls.txt') }}
+
+      - name: Download dependencies
+        shell: cmd
+        run: |
+          path C:\Program Files\7-Zip;%path%
+          if not exist downloads mkdir downloads
+
+          echo %COL_GREEN%Download Lua%COL_RESET%
+          call :downloadfile %LUA${{ env.BITS }}_URL% downloads\lua.zip
+          7z x downloads\lua.zip -o%LUA_DIR% > nul || exit 1
+
+          if not "${{ matrix.ttytype }}" == "conpty" (
+            echo %COL_GREEN%Download winpty%COL_RESET%
+            call :downloadfile %WINPTY_URL% downloads\winpty.zip
+            7z x -y downloads\winpty.zip -oD:\winpty > nul || exit 1
+            copy /Y D:\winpty\%WARCH%\bin\winpty.dll        src\winpty%BITS%.dll
+            copy /Y D:\winpty\%WARCH%\bin\winpty-agent.exe  src\
+          )
+
+          echo %COL_GREEN%Download libsodium%COL_RESET%
+          if "${{ matrix.toolchain }}"=="msvc" (
+            call :downloadfile %SODIUM_MSVC_URL% downloads\libsodium.zip
+            7z x -y downloads\libsodium.zip -oD:\ > nul || exit 1
+          ) else (
+            call :downloadfile %SODIUM_MINGW_URL% downloads\libsodium.tar.gz
+            7z x -y downloads\libsodium.tar.gz -so | 7z x -si -ttar -oD:\ > nul || exit 1
+            mklink %SODIUM_LIB%\libsodium.dll %SODIUM_LIB%\libsodium-%SODIUM_MINGW_VER%.dll
+          )
+
+          echo %COL_GREEN%Download Gettext%COL_RESET%
+          call :downloadfile %GETTEXT${{ env.BITS }}_URL% downloads\gettext${{ env.BITS }}.zip
+          7z e -y downloads\gettext${{ env.BITS }}.zip -oD:\gettext${{ env.BITS }} > nul || exit 1
+          copy /y D:\gettext${{ env.BITS }}\libintl-8.dll src\ || exit 1
+          copy /y D:\gettext${{ env.BITS }}\libiconv-2.dll src\ || exit 1
+
+          goto :eof
+
+          :downloadfile
+          :: call :downloadfile <URL> <localfile>
+          if not exist %2 (
+            curl -f -L %1 -o %2
+          )
+          if ERRORLEVEL 1 (
+            rem Retry once.
+            curl -f -L %1 -o %2 || exit 1
+          )
+          goto :eof
+
+      - name: Build (MSVC)
+        if: matrix.toolchain == 'msvc'
+        shell: cmd
+        run: |
+          call "%VCVARSALL%" %VCARCH%
+          cd src
+          if "${{ matrix.VIMDLL }}"=="yes" (
+            set GUI=yes
+          ) else (
+            set GUI=${{ matrix.GUI }}
+          )
+          if "${{ matrix.python3 }}"=="stable" (
+            set PYTHON3_STABLE=yes
+          ) else (
+            set PYTHON3_STABLE=no
+          )
+          if "${{ matrix.features }}"=="HUGE" (
+            nmake -nologo -f Make_mvc.mak ^
+              FEATURES=${{ matrix.features }} ^
+              GUI=%GUI% IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} ^
+              DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
+              DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^
+              DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
+              DYNAMIC_PYTHON3_STABLE_ABI=%PYTHON3_STABLE% ^
+              DYNAMIC_SODIUM=yes SODIUM=%SODIUM_DIR% ^
+              CI_FLAGS=/we4267
+          ) else (
+            nmake -nologo -f Make_mvc.mak ^
+              FEATURES=${{ matrix.features }} ^
+              GUI=%GUI% IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} ^
+              CI_FLAGS=/we4267
+          )
+
+      - name: Build (MinGW)
+        if: matrix.toolchain == 'mingw'
+        shell: msys2 {0}
+        run: |
+          cd src
+          if [ "${{ matrix.VIMDLL }}" = "yes" ]; then
+            GUI=yes
+          else
+            GUI=${{ matrix.GUI }}
+          fi
+          if [ "${{ matrix.python3 }}" = "stable" ]; then
+            PYTHON3_STABLE=yes
+          else
+            PYTHON3_STABLE=no
+          fi
+          if [ "${{ matrix.features }}" = "HUGE" ]; then
+            mingw32-make -f Make_ming.mak -j2 \
+              FEATURES=${{ matrix.features }} \
+              GUI=$GUI IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} \
+              DYNAMIC_LUA=yes LUA=${LUA_DIR_SLASH} \
+              DYNAMIC_PYTHON=yes PYTHON=${PYTHON_DIR} \
+              DYNAMIC_PYTHON3=yes PYTHON3=${PYTHON3_DIR} \
+              DYNAMIC_PYTHON3_STABLE_ABI=${PYTHON3_STABLE} \
+              DYNAMIC_SODIUM=yes SODIUM=${SODIUM_DIR_SLASH} \
+              STATIC_STDCPLUS=yes COVERAGE=${{ matrix.coverage }}
+          else
+            mingw32-make -f Make_ming.mak -j2 \
+              FEATURES=${{ matrix.features }} \
+              GUI=$GUI IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} \
+              STATIC_STDCPLUS=yes
+          fi
+
+      - name: Check version
+        shell: cmd
+        run: |
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PYTHON3_DIR%;%PATH%
+          if "${{ matrix.GUI }}"=="yes" (
+            start /wait src\gvim -u NONE -i NONE -c "redir > version.txt | ver | q" || exit 1
+            type version.txt
+            echo.
+            start /wait src\gvim -u NONE -i NONE -c "redir! > version.txt | so ci\if_ver-1.vim | q"
+            start /wait src\gvim -u NONE -i NONE -c "redir >> version.txt | so ci\if_ver-2.vim | q"
+            type version.txt
+            del version.txt
+          ) else (
+            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
+            if "${{ matrix.features }}"=="HUGE" (
+              src\vim -u NONE -i NONE --not-a-term -esNX -V1 ^
+                -c "let g:required=['gettext', 'sodium', 'sound', 'python3', 'lua']" ^
+                -S ci/if_feat_check.vim -c quit
+            )
+          )
+
+      #- name: Prepare Artifact
+      #  shell: cmd
+      #  run: |
+      #    mkdir artifacts
+      #    copy src\*vim.exe artifacts
+      #    copy src\vim*.dll artifacts
+      #
+      #- name: Upload Artifact
+      #  uses: actions/upload-artifact@v7
+      #  with:
+      #    name: vim${{ matrix.bits }}-${{ matrix.toolchain }}
+      #    path: ./artifacts
+
+      # disabled because of https://github.com/tunisiano187/Chocolatey-packages/issues/3916
+      #- name: Install packages for testing
+      #  shell: bash
+      #  run: |
+      #    if ${{ matrix.features != 'TINY' }}; then
+      #      if ${{ matrix.arch == 'x64' }}; then
+      #        choco install netbeans --no-progress
+      #      else
+      #        exit 0
+      #      fi
+      #    fi
+
+      - name: Test and show the result of testing gVim
+        if: matrix.GUI == 'yes' || matrix.VIMDLL == 'yes'
+        shell: cmd
+        timeout-minutes: 15
+        run: |
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PYTHON3_DIR%;%PATH%;%SODIUM_LIB%
+          call "%VCVARSALL%" %VCARCH%
+
+          echo %COL_GREEN%Test gVim:%COL_RESET%
+          cd src\testdir
+          if "${{ matrix.GUI }}"=="yes" (
+            nmake -nologo -f Make_mvc.mak VIMPROG=..\gvim || exit 1
+          ) else (
+            @rem Run only tiny tests.
+            nmake -nologo -f Make_mvc.mak tiny VIMPROG=..\gvim  || exit 1
+          )
+
+      - name: Test and show the result of testing Vim
+        if: matrix.GUI == 'no' || matrix.VIMDLL == 'yes'
+        shell: cmd
+        timeout-minutes: 15
+        run: |
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PYTHON3_DIR%;%PATH%;%SODIUM_LIB%
+          call "%VCVARSALL%" %VCARCH%
+
+          echo %COL_GREEN%Test Vim:%COL_RESET%
+          cd src\testdir
+          nmake -nologo -f Make_mvc.mak clean
+          if "${{ matrix.GUI }}"=="no" (
+            nmake -nologo -f Make_mvc.mak VIMPROG=..\vim || exit 1
+          ) else (
+            @rem Run only tiny tests.
+            nmake -nologo -f Make_mvc.mak tiny VIMPROG=..\vim  || exit 1
+          )
+
+      - name: Upload failed test artifacts
+        if: ${{ !cancelled() }}
+        uses: ./.github/actions/test_artifacts
+
+      - name: Generate gcov files
+        if: matrix.coverage
+        shell: msys2 {0}
+        run: |
+          cd src
+          find . -type f -name '*.gcno' -exec gcov -pb {} + || true
+
+      - name: Codecov
+        timeout-minutes: 20
+        if: matrix.coverage
+        uses: codecov/codecov-action@v6
+        with:
+          directory: src
+          flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -44,11 +44,11 @@ jobs:
 
     steps:
     - name: Checkout repository from github
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4.36.0
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,7 +59,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4.36.0
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -73,4 +73,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4.36.0

.github/workflows/coverity.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   scan:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     env:
       CC: gcc
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Checkout repository from github
         if: env.TOKEN
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Download Coverity
         if: env.TOKEN
@@ -36,7 +36,6 @@ jobs:
             gettext \
             libcanberra-dev \
             libperl-dev \
-            python2-dev \
             python3-dev \
             liblua5.4-dev \
             lua5.4 \
@@ -53,7 +52,7 @@ jobs:
           echo "$(pwd)/cov-scan/bin" >> $GITHUB_PATH
           (
           echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
-          echo "CONFOPT=--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
+          echo "CONFOPT=--enable-perlinterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
           ) >> $GITHUB_ENV
 
       - name: Configure

.github/workflows/label.yml

@@ -17,6 +17,6 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@v6.1.0
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/link-check.yml

@@ -0,0 +1,15 @@
+# .github/workflows/link-check.yml
+name: Check Links
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 3 * * 0' # Every Sunday at 03:00 UTC
+jobs:
+  lychee:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Run Lychee
+        uses: lycheeverse/lychee-action@v2
+        with:
+          args: --verbose --config ci/lychee.toml .

.github/workflows/macvim-buildtest.yaml

@@ -0,0 +1,448 @@
+name: MacVim Build and Test
+
+# Child workflow to be called by other workflows for building/testing MacVim
+
+on:
+  workflow_call:
+    inputs:
+      skip:
+        type: boolean
+      os:
+        type: string
+      legacy:
+        type: boolean
+      xcode:
+        type: string
+      testgui:
+        type: boolean
+      publish:
+        type: boolean
+      publish_postfix:
+        type: string
+      optimized:
+        type: boolean
+      vimtags:
+        type: boolean
+      check-xcodeproj-compat:
+        type: boolean
+
+env:
+  MACOSX_DEPLOYMENT_TARGET: '10.13'
+  MACOSX_DEPLOYMENT_TARGET_LEGACY: '10.9'
+
+  MACVIM_ARCHS: "x86_64 arm64"  # Universal app for Intel/Apple Silicon
+  MACVIM_ARCHS_LEGACY: "x86_64 arm64" # Build universal for legacy too, mostly just to make building/testing on Apple Silicon CI work. In reality all Apple Silicon Macs shoud use non-legacy.
+
+  CC: clang
+
+  MAKE_BUILD_ARGS: LINK_AS_NEEDED=yes # In macOS we never over-specify link dependencies and we already check against external deps in smoketest. With LTO, linking takes a while, so we want to avoid using link.sh.
+
+  vi_cv_path_python: /Library/Frameworks/Python.framework/Versions/2.7/bin/python
+  vi_cv_path_python3: "%s/bin/python3"
+  vi_cv_path_plain_lua: "%s/bin/lua"
+  vi_cv_path_ruby: "%s/opt/ruby/bin/ruby"
+  vi_cv_dll_name_perl: /System/Library/Perl/%s/darwin-thread-multi-2level/CORE/libperl.dylib
+  vi_cv_dll_name_python: /Library/Frameworks/Python.framework/Versions/2.7/Python
+  vi_cv_dll_name_python3: /usr/local/Frameworks/Python.framework/Versions/Current/Python
+  vi_cv_dll_name_python3_arm64: /opt/homebrew/Frameworks/Python.framework/Versions/Current/Python
+  vi_cv_dll_name_ruby: /usr/local/opt/ruby/lib/libruby.dylib
+  vi_cv_dll_name_ruby_arm64: /opt/homebrew/opt/ruby/lib/libruby.dylib
+  vi_cv_dll_name_lua: /usr/local/lib/liblua.dylib
+  vi_cv_dll_name_lua_arm64: /opt/homebrew/lib/liblua.dylib
+
+  MACVIM_APP: src/MacVim/build/Release/MacVim.app
+  VIM_BIN: src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
+  MACVIM_BIN: src/MacVim/build/Release/MacVim.app/Contents/MacOS/MacVim
+
+  TERM: xterm
+  BASH_SILENCE_DEPRECATION_WARNING: 1
+
+jobs:
+  # Builds and test MacVim
+  build-and-test:
+    if: ${{ !inputs.skip }}
+    runs-on: ${{ inputs.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up legacy build
+        if: inputs.legacy
+        run: |
+          # Set the correct build env vars to target the correct architectures and min OS targets.
+          echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET_LEGACY" >> $GITHUB_ENV
+          echo "MACVIM_ARCHS=$MACVIM_ARCHS_LEGACY" >> $GITHUB_ENV
+
+          # Use Sparkle 1 because Sparkle 2 requires newer OS version than our legacy build.
+          # Later, we pass the --enable-sparkle_1 flag to configure to set the corresponding ifdef.
+          ln -fhs Sparkle_1.framework src/MacVim/Sparkle.framework
+
+          # Sparkle shows a dialog asking if the user wants to check for updates on 2nd launch of
+          # MacVim. On Sparkle 1 this is annoyingly a modal dialog box and interferes with tests.
+          # Just disable it by pre-setting to not check for updates.
+          defaults write org.vim.MacVim SUEnableAutomaticChecks 0
+
+      - name: Set up Xcode
+        if: inputs.xcode != ''
+        run: |
+          sudo xcode-select -s /Applications/Xcode_${{ inputs.xcode }}.app/Contents/Developer
+          xcode-select -p
+          xcodebuild -version
+
+      # Set up, install, and cache GNU libiconv library to work around Apple iconv issues in newer macOS versions.
+
+      - name: Set up libiconv
+        if: inputs.publish && !inputs.legacy
+        uses: ./.github/actions/universal-package
+        with:
+          formula: libiconv
+          contents: opt/libiconv/lib/libiconv.a,opt/libiconv/lib/libiconv.dylib
+
+      # Set up, install, and cache gettext library for localization.
+
+      - name: Set up gettext
+        if: inputs.publish
+        uses: ./.github/actions/universal-package
+        with:
+          formula: gettext
+          contents: lib/libintl.a,lib/libintl.dylib
+          gnuiconv: ${{ inputs.legacy == false }}  # gettext needs to match MacVim in using the same version of iconv
+
+      # Set up, install, and cache libsodium library for encryption.
+
+      - name: Set up libsodium
+        if: inputs.publish
+        uses: ./.github/actions/universal-package
+        with:
+          formula: libsodium
+          contents: lib/libsodium.a,lib/libsodium.dylib
+
+      # Set up remaining packages and tools
+
+      - name: Install packages
+        run: |
+          brew install --quiet libtool
+
+      - name: Install packages for testing
+        run: |
+          # Apple diff is broken. Use GNU diff instead. See http://github.com/vim/vim/issues/14056.
+          brew install --quiet diffutils
+
+      # Cache Python 2 to avoid downloading the installer every time. This cache shouldn't change
+      # over time as Python 2.7 is legacy.  Can't directly cache to
+      # /Library/Frameworks/Python.framework due to permission issues.
+      #
+      # Note: Legacy self-hosted runner already has this installed and doesn't need this.
+      - name: Cache Python 2
+        if: inputs.publish && !inputs.legacy
+        uses: actions/cache@v5
+        with:
+          path: python27-cache
+          key: ${{ inputs.os }}-python27
+
+      - name: Install scripting runtimes
+        if: inputs.publish
+        run: |
+          # We no longer need to install/update Python 3, as it's guaranteed to
+          # be installed on runners. Since we use stable ABI, the exact version
+          # on CI does not matter.
+
+          brew install --quiet ruby
+          brew install --quiet lua
+
+          if [[ -d $(brew --prefix)/Cellar/perl ]]; then
+            # We just use system perl to reduce dependencies
+            brew unlink perl
+          fi
+
+          echo "vi_cv_path_python3=$(printf $vi_cv_path_python3 $(brew --prefix))" >> $GITHUB_ENV
+          echo "vi_cv_path_plain_lua=$(printf $vi_cv_path_plain_lua $(brew --prefix))" >> $GITHUB_ENV
+          echo "vi_cv_path_ruby=$(printf $vi_cv_path_ruby $(brew --prefix))" >> $GITHUB_ENV
+
+          # With Perl, we need to manually specify the version number because the dylib path depends on it.
+          export PERL_VERSION=$(perl -e 'print $^V =~ s/v(\d\.\d+).*/\1/r')
+          echo "vi_cv_dll_name_perl=$(printf $vi_cv_dll_name_perl $PERL_VERSION)" >> $GITHUB_ENV
+
+          # New runner images (macos-13) no longer have Python2 installed. We
+          # need to install Python2 manually. Installing from the official
+          # installer is the easiest way as Homebrew no longer ships python@2
+          # and this way does not invole manual building from source. We
+          # mostly only need the headers to build a dynamic build anyway.
+          #
+          # This will be removed in the future as Python2 has been completely
+          # unsupported for years.
+          if [ -d /Library/Frameworks/Python.framework/Versions/2.7 ]; then
+            echo "Python 2.7 already installed"
+          elif [ -d python27-cache ]; then
+            sudo cp -R python27-cache /Library/Frameworks/Python.framework/Versions/2.7
+          else
+            curl https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg -o ~/Downloads/python-2.7.18-macosx10.9.pkg
+            sudo installer -pkg ~/Downloads/python-2.7.18-macosx10.9.pkg -target /
+            cp -R /Library/Frameworks/Python.framework/Versions/2.7 python27-cache # Allow this to be cached
+          fi
+
+      # All set up steps are done. Build and test MacVim below.
+
+      - name: Configure
+        run: |
+          set -o verbose
+
+          CONFOPT=(
+            --with-local-dir=$(brew --prefix)
+            --with-features=huge
+            --enable-netbeans
+            --with-tlib=ncurses
+            --enable-cscope
+            --enable-gui=macvim
+            --with-compiledby="GitHub Actions"
+          )
+          if ${{ inputs.publish == true }}; then
+            CONFOPT+=(
+              --enable-perlinterp=dynamic
+              --enable-pythoninterp=dynamic
+              --enable-python3interp=dynamic
+              --with-python3-stable-abi=3.9 # macOS and Xcode currently ships 3.9, so we don't want go higher than that.
+              --enable-rubyinterp=dynamic
+              --enable-luainterp=dynamic
+              --with-lua-prefix=$(brew --prefix)
+              --with-macarchs="$MACVIM_ARCHS"
+            )
+          else
+            CONFOPT+=(
+              --disable-sparkle       # Disable Sparkle for testing that this flag builds and works
+              --enable-nls=no --enable-libsodium=no # Disable gettext and libsodium unless we built them ourselves for publish
+            )
+          fi
+          if ${{ inputs.legacy == true }}; then
+            CONFOPT+=(
+              --enable-sparkle_1
+            )
+          fi
+          echo "CONFOPT: ${CONFOPT[@]}"
+
+          ./configure "${CONFOPT[@]}" --enable-fail-if-missing
+
+          sed -i.bak -f ci/config.mk.sed -f ci/config.mk.clang.sed -f ci/config.mk.xcode.sed src/auto/config.mk
+          if clang --version | grep -qs '^Apple clang version \(1[3-9]\|[2-9]\d\)\.'; then
+            sed -i.bak -f ci/config.mk.clang-12.sed src/auto/config.mk
+          fi
+
+          if ${{ inputs.optimized == true }}; then
+            # Additional optimizations like link-time optimizations that are a bit slower to build.
+            sed -i.bak -f ci/config.mk.optimized.sed src/auto/config.mk
+          fi
+
+          if ${{ inputs.publish == true && inputs.legacy == false }}; then
+            # Use Homebrew GNU libiconv since Apple iconv has been broken since macOS 14
+            sed -i.bak -f ci/config.mk.brew-libiconv.sed src/auto/config.mk
+          fi
+
+      - name: Modify configure result
+        if: inputs.publish
+        run: |
+          set -o verbose
+          # Ruby is keg-only in Homebrew, so need to manually link in the path so Vim will know where to look for the binaries.
+          perl -p -i -e "s#(?<=-DDYNAMIC_RUBY_DLL=\\\\\").*?(?=\\\\\")#${vi_cv_dll_name_ruby}#" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_PERL_DLL=\\\\\"${vi_cv_dll_name_perl}\\\\\"" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_PYTHON_DLL=\\\\\"${vi_cv_dll_name_python}\\\\\"" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_PYTHON3_DLL=\\\\\"${vi_cv_dll_name_python3}\\\\\"" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_RUBY_DLL=\\\\\"${vi_cv_dll_name_ruby}\\\\\"" src/auto/config.mk
+
+          # Also search for the arm64 overrides for the default library locations, which are different from x86_64
+          # because Homebrew puts them at a different place.
+          grep -q -- "-DDYNAMIC_PYTHON3_DLL_ARM64=\\\\\"${vi_cv_dll_name_python3_arm64}\\\\\"" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_RUBY_DLL_ARM64=\\\\\"${vi_cv_dll_name_ruby_arm64}\\\\\"" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_LUA_DLL_ARM64=\\\\\"${vi_cv_dll_name_lua_arm64}\\\\\"" src/auto/config.mk
+
+      - name: Show configure output
+        run: |
+          cat src/auto/config.mk
+          cat src/auto/config.h
+
+      - name: Build
+        env:
+          LC_ALL: C
+        run: |
+          NPROC=$(getconf _NPROCESSORS_ONLN)
+          echo "Building MacVim with ${NPROC} cores"
+
+          set -o verbose
+          make ${MAKE_BUILD_ARGS} -j${NPROC}
+
+      - name: Check version
+        run: |
+          ${VIM_BIN} --version
+          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -c 'echo "\nprof_nsec:" .. has("prof_nsec") .. "\n"' -c quit
+          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
+          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
+
+      - name: Smoketest
+        run: |
+          set -o verbose
+
+          # Make sure there isn't any dynamic linkage to third-party dependencies in the built binary, as we should only use
+          # static linkage to avoid dependency hell. Test that all those dylib's are in /usr/lib which is bundled with macOS and not third-party.
+          if otool -L ${VIM_BIN} | grep '\.dylib\s' | grep -v '^\s*/usr/lib/'; then
+            echo 'Found external dynamic linkage!'; false
+          fi
+
+          if ${{ inputs.publish == true && inputs.legacy == false }}; then
+            # Make sure we are not using system iconv, which has been buggy since macOS 14.
+            if otool -L ${VIM_BIN} | grep '^\s*/usr/lib/libiconv'; then
+              echo 'Using system iconv! We should be linking against GNU iconv instead.'; false
+            fi
+          fi
+
+          # Make sure that --disable-sparkle flag will properly exclude all references to Sparkle symbols. This is
+          # necessary because we still use weak linking to Sparkle when that flag is set and so references to Sparkle
+          # wouldn't fail the build (we just remove Sparkle.framework from the built app after the fact).
+          if ${{ inputs.publish == false }}; then
+            # Currently we pass --disable-sparkle flag when publish==false
+            if objdump -t ${MACVIM_BIN} | grep "_SPU\|_SUUpdate"; then
+              echo 'Found references to Sparkle even when using --disable-sparkle'; false
+            fi
+          fi
+
+          # Make sure man pages were bundled
+          man -M `pwd`/${MACVIM_APP}/Contents/man -w mvim
+
+          # Make sure xxd was bundled
+          echo "AB" | ${MACVIM_APP}/Contents/bin/xxd | grep "4142"
+
+      - name: Smoketest (publish)
+        if: inputs.publish
+        run: |
+          set -o verbose
+
+          macvim_excmd() {
+            ${VIM_BIN} -u NONE -i NONE -g -f -X -V1 -es "$@" -c 'echo ""' -c 'qall!' 2>&1
+          }
+
+          # Smoketest scripting languages
+          macvim_excmd -c 'lua print("Test")'     | grep Test
+          macvim_excmd -c 'perl VIM::Msg("Test")' | grep Test
+          macvim_excmd -c 'py3 print("Test")'     | grep Test
+          macvim_excmd -c 'ruby puts("Test")'     | grep Test
+
+          if [[ "$(uname -m)" == "x86_64" ]]; then
+            macvim_excmd -c 'py print "x86 Test"' | grep Test
+          else
+            # Python2 doesn't work in Apple Silicon, test under Rosetta
+            (VIM_BIN="arch -x86_64 ${VIM_BIN}"; macvim_excmd -c 'py print "rosetta Test"' | grep Test)
+          fi
+
+          # Check that localized messages work by printing ':version' and checking against localized word
+          macvim_excmd -c 'lang es_ES' -c 'version' | grep Enlazado
+
+          # Check that libsodium is working
+          macvim_excmd -c 'set cryptmethod=xchacha20v2'
+
+          # Make sure we are building universal x86_64 / arm64 builds and didn't accidentally create a thin app.
+          check_arch() {
+            local archs=($(lipo -archs "$1"))
+            if [[ ${archs[@]} != "$MACVIM_ARCHS" ]]; then
+              echo "Wrong arch(s) in $1: ${archs[@]}"; false
+            else
+              lipo -info "$1"
+            fi
+          }
+          check_arch "${VIM_BIN}"
+          check_arch "${MACVIM_BIN}"
+
+      - name: Check Vim help tags
+        if: inputs.vimtags
+        run: |
+          # Confirm that we can build the help tags, and they match what's in source.
+          make -C runtime/doc vimtags VIMEXE=../../${VIM_BIN}
+          git diff --exit-code -- runtime/doc/tags
+
+      - name: Check Xcode project compatibility version
+        if: inputs['check-xcodeproj-compat']
+        run: |
+          # Confirm that the compatibility version of xcodeproj is correct and not outdated.
+          rm -rf src/MacVim/MacVim_xcode8.xcodeproj
+          make -C src macvim-xcodeproj-compat
+          if ! git diff --exit-code -- src/MacVim/MacVim_xcode8.xcodeproj; then
+            echo 'MacVim_xcode8.xcodeproj is outdated. Run "make -C src macvim-xcodeproj-compat" to re-generate it.'; false
+          fi
+
+      - name: Test MacVim
+        id: test_macvim
+        timeout-minutes: 10
+        run: |
+          echo '::group::Build MacVim test binaries'
+          # Build test binaries in a separate step to allow grouping in the CI output to make the output more concise.
+          make ${MAKE_BUILD_ARGS} -C src macvim-tests-binaries
+          echo '::endgroup::'
+          make ${MAKE_BUILD_ARGS} -C src macvim-tests
+
+      - name: Upload failed MacVim test results
+        if: ${{ !cancelled() && failure() && steps.test_macvim.conclusion == 'failure' }}
+        uses: ./.github/actions/test_macvim_artifacts
+        with:
+          artifact-name: ${{ format('{0}-{1}', inputs.os, inputs.xcode) }}
+
+      - name: Build Vim test binaries
+        run: |
+          # Build the unit test binaries first. With link-time-optimization they take some time to link. Running them
+          # separately de-couples them from the timeout in tests, and allow us to build in parallel jobs (since tests
+          # can't run in parallel).
+          NPROC=$(getconf _NPROCESSORS_ONLN)
+
+          set -o verbose
+          make ${MAKE_BUILD_ARGS} -j${NPROC} -C src unittesttargets
+
+      - name: Test Vim
+        if: startsWith(github.ref, 'refs/tags/') || !inputs.testgui
+        timeout-minutes: 30
+        run: |
+          defaults delete org.vim.MacVim  # Clean up stale states
+          # Currently we don't run any non-src tests, as syntax tests are fragile and prone to spamming escape codes.
+          # This needs to be investigated and fixed upstream.
+          # MacVim is unlikely to introduce breaking changes in runtime files anyway.
+          make ${MAKE_BUILD_ARGS} -C src test
+
+      - name: Test Vim (GUI)
+        if: startsWith(github.ref, 'refs/tags/') || inputs.testgui
+        timeout-minutes: 30
+        run: |
+          defaults delete org.vim.MacVim  # Clean up stale states
+          make ${MAKE_BUILD_ARGS} -C src/testdir clean
+          make ${MAKE_BUILD_ARGS} -C src testgui
+
+      - name: Upload failed test files
+        if: ${{ !cancelled() && failure() }}
+        uses: ./.github/actions/test_artifacts
+        with:
+          artifact-name: ${{ format('{0}-{1}', inputs.os, inputs.xcode) }}
+
+      - name: Build MacVim dmg image
+        if: inputs.publish && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master')
+        run: |
+          if ${{ inputs.legacy == true }}; then
+            make -C src macvim-dmg-legacy
+          else
+            make -C src macvim-dmg
+          fi
+
+          if ${{ inputs.publish_postfix != '' }}; then
+            mv src/MacVim/build/Release/MacVim.dmg src/MacVim/build/Release/MacVim${{ inputs.publish_postfix }}.dmg
+          fi
+
+      # Upload the dmg installer only when making tagged release or making a dev build from a master branch.
+      # Note that this doesn't create a GitHub release for us, because we would prefer to do it manually, for two
+      # reasons: 1) signing / notarization are currently done out of CI, 2) we want to manually format our release notes
+      # and add pictures to make them look nice. 
+      - name: Upload MacVim image
+        if: inputs.publish && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master')
+        uses: actions/upload-artifact@v7
+        with:
+          name: MacVim${{ inputs.publish_postfix  }}.dmg
+          path: src/MacVim/build/Release/MacVim${{ inputs.publish_postfix }}.dmg
+
+          # If doing a tagged release, use repository-specified number of retention days (usually 90 days) to make it
+          # easier to audit. (specify "0" to indicate using repository settings)
+          #
+          # Otherwise, we are just doing a dev build for potential testing, just use a maximum of 21 days as we don't
+          # tend to need these for long.
+          retention-days: ${{ startsWith(github.ref, 'refs/tags/') && 0 || (github.retention_days > 21 && 21 || 0) }}

.github/workflows/macvim-issues.yaml

@@ -10,7 +10,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           any-of-labels: "Response Needed"
           days-before-stale: 45

.gitignore

@@ -11,6 +11,7 @@ src/objects
 src/po/big5corr
 src/po/sjiscorr
 src/types.vim
+src/tmp_make
 
 # We do need src/auto/configure.
 src/auto/config.cache
@@ -22,6 +23,8 @@ src/auto/osdef.h
 src/auto/link.log
 src/auto/link.sed
 src/auto/pathdef.c
+src/auto/wayland/*.c
+src/auto/wayland/*.h
 
 # Windows
 *.exe
@@ -64,7 +67,6 @@ src/xxd/xxd.dSYM
 *~
 *.pyc
 *.log
-src/po/vim.pot
 src/tags
 /tags
 /GPATH
@@ -148,6 +150,11 @@ src/xxd/xxd
 src/xxd/xxd.dSYM
 src/a.out.dSYM
 
+runtime/syntax/testdir/done/
+runtime/syntax/testdir/messages
+runtime/syntax/testdir/testdeps.mk
+runtime/syntax/testdir/vimcmd
+
 # Generated by "make install"
 runtime/doc/doctags
 runtime/doc/tags-*
@@ -163,6 +170,8 @@ src/shadow
 src/shadow-*
 src/runtime
 src/pixmaps
+src/LICENSE
+src/README.txt
 
 # other files possibly created by tools
 src/cscope.out

.hgignore

@@ -24,6 +24,8 @@ src/auto/osdef.h
 src/auto/link.log
 src/auto/link.sed
 src/auto/pathdef.c
+src/auto/wayland/*.c
+src/auto/wayland/*.h
 
 # Windows
 *.exe
@@ -66,7 +68,6 @@ src/xxd/xxd.dSYM
 *~
 *.pyc
 *.log
-src/po/vim.pot
 src/tags
 /tags
 /GPATH
@@ -98,21 +99,33 @@ src/json_test
 src/message_test
 src/kword_test
 
+runtime/syntax/testdir/done/
+runtime/syntax/testdir/messages
+runtime/syntax/testdir/testdeps.mk
+runtime/syntax/testdir/vimcmd
+
 # Generated by "make install"
 runtime/doc/doctags
 runtime/doc/tags-*
 
+# Temporarily generated by "runtime/syntax/generator/make"
+runtime/syntax/generator/generator.err
+runtime/syntax/generator/sanity_check.err
+runtime/syntax/generator/vim.vim.rc
+
 # Generated by "make shadow".  The directory names could be anything but we
 # restrict them to shadow (the default) or shadow-*
 src/shadow
 src/shadow-*
 src/runtime
 src/pixmaps
+src/LICENSE
+src/README.txt
 
 # other files possibly created by tools
 src/cscope.out
 
 # Linter/language server files
-/.cache/clangd/
-/.ccls-cache/
-/compile_commands.json
+.cache/clangd/
+.ccls-cache/
+compile_commands.json

AGENTS.md

@@ -0,0 +1,325 @@
+# AGENTS.md
+
+Guidance for AI coding agents working in the Vim repository.
+
+## Project
+
+Vim is a text editor written in C. The canonical repository is
+https://github.com/vim/vim. The code is old and has grown organically over
+the past 30+ years. Some files are vendored from upstream projects
+(`src/xdiff`, `src/libvterm`); parts of the runtime are occasionally shared
+with forks like Neovim.
+
+Vim strives to be portable across several different operating systems and
+aims to be a stable, robust editor gradually developing new features while
+remaining backwards compatible as much as possible.
+
+At the same time, Vim can be compiled with different feature sets, from the
+POSIX compatible minimal vi to a full-fledged GUI editor which includes
+additional scripting interfaces.
+
+See `runtime/doc/develop.txt` for the high level design goals.
+
+## Build and test
+
+    # Full build on Unix/Linux (from src/):
+    make
+
+    # Run the full test suite:
+    make test
+
+    # Generate proto files
+    make proto
+
+    # Run a single test file:
+    cd src/testdir && make test_name.res
+
+Output is in testdir/messages and testdir/test.log
+
+Builds on Windows depend on the Environment, see `src/INSTALLpc.txt`
+for Cygwin/MSYS and MSVC ways to build Vim
+
+Before submitting any patch, at minimum:
+1. The build succeeds without new warnings.
+2. Relevant tests pass.
+3. The code matches the style of the file being edited.
+
+## Layout
+
+- `src/` - the C source. Subsystem names are usually obvious from filenames
+  (`buffer.c`, `window.c`, `search.c`, `vim9compile.c`, etc.).
+- `src/proto/` - function prototypes, one `.pro` file per source file.
+  Regenerated; do not hand-edit unless you know what you're doing.
+- `src/po` - Translations
+- `src/xxd` - for the xxd subproject
+- `src/xdiff` - for the xdiff library (imported from git)
+- `src/libvterm` - for the libvterm library
+- `src/testdir/` - tests. Vim-script files named `test_*.vim`.
+  Screendump expected output lives in `src/testdir/dumps/`.
+- `runtime/doc/` - user-facing documentation in Vim help format, when updating,
+  also update the Last Change header
+- `runtime/syntax/generator` - Syntax script for Vim Script, automatically generated
+  from Vims source
+- `runtime/`  - runtime files shipped with Vim, when updating, also update the
+  Last Change header and a short description if this file has no maintainer
+  If the file has a maintainer, changes should go via them (so make a merge
+  request against the upstream repo instead)
+- `src/version.c` - contains the `included_patches[]` list. Every
+  patch touching anything below `src/` (with the exception of `src/po`) needs a
+  new entry at the top, will be updated only when merging into
+  the master tree.
+
+## Commit format
+
+Vim uses a strict commit message format. The subject line is a
+one-sentence **problem statement**, not a description of the fix:
+
+    patch 9.2.NNNN: short description of the problem
+
+    Problem:  Restatement of the problem as a full sentence, possibly
+              with a reporter attribution in parentheses.
+    Solution: Short description of the fix, ending with the author's
+              name in parentheses.
+
+    optional longer description of the problem and solution goes here in prose.
+    Do not use bullet points.
+
+    fixes:   #NNNN
+    related: #NNNN
+    closes:  #NNNN
+
+    Co-authored-by: Name
+    Signed-off-by: Author Name <email>
+
+Rules:
+
+- **Subject line states the problem**, not the solution. "fix typo" is
+  wrong; "typo in foo() causes OOB read" is right.
+- **Problem line is a full sentence with a trailing period.** It mirrors
+  the subject.
+- **Solution line ends with `(Author Name)`** — parentheses, period
+  after them.
+- **Longer prose**, if any, goes after the Problem/Solution header
+- **`fixes:` references the issue** the patch fixes.
+  **`closes:` references the PR** that introduces the fix.
+  **`related:` references related issues**, including issues that caused this
+  one.
+  All can appear. Colon, aligned, no trailing period.
+- **`Signed-off-by:` is required** — DCO.
+- **`Co-Authored-By:` is allowed** and is the accepted way to
+  acknowledge AI assistance transparently. Human
+  coauthors should usually also have their own Signed-off-by.
+
+## C code conventions
+
+- **Indentation is 4 spaces per level.** Existing files use tabs with
+  `ts=8 sts=4 sw=4 noet` (set by the modeline in the file),
+  so tabs of width 8 appear where two levels of indent collapse. `sign.c`,
+  `sound.c`, and any new file must use spaces only and follow the style from
+  the .editorconfig file.
+- **Opening braces go on their own line (Allman style)** — for function
+  definitions and for control-flow constructs (`if`/`else`/`for`/`while`/
+  `do`) alike.
+- **Function definitions**: return type on its own indented line, with
+  the function name beginning on the next line.
+- Initialize locals where a reader cannot trivially see the first
+  assignment (common for pointers and return-value accumulators).
+  Don't add `= 0` initializers for values that are always assigned
+  before use — they can hide real uninitialized-read bugs from
+  the compiler.
+- `for (int i = 0; ...)` loop declarations are fine in files that
+  use them; older files may declare the counter at the top of the
+  block.
+- **Function-scope declarations at the top of a block** is the historical
+  style, but mid-block declarations are acceptable in files that have
+  adopted them. Match the surrounding code.
+- **Custom types end in `_T`** (e.g., `buf_T`, `linenr_T`, `pos_T`).
+  Never use `_t` — it collides with POSIX typedefs.
+- **C language is C95 plus specific C99 features**: `//` comments,
+  mixed declarations and statements, `__func__`, `bool`/`_Bool`,
+  variadic macros, compound literals, `static inline`, trailing enum
+  commas. Do not reach for later C standards — Vim still must build
+  with Compaq C on OpenVMS. See `*assumptions-C-compiler*` in
+  `develop.txt` for the full list.
+- **`bool` / `true` / `false` are acceptable.** Vim is transitioning
+  from `int` with `TRUE`/`FALSE` to C99 `bool`. Do not "fix" `bool`
+  back to `int`. Within a single patch, be consistent — don't mix
+  `true` and `TRUE` in new code.
+- **Do not mass-convert** `TRUE`/`FALSE` to `true`/`false` across files
+  unless that is the patch's explicit purpose. Opportunistic
+  conversions create noise in diffs.
+- **`STRLEN_LITERAL("...")`** should be used when the length of a
+  string literal is needed. Avoid `STRLEN()` on literals.
+- **`vim_snprintf_safelen()`** returns the written length; prefer it
+  over `vim_snprintf()` when the length is then needed.
+- **Prefer `dict_add_string_len()`** when the string length is already
+  known, over `dict_add_string()` which calls `STRLEN()`.
+- **String/buffer parameters go `(char_u *buf, size_t buflen)`** —
+  length alongside pointer, in bytes. Use `size_t` for byte counts,
+  `int` only where required by legacy APIs.
+- **Guards before divisions.** Check for divisor zero explicitly, even
+  when a composite earlier guard would prevent it. Relying on
+  transitive guards is fragile.
+- When introducing new allocations, verify the cleanup paths handle all exit
+  conditions (early return, error branches, etc).
+
+**Use Vim wrappers instead of libc where one exists:**
+
+| libc          | Vim                    | Why                         |
+|---------------|------------------------|-----------------------------|
+| `free()`      | `vim_free()`           | Tolerates NULL              |
+| `malloc()`    | `alloc()` / `lalloc()` | Checks for OOM              |
+| `strcpy()`    | `STRCPY()`             | Cast for `char_u *`         |
+| `strchr()`    | `vim_strchr()`         | Handles special characters  |
+| `strrchr()`   | `vim_strrchr()`        | Handles special characters  |
+| `memcpy()`    | `mch_memmove()`        | Handles overlapping copies  |
+| `bcopy()`     | `mch_memmove()`        | Handles overlapping copies  |
+| `memset()`    | `vim_memset()`         | Uniform across systems      |
+| `isspace()`   | `vim_isspace()`        | Handles bytes > 127         |
+| `iswhite()`   | `vim_iswhite()`        | TRUE only for tab and space |
+
+Further rules, not spelled out here, live in `runtime/doc/develop.txt`:
+
+- `*style-names*` — reserved name patterns (`is*`, `to*`, `str*`, `mem*`,
+  `wcs*`, `.*_t`, `__.*`), forbidden identifiers (`delete`, `this`, `new`,
+  `time`, `index`), and the 31-character function-name limit.
+- `*style-spaces*`, `*style-examples*` — spacing and one-statement-per-line.
+- `*style-various*` — `FEAT_` feature prefix, uppercase `#define`,
+  `#ifdef HAVE_X` rather than `#if HAVE_X`, no `'\"'`.
+- `*assumptions-makefiles*` — POSIX.1-2001 `make` only in the main
+  Makefiles (no `%` rules, `:=`, `.ONESHELL`, GNU conditionals).
+- Vim uses `char_u` instead of `char` type
+- Vim uses the macros `STRLEN`, `STRCPY`, `STRCMP`, `STRCAT` that work
+  with the `char_u` type.
+- `*style-clang-format*` — `sign.c` and `sound.c` are formatted with
+  `clang-format`; re-run it after editing those files.
+
+## Vim9 script conventions (in tests and runtime files)
+
+- Write modern Vim style (new files can use Vim9 script, but compatibility
+  with Neovim and other forks is a concern, so in doubt please ask!)
+- **Drop `l:` prefix from local variables** in Vim-script tests.
+- **Don't add `CheckFeature` inside individual tests** if it's already
+  at the top of the file.
+- If a test file doesn't gate features at the top, add CheckFeature to
+  individual tests that depend on specific build features.
+
+## Test conventions
+
+- Tests are in `src/testdir/test_*.vim`.
+- Reproducible tests beat "it doesn't crash" tests. If a patch fixes
+  a rendering bug, add a screendump test. If it fixes incorrect output,
+  assert the output.
+- Add comprehensive tests for newly added features and include them
+  in existing tests if possible
+- **Screendump tests** use `CheckScreendump`, `RunVimInTerminal`,
+  `VerifyScreenDump`, and live dumps in `src/testdir/dumps/`.
+- `v9.CheckScriptSuccess(lines)` / `v9.CheckScriptFailure(lines, error, lnum)`
+  are the standard way to test Vim9 script behavior at script-load time.
+- When fixing a bug reported as an issue, include a test that
+  reproduces the original report, not just a minimal synthetic case.
+- Tests for Syntax runtime are in `runtime/syntax/testdir`
+- Tests for Indent runtime are in `runtime/indent/testdir`
+
+## Common gotchas
+
+- **Distinguish what code enforces from what docs claim.** If a patch
+  changes documented behavior, say so in the Problem/Solution.
+- **Generated files** (`src/auto/configure`, generated Wayland protocol
+  C, etc.) should only be regenerated when their source changes.
+  Mixing unrelated regeneration into a functional patch creates noise.
+
+## Documentation
+
+- User-facing option or feature changes require a `runtime/doc/*.txt`
+  update in the same patch.
+- When editing an existing help file, bump the `Last change:` header
+  at the top.
+
+### Help file style
+
+See `runtime/doc/helphelp.txt` (`*help-writing*`) for the authoritative
+reference. Key conventions:
+
+- **File header**: first line is `*filename.txt*` then a tab then a
+  short description. That description appears under `LOCAL ADDITIONS`
+  in `help.txt`. The version and `Last change:` date go on the second
+  line, right aligned.
+- **Modeline**: every help file ends with a Vim modeline — typically
+  `vim:tw=78:ts=8:noet:ft=help:norl:`.
+- **Layout**: `'textwidth'` 78, `'tabstop'` 8, indent and align with
+  tab characters. Two spaces between sentences. Run `:retab`
+  (not `:retab!`, and review the diff) after editing.
+- **Tags** are defined as `*tag-name*`, usually right-aligned on the
+  line where the thing they name is introduced. Tag names must be
+  unique across all of `runtime/doc/`; for plugin help, prefix with
+  the plugin name.
+- **Cross-references inside help text**:
+    - `|tag-name|` — hot-link to an existing tag.
+    - `` `:cmd` `` — Ex command, highlighted as a code block.
+    - `'option'` — option name, in single quotes.
+    - `<Key>` or `CTRL-X` — special keys.
+    - `{placeholder}` — user-supplied argument.
+- **Sections** are separated by a line of `=` starting in column 1.
+  Column or subsection headings end with `~` to trigger heading
+  highlighting.
+- **Code blocks** start with `>` at the end of the introducing line
+  and end with `<` as the first non-blank on a later line (any line
+  starting in column 1 also implicitly closes the block). Use `>vim`
+  (or another language name) to request syntax highlighting inside
+  the block.
+- **Notation** — `Note`, `Todo`, `Error` and a few similar words are
+  auto-highlighted; do not try to fake the highlighting by other means.
+- **Language**: gender-neutral language is preferred for new or updated
+  text; existing wording does not need to be rewritten for this alone.
+
+## Release policy
+
+Vim alternates between development cycles and stability periods — see
+`runtime/doc/develop.txt` `*design-policy*`.
+
+- **During a stability period** only clear bug fixes, security fixes,
+  documentation updates, translations, and runtime file updates are
+  accepted. No new features, no backwards-incompatible changes.
+- **Once released in a minor version**, C-core features must stay
+  backwards-compatible. Runtime files have a bit more flexibility so
+  their maintainers can correct old behavior.
+- **Deprecated features** stay reachable via config (do not hard-error),
+  are documented as deprecated, can be disabled at compile time, and
+  may be removed in a later cycle.
+
+## Security
+
+Before reporting a suspected security issue or submitting a patch
+that touches security-sensitive code, read `SECURITY.md`. Follow
+the disclosure process described there.
+
+## Before submitting
+
+1. Commit message follows the format above.
+2. All modified code compiles without new warnings.
+3. Tests pass, and new functionality has regression tests.
+4. Documentation is updated for user-visible changes.
+5. Signed-off-by is present.
+6. Diff contains only changes relevant to the stated problem —
+   no stray whitespace fixes, no unrelated refactors, no unrelated
+   regeneration of `auto/configure`.
+7. For multi-patch series: each commit compiles and passes its own
+   tests. A known-broken intermediate state that a later patch fixes
+   is not acceptable — squash instead.
+
+## When in doubt
+
+- Make the smallest possible change to achieve the goal. Do not rewrite
+  entire files or functions when a targeted edit suffices.
+- Read surrounding code and match its style rather than imposing an
+  "improvement."
+- Err toward smaller, more focused patches. A patch that does three
+  things is three patches.
+- If a patch fixes a symptom of a deeper bug, say so in the Problem
+  and acknowledge the scope limitation in the Solution.
+- Before claiming a bug exists, reproduce it. Before claiming code does X, read
+  the code. Do not rely on training-data memory of file contents.
+- Before running shell commands that modify files outside the working tree,
+  install packages, push branches, or invoke network operations, confirm with
+  the user.

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 Patches are welcome in whatever form.
 Discussions about patches happen on the [vim-dev][0] mailing list.
 If you create a pull request on GitHub it will be
-forwarded to the vim-dev mailing list.  You can also send your patch there
+forwarded to the vim-dev mailing list. You can also send your patch there
 directly (but please note, the initial posting is subject to moderation).
 In that case an attachment with a unified diff format is preferred.
 Information about the mailing list can be found [on the Vim website][0]
@@ -12,23 +12,57 @@ A pull request has the advantage that it will trigger the Continuous
 Integration tests, you will be warned of problems (you can ignore the coverage
 warning, it's noisy).
 
-Please consider adding a test.  All new functionality should be tested and bug
-fixes should be tested for regressions: the test should fail before the fix and
-pass after the fix.  Look through recent patches for examples and find help
-with ":help testing".  The tests are located under "src/testdir".
+Please always add a test, if possible. All new functionality should be tested
+and bug fixes should be tested for regressions: the test should fail before the
+fix and pass after the fix. Look through recent patches for examples and find
+help with ":help testing". The tests are located under "src/testdir".
 
-Contributions will be distributed with Vim under the Vim license.  Providing a
+Contributions will be distributed with Vim under the Vim license. Providing a
 change to be included implies that you agree with this and your contribution
-does not cause us trouble with trademarks or patents.  There is no CLA to sign.
+does not cause us trouble with trademarks or patents. There is no CLA to sign.
+
+## Signing-off commits
+
+While not required, it's recommended to use **Signed-off commits** to ensure
+transparency, accountability, and compliance with open-source best practices.
+Signed-off commits follow the [Developer Certificate of Origin (DCO)][15],
+which confirms that contributors have the right to submit their changes under
+the project's license. This process adds a `Signed-off-by` line to commit
+messages, verifying that the contributor agrees to the project's licensing
+terms. To sign off a commit, simply use the -s flag when committing:
+
+```sh
+git commit -s
+```
+
+This ensures that every contribution is properly documented and traceable,
+aligning with industry standards used in projects like the Linux Kernel or
+the git project. By making Signed-off commits a standard practice, we help
+maintain a legally compliant and well-governed codebase while fostering trust
+within our contributor community.
+
+When merging PRs into Vim, the current maintainer @chrisbra usually adds missing
+`Signed-off-by` trailers for the author user name and email address as well for
+anybody that explicitly *ACK*s a pull request as a statement that those
+approvers are happy with that particular change.
+
+## Using AI
+
+When using AI for contributions, please disclose this. Any AI-generated code
+must follow the Vim code style. In particular, [test_codestyle.vim][18]
+must not report any failures. Check the CI output for any test failures.
+
+Ensure that changes are properly tested. Do not submit a single PR that
+addresses multiple unrelated issues.
 
 # Reporting issues
 
-We use GitHub issues, but that is not a requirement.  Writing to the Vim
+We use GitHub [issues][17], but that is not a requirement. Writing to the Vim
 mailing list is also fine.
 
 Please use the GitHub issues only for actual issues. If you are not 100% sure
 that your problem is a Vim issue, please first discuss this on the Vim user
-mailing list.  Try reproducing the problem without any of your plugins or settings:
+mailing list. Try reproducing the problem without any of your plugins or settings:
 
     vim --clean
 
@@ -46,40 +80,57 @@ Or open [the todo file][todo list] on GitHub to see the latest version.
 # Syntax, indent and other runtime files
 
 The latest version of these files can be obtained from the repository.
-They are usually not updated with numbered patches. However, they may 
-or may not work with older Vim releases (since they may contain new features).
+They are usually not updated with numbered patches. However, they may
+or may not work with older Vim releases (since they may depend on new
+features).
 
 If you find a problem with one of these files or have a suggestion for
 improvement, please first try to contact the maintainer directly.
 Look in the header of the file for the name, email address, github handle and/or
-upstream repository.  You may also check the [MAINTAINERS][11] file.
+upstream repository. You may also check the [MAINTAINERS][11] file.
 
 The maintainer will take care of issues and send updates to the Vim project for
 distribution with Vim.
 
-If the maintainer does not respond, contact the [vim-dev][0] mailing list.
+If the maintainer does not respond, contact the [vim-dev][0] mailing list or
+open an [issue][17] here.
+
+Note: Whether or not to use Vim9 script is up to the maintainer. For runtime
+files maintained here, we aim to preserve compatibility with Neovim if
+possible. Please wrap Vim9 script with a guard like this:
+```vim
+if has('vim9script')
+   " use Vim9 script implementation
+   [...]
+endif
+```
 
 ## Contributing new runtime files
 
 If you want to contribute new runtime files for Vim or Neovim, please create a
 PR with your changes against this repository here. For new filetypes, do not forget:
-* to add a new [filetype test][12] (keep it similar to the other filetype tests).
-* all configuration switches should be documented
+
+- to add a new [filetype test][12] (keep it similar to the other filetype tests).
+- all configuration switches should be documented
   (check [filetype.txt][13] and/or [syntax.txt][14] for filetype and syntax plugins)
-* add yourself as Maintainer to the top of file (again, keep the header similar to
+- add yourself as Maintainer to the top of file (again, keep the header similar to
   other runtime files)
-* add yourself to the [MAINTAINERS][11] file.
+- add yourself to the [MAINTAINERS][11] file.
+- add a guard `if has('vim9script')` if you like to maintain Neovim
+  compatibility but want to use Vim9 script (or restrict yourself to legacy Vim
+  script)
 
 # Translations
 
-Translating messages and runtime files is very much appreciated!  These things
+Translating messages and runtime files is very much appreciated! These things
 can be translated:
-*   Messages in Vim, see [src/po/README.txt][1]
-    Also used for the desktop icons.
-*   Menus, see [runtime/lang/README.txt][2]
-*   Vim tutor, see [runtime/tutor/README.txt][3]
-*   Manual pages, see [runtime/doc/\*.1][4] for examples
-*   Installer, see [nsis/lang/\*.nsi][5] for examples
+
+- Messages in Vim, see [src/po/README.txt][1]
+  Also used for the desktop icons.
+- Menus, see [runtime/lang/README.txt][2]
+- Vim tutor, see [runtime/tutor/README.txt][3]
+- Manual pages, see [runtime/doc/\*.1][4] for examples
+- Installer, see [nsis/lang/README.txt][5]
 
 The help files can be translated and made available separately.
 See https://www.vim.org/translations.php for examples.
@@ -88,14 +139,17 @@ See https://www.vim.org/translations.php for examples.
 
 Please have a look at the following [discussion][6], which should give you some
 ideas. Please also check the [develop.txt][7] helpfile for the recommended
-style. Often it's also beneficial to check the surrounding code for the style
+coding style. Often it's also beneficial to check the surrounding code for the style
 being used.
 
+For the recommended documentation style, please check [helphelp.txt][16].
+
 # I have a question
 
 If you have some question on the style guide, please contact the [vim-dev][0]
-mailing list. For other questions please use the [Vi Stack Exchange][8] website, the
-[vim-use][9] mailing list or make use of the [discussion][10] feature here at github.
+mailing list. For other questions you can join [`#vim`][19], use the 
+[Vi Stack Exchange][8] website, the [vim-use][9] mailing list or make use of the 
+[discussion][10] feature here at github.
 
 [todo list]: https://github.com/vim/vim/blob/master/runtime/doc/todo.txt
 [0]: http://www.vim.org/maillist.php#vim-dev
@@ -103,7 +157,7 @@ mailing list. For other questions please use the [Vi Stack Exchange][8] website,
 [2]: https://github.com/vim/vim/blob/master/runtime/lang/README.txt
 [3]: https://github.com/vim/vim/blob/master/runtime/tutor/README.txt
 [4]: https://github.com/vim/vim/blob/master/runtime/doc/vim.1
-[5]: https://github.com/vim/vim/blob/master/nsis/lang/english.nsi
+[5]: https://github.com/vim/vim/blob/master/nsis/lang/README.txt
 [6]: https://github.com/vim/vim/discussions/13087
 [7]: https://github.com/vim/vim/blob/master/runtime/doc/develop.txt
 [8]: https://vi.stackexchange.com
@@ -113,3 +167,8 @@ mailing list. For other questions please use the [Vi Stack Exchange][8] website,
 [12]: https://github.com/vim/vim/blob/master/src/testdir/test_filetype.vim
 [13]: https://github.com/vim/vim/blob/master/runtime/doc/filetype.txt
 [14]: https://github.com/vim/vim/blob/master/runtime/doc/syntax.txt
+[15]: https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin
+[16]: https://github.com/vim/vim/blob/master/runtime/doc/helphelp.txt
+[17]: https://github.com/vim/vim/issues
+[18]: https://github.com/vim/vim/blob/master/src/testdir/test_codestyle.vim
+[19]: https://web.libera.chat/#vim

Filelist

@@ -5,23 +5,35 @@
 SRC_ALL =	\
 		.cirrus.yml \
 		.gitattributes \
+		.git-blame-ignore-revs \
 		.github/MAINTAINERS \
 		.github/ISSUE_TEMPLATE/bug_report.yml \
 		.github/ISSUE_TEMPLATE/feature_request.md \
+		.github/workflows/ci-linux.yml \
+		.github/workflows/ci-linux_asan.yml \
+		.github/workflows/ci-macos.yml \
+		.github/workflows/ci-windows.yml \
 		.github/workflows/ci.yml \
 		.github/workflows/codeql-analysis.yml \
-		.github/actions/screendump/action.yml \
 		.github/workflows/coverity.yml \
+		.github/workflows/link-check.yml \
+		.github/actions/build_vim_on_linux/action.yml \
+		.github/actions/test_artifacts/action.yml \
 		.github/dependabot.yml \
 		.gitignore \
 		.hgignore \
-		.appveyor.yml \
+		.clang-format \
 		.codecov.yml \
-		ci/appveyor.bat \
+		.editorconfig \
 		ci/config.mk*.sed \
+		ci/gen_testset.py \
 		ci/if_ver*.vim \
+		ci/if_feat_check.vim \
+		ci/lychee.toml \
 		ci/setup-xvfb.sh \
 		ci/remove_snap.sh \
+		ci/ddebs.list \
+		ci/pinned-pkgs \
 		src/Make_all.mak \
 		src/README.md \
 		src/alloc.c \
@@ -49,6 +61,7 @@ SRC_ALL =	\
 		src/debugger.c \
 		src/dict.c \
 		src/diff.c \
+		src/linematch.c \
 		src/digraph.c \
 		src/drawline.c \
 		src/drawscreen.c \
@@ -72,6 +85,7 @@ SRC_ALL =	\
 		src/findfile.c \
 		src/float.c \
 		src/fold.c \
+		src/fuzzy.c \
 		src/getchar.c \
 		src/gc.c \
 		src/globals.h \
@@ -135,14 +149,17 @@ SRC_ALL =	\
 		src/session.c \
 		src/sha256.c \
 		src/sign.c \
+		src/socketserver.c \
 		src/sound.c \
 		src/spell.c \
 		src/spell.h \
 		src/spellfile.c \
 		src/spellsuggest.c \
 		src/strings.c \
+		src/strptime.c \
 		src/structs.h \
 		src/syntax.c \
+		src/tabpanel.c \
 		src/tag.c \
 		src/term.c \
 		src/terminal.c \
@@ -153,6 +170,7 @@ SRC_ALL =	\
 		src/textobject.c \
 		src/textprop.c \
 		src/time.c \
+		src/tuple.c \
 		src/typval.c \
 		src/ui.c \
 		src/undo.c \
@@ -167,6 +185,7 @@ SRC_ALL =	\
 		src/vim9compile.c \
 		src/vim9execute.c \
 		src/vim9expr.c \
+		src/vim9generics.c \
 		src/vim9instr.c \
 		src/vim9script.c \
 		src/vim9type.c \
@@ -174,61 +193,74 @@ SRC_ALL =	\
 		src/winclip.c \
 		src/window.c \
 		src/xxd/xxd.c \
-		src/testdir/gen_opt_test.vim \
-		src/testdir/README.txt \
-		src/testdir/Make_all.mak \
 		src/testdir/*.in \
 		src/testdir/*.py \
-		src/testdir/keycode_check.vim \
-		src/testdir/keycode_check.json \
-		src/testdir/lsan-suppress.txt \
-		src/testdir/sautest/autoload/*.vim \
-		src/testdir/testluaplugin/lua/testluaplugin/*.lua \
-		src/testdir/check.vim \
+		src/testdir/Make_all.mak \
+		src/testdir/README.txt \
 		src/testdir/commondumps.vim \
-		src/testdir/gui_init.vim \
-		src/testdir/gui_preinit.vim \
-		src/testdir/mouse.vim \
-		src/testdir/runtest.vim \
-		src/testdir/screendump.vim \
-		src/testdir/setup.vim \
-		src/testdir/setup_gui.vim \
-		src/testdir/shared.vim \
-		src/testdir/vim9.vim \
-		src/testdir/script_util.vim \
-		src/testdir/summarize.vim \
-		src/testdir/term_util.vim \
-		src/testdir/view_util.vim \
-		src/testdir/viewdumps.vim \
-		src/testdir/test[0-9]*.ok \
-		src/testdir/test77a.ok \
-		src/testdir/test77a.com \
-		src/testdir/test_*.vim \
+		src/testdir/crash/* \
+		src/testdir/dumps/*.dump \
+		src/testdir/dumps/*.vim \
+		src/testdir/keycode_check.json \
+		src/testdir/keycode_check.vim \
+		src/testdir/lsan-suppress.txt \
 		src/testdir/python2/*.py \
 		src/testdir/python3/*.py \
+		src/testdir/python_after/*.py \
+		src/testdir/python_before/*.py \
 		src/testdir/pythonx/*.py \
 		src/testdir/pythonx/topmodule/__init__.py \
 		src/testdir/pythonx/topmodule/submodule/__init__.py \
 		src/testdir/pythonx/topmodule/submodule/subsubmodule/__init__.py \
 		src/testdir/pythonx/topmodule/submodule/subsubmodule/subsubsubmodule.py \
-		src/testdir/python_after/*.py \
-		src/testdir/python_before/*.py \
 		src/testdir/pyxfile/*.py \
-		src/testdir/dumps/*.dump \
-		src/testdir/dumps/*.vim \
+		src/testdir/ru_RU/LC_MESSAGES/Makefile \
+		src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo \
+		src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.po \
+		src/testdir/runtest.vim \
 		src/testdir/samples/*.html \
+		src/testdir/samples/*.swp \
 		src/testdir/samples/*.txt \
 		src/testdir/samples/*.vim \
-		src/testdir/samples/test000 \
+		src/testdir/samples/evil.zip \
+		src/testdir/samples/evil.tar \
+		src/testdir/samples/poc.zip \
+		src/testdir/samples/sample.tar \
 		src/testdir/samples/test.zip \
+		src/testdir/samples/test000 \
+		src/testdir/samples/test_undo.txt.undo \
 		src/testdir/samples/testa.zip \
-		src/testdir/color_ramp.vim \
+		src/testdir/samples/crypt_utf8_test.txt \
+		src/testdir/samples/uncrypt_utf8_test.txt \
+		src/testdir/sautest/autoload/*.vim \
 		src/testdir/silent.wav \
-		src/testdir/popupbounce.vim \
-		src/testdir/crash/* \
-		src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo \
+		src/testdir/test77a.com \
+		src/testdir/test77a.ok \
+		src/testdir/test[0-9]*.ok \
+		src/testdir/test_*.vim \
+		src/testdir/testluaplugin/lua/testluaplugin/*.lua \
+		src/testdir/util/check.vim \
+		src/testdir/util/color_ramp.vim \
+		src/testdir/util/gen_opt_test.vim \
+		src/testdir/util/gui_init.vim \
+		src/testdir/util/gui_preinit.vim \
+		src/testdir/util/mouse.vim \
+		src/testdir/util/popupbounce.vim \
+		src/testdir/util/screendump.vim \
+		src/testdir/util/script_util.vim \
+		src/testdir/util/setup.vim \
+		src/testdir/util/setup_gui.vim \
+		src/testdir/util/shared.vim \
+		src/testdir/util/summarize.vim \
+		src/testdir/util/term_util.vim \
+		src/testdir/util/view_util.vim \
+		src/testdir/util/vim9.vim \
+		src/testdir/util/window_manager.vim \
+		src/testdir/util/socketserver.vim \
+		src/testdir/viewdumps.vim \
 		src/proto.h \
 		src/protodef.h \
+		src/proto/gen_prototypes.py \
 		src/proto/alloc.pro \
 		src/proto/arabic.pro \
 		src/proto/arglist.pro \
@@ -270,6 +302,7 @@ SRC_ALL =	\
 		src/proto/findfile.pro \
 		src/proto/float.pro \
 		src/proto/fold.pro \
+		src/proto/fuzzy.pro \
 		src/proto/getchar.pro \
 		src/proto/gc.pro \
 		src/proto/gui.pro \
@@ -282,6 +315,7 @@ SRC_ALL =	\
 		src/proto/insexpand.pro \
 		src/proto/job.pro \
 		src/proto/json.pro \
+		src/proto/linematch.pro \
 		src/proto/list.pro \
 		src/proto/locale.pro \
 		src/proto/logfile.pro \
@@ -315,12 +349,14 @@ SRC_ALL =	\
 		src/proto/session.pro \
 		src/proto/sha256.pro \
 		src/proto/sign.pro \
+		src/proto/socketserver.pro \
 		src/proto/sound.pro \
 		src/proto/spell.pro \
 		src/proto/spellfile.pro \
 		src/proto/spellsuggest.pro \
 		src/proto/strings.pro \
 		src/proto/syntax.pro \
+		src/proto/tabpanel.pro \
 		src/proto/tag.pro \
 		src/proto/term.pro \
 		src/proto/terminal.pro \
@@ -330,6 +366,7 @@ SRC_ALL =	\
 		src/proto/textobject.pro \
 		src/proto/textprop.pro \
 		src/proto/time.pro \
+		src/proto/tuple.pro \
 		src/proto/typval.pro \
 		src/proto/ui.pro \
 		src/proto/undo.pro \
@@ -341,6 +378,7 @@ SRC_ALL =	\
 		src/proto/vim9compile.pro \
 		src/proto/vim9execute.pro \
 		src/proto/vim9expr.pro \
+		src/proto/vim9generics.pro \
 		src/proto/vim9instr.pro \
 		src/proto/vim9script.pro \
 		src/proto/vim9type.pro \
@@ -409,6 +447,7 @@ SRC_ALL =	\
 		src/libvterm/t/66screen_extent.test \
 		src/libvterm/t/67screen_dbl_wh.test \
 		src/libvterm/t/68screen_termprops.test \
+		src/libvterm/t/69screen_pushline.test \
 		src/libvterm/t/69screen_reflow.test \
 		src/libvterm/t/90vttest_01-movement-1.test \
 		src/libvterm/t/90vttest_01-movement-2.test \
@@ -465,6 +504,9 @@ SRC_UNIX =	\
 		src/gui_gtk_f.c \
 		src/gui_gtk_f.h \
 		src/gui_gtk_x11.c \
+		src/gui_gtk4.c \
+		src/gui_gtk4_f.c \
+		src/gui_gtk4_f.h \
 		src/gui_gtk_res.xml \
 		src/gui_motif.c \
 		src/gui_xmdlg.c \
@@ -473,6 +515,12 @@ SRC_UNIX =	\
 		src/gui_xmebwp.h \
 		src/gui_x11.c \
 		src/gui_x11_pm.h \
+		src/auto/wayland/README.txt \
+		src/auto/wayland/Makefile \
+		src/auto/wayland/protocols/ext-data-control-v1.xml \
+		src/auto/wayland/protocols/wlr-data-control-unstable-v1.xml \
+		src/auto/wayland/protocols/xdg-shell.xml \
+		src/auto/wayland/protocols/primary-selection-unstable-v1.xml \
 		src/if_xcmdsrv.c \
 		src/link.sh \
 		src/installman.sh \
@@ -488,20 +536,24 @@ SRC_UNIX =	\
 		src/proto/gui_gtk.pro \
 		src/proto/gui_gtk_x11.pro \
 		src/proto/gui_gtk_gresources.pro \
+		src/proto/gui_gtk4.pro \
 		src/proto/gui_motif.pro \
 		src/proto/gui_xmdlg.pro \
 		src/proto/gui_x11.pro \
+		src/proto/wayland.pro \
 		src/proto/if_xcmdsrv.pro \
 		src/proto/os_unix.pro \
 		src/proto/pty.pro \
 		src/pty.c \
 		src/testdir/Makefile \
-		src/testdir/unix.vim \
+		src/testdir/util/unix.vim \
 		src/toolcheck \
 		src/vim_icon.xbm \
 		src/vim_mask.xbm \
 		src/vimtutor \
 		src/gvimtutor \
+		src/wayland.c \
+		src/wayland.h \
 		src/which.sh \
 		src/xxd/Makefile \
 
@@ -513,7 +565,6 @@ SRC_DOS_UNIX =	\
 		src/if_mzsch.c \
 		src/if_mzsch.h \
 		src/if_perl.xs \
-		src/if_perlsfio.c \
 		src/if_python.c \
 		src/if_python3.c \
 		src/if_py_both.h \
@@ -524,7 +575,6 @@ SRC_DOS_UNIX =	\
 		src/proto/if_lua.pro \
 		src/proto/if_mzsch.pro \
 		src/proto/if_perl.pro \
-		src/proto/if_perlsfio.pro \
 		src/proto/if_python.pro \
 		src/proto/if_python3.pro \
 		src/proto/if_ruby.pro \
@@ -533,6 +583,7 @@ SRC_DOS_UNIX =	\
 
 # Source files for MS Windows (also in the extra archive).
 SRC_DOS =	\
+		src/auto/nmake/tools.mak \
 		src/GvimExt/*.mak \
 		src/GvimExt/GvimExt.reg \
 		src/GvimExt/Makefile \
@@ -588,7 +639,7 @@ SRC_DOS =	\
 		src/testdir/Make_dos.mak \
 		src/testdir/Make_mvc.mak \
 		src/testdir/Make_ming.mak \
-		src/testdir/dos.vim \
+		src/testdir/util/dos.vim \
 		src/uninstall.c \
 		src/vim.rc \
 		src/vim.manifest \
@@ -601,8 +652,10 @@ SRC_DOS =	\
 		src/tee/tee.c \
 		src/xxd/Make_ming.mak \
 		src/xxd/Make_mvc.mak \
+		nsis/auxiliary.nsh \
 		nsis/gvim.nsi \
-		nsis/gvim_version.nsh \
+		nsis/Makefile \
+		nsis/Make_mvc.mak \
 		nsis/README.txt \
 		nsis/lang/*.nsi \
 		nsis/lang/README.txt \
@@ -637,9 +690,10 @@ SRC_AMI =	\
 		src/Make_ami.mak \
 		src/os_amiga.c \
 		src/os_amiga.h \
+		src/os_amiga_stubs.c \
 		src/proto/os_amiga.pro \
 		src/testdir/Make_amiga.mak \
-		src/testdir/amiga.vim \
+		src/testdir/util/amiga.vim \
 		src/xxd/Make_amiga.mak \
 
 # Source files for Haiku (also in the extra archive).
@@ -670,7 +724,7 @@ SRC_VMS =	\
 		src/os_vms_mms.c \
 		src/proto/os_vms.pro \
 		src/testdir/Make_vms.mms \
-		src/testdir/vms.vim \
+		src/testdir/util/vms.vim \
 		src/xxd/Make_vms.mms \
 		vimtutor.com \
 
@@ -760,8 +814,19 @@ RT_ALL =	\
 		runtime/tools/README.txt \
 		runtime/tools/[a-z]*[a-z0-9] \
 		runtime/tutor/README.txt \
-		runtime/tutor/tutor \
+		runtime/tutor/tutor1 \
+		runtime/tutor/en/vim-01-beginner.tutor \
+		runtime/tutor/en/vim-01-beginner.tutor.json \
+		runtime/tutor/en/vim-02-beginner.tutor \
+		runtime/tutor/en/vim-02-beginner.tutor.json \
+		runtime/tutor/sv/vim-01-beginner.tutor \
+		runtime/tutor/sv/vim-01-beginner.tutor.json \
+		runtime/tutor/sv/vim-02-beginner.tutor \
+		runtime/tutor/sv/vim-02-beginner.tutor.json \
+		runtime/tutor/tutor.tutor \
+		runtime/tutor/tutor.tutor.json \
 		runtime/tutor/tutor.vim \
+		runtime/tutor/tutor2 \
 		runtime/vimrc_example.vim \
 		runtime/pack/dist/opt/cfilter/plugin/cfilter.vim \
 		runtime/pack/dist/opt/comment/plugin/comment.vim \
@@ -775,7 +840,6 @@ RT_ALL =	\
 		runtime/pack/dist/opt/editorconfig/.editorconfig \
 		runtime/pack/dist/opt/editorconfig/CONTRIBUTORS \
 		runtime/pack/dist/opt/editorconfig/LICENSE* \
-		runtime/pack/dist/opt/editorconfig/mkzip.sh \
 		runtime/pack/dist/opt/editorconfig/README.md \
 		runtime/pack/dist/opt/editorconfig/autoload/*.vim \
 		runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/*.vim \
@@ -783,6 +847,15 @@ RT_ALL =	\
 		runtime/pack/dist/opt/editorconfig/doc/editorconfig.txt \
 		runtime/pack/dist/opt/editorconfig/ftdetect/editorconfig.vim \
 		runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim \
+		runtime/pack/dist/opt/helpcurwin/autoload/helpcurwin.vim \
+		runtime/pack/dist/opt/helpcurwin/doc/helpcurwin.txt \
+		runtime/pack/dist/opt/helpcurwin/doc/tags \
+		runtime/pack/dist/opt/helpcurwin/plugin/helpcurwin.vim \
+		runtime/pack/dist/opt/helptoc/autoload/helptoc.vim \
+		runtime/pack/dist/opt/helptoc/doc/helptoc.txt \
+		runtime/pack/dist/opt/helptoc/doc/tags \
+		runtime/pack/dist/opt/helptoc/plugin/helptoc.vim \
+		runtime/pack/dist/opt/hlyank/plugin/hlyank.vim \
 		runtime/pack/dist/opt/justify/plugin/justify.vim \
 		runtime/pack/dist/opt/matchit/plugin/matchit.vim \
 		runtime/pack/dist/opt/matchit/doc/matchit.txt \
@@ -792,6 +865,21 @@ RT_ALL =	\
 		runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim \
 		runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim \
 		runtime/pack/dist/opt/termdebug/plugin/termdebug.vim \
+		runtime/pack/dist/opt/netrw/LICENSE.txt \
+		runtime/pack/dist/opt/netrw/README.md \
+		runtime/pack/dist/opt/netrw/autoload/netrw.vim \
+		runtime/pack/dist/opt/netrw/autoload/netrw/fs.vim \
+		runtime/pack/dist/opt/netrw/autoload/netrw/os.vim \
+		runtime/pack/dist/opt/netrw/autoload/netrw/msg.vim \
+		runtime/pack/dist/opt/netrw/autoload/netrw_gitignore.vim \
+		runtime/pack/dist/opt/netrw/doc/netrw.txt \
+		runtime/pack/dist/opt/netrw/plugin/netrwPlugin.vim \
+		runtime/pack/dist/opt/netrw/syntax/netrw.vim \
+		runtime/pack/dist/opt/osc52/plugin/osc52.vim \
+		runtime/pack/dist/opt/osc52/autoload/osc52.vim \
+		runtime/pack/dist/opt/osc52/doc/osc52.txt \
+		runtime/pack/dist/opt/osc52/doc/tags \
+		runtime/xdg.vim
 
 # Runtime files for all distributions without CR/LF translation.
 RT_ALL_BIN =	\
@@ -826,6 +914,7 @@ RT_SCRIPTS =	\
 		runtime/indent/testdir/*.vim \
 		runtime/indent/testdir/*.in \
 		runtime/indent/testdir/*.ok \
+		runtime/indent/testdir/tools/* \
 		runtime/ftplugin/*.vim \
 		runtime/ftplugin/logtalk.dict \
 		runtime/ftplugin/README.txt \
@@ -845,7 +934,7 @@ RT_SCRIPTS =	\
 		runtime/syntax/testdir/input/selftestdir/* \
 		runtime/syntax/testdir/input/setup/*.* \
 		runtime/syntax/testdir/dumps/*.dump \
-		runtime/syntax/testdir/dumps/*.vim \
+		runtime/syntax/testdir/tools/* \
 		runtime/syntax/generator/Makefile \
 		runtime/syntax/generator/README.md \
 		runtime/syntax/generator/gen_syntax_vim.vim \
@@ -865,12 +954,15 @@ RT_UNIX_DOS_BIN =	\
 		runtime/vim16x16.gif \
 		runtime/vim16x16.png \
 		runtime/vim16x16.xpm \
+		runtime/vim16x16_png.h \
 		runtime/vim32x32.gif \
 		runtime/vim32x32.png \
 		runtime/vim32x32.xpm \
+		runtime/vim32x32_png.h \
 		runtime/vim48x48.gif \
 		runtime/vim48x48.png \
 		runtime/vim48x48.xpm \
+		runtime/vim48x48_png.h \
 
 # Runtime not for Unix-like or extra.
 RT_NO_UNIX =	\
@@ -888,7 +980,6 @@ RT_DOS =	\
 		README_dos.txt \
 		runtime/doc/Make_mvc.mak \
 		runtime/indent/Make_mvc.mak \
-		runtime/tutor/Make_mvc.mak \
 		runtime/lang/Make_mvc.mak \
 		vimtutor.bat \
 
@@ -917,8 +1008,7 @@ RT_AMI =	\
 		runtime/macros/maze/*.info \
 		runtime/macros/urm/*.info \
 		runtime/tools.info \
-		runtime/tutor.info \
-		runtime/tutor/*.info \
+		runtime/tutor.info
 
 # Runtime files in extra archive.
 RT_EXTRA =	\
@@ -1018,7 +1108,8 @@ IN_README_DIR = \
 
 # Generic language files.
 LANG_GEN = \
-		README.??x.txt \
+		lang/README.*.txt \
+		lang/LICENSE.*.txt \
 		runtime/doc/*-da.1 \
 		runtime/doc/*-da.UTF-8.1 \
 		runtime/doc/*-de.1 \
@@ -1032,9 +1123,10 @@ LANG_GEN = \
 		runtime/doc/*-pl.UTF-8.1 \
 		runtime/doc/*-ru.1 \
 		runtime/doc/*-ru.UTF-8.1 \
+		runtime/doc/*-sv.1 \
+		runtime/doc/*-sv.UTF-8.1 \
 		runtime/doc/*-tr.1 \
 		runtime/doc/*-tr.UTF-8.1 \
-		runtime/doc/uganda.??x \
 		runtime/lang/README.txt \
 		runtime/lang/Makefile \
 		runtime/lang/Make_all.mak \
@@ -1042,21 +1134,22 @@ LANG_GEN = \
 		runtime/keymap/README.txt \
 		runtime/keymap/*.vim \
 		runtime/tutor/README.*.txt \
-		runtime/tutor/Makefile \
-		runtime/tutor/Make_all.mak \
-		runtime/tutor/tutor.utf-8 \
-		runtime/tutor/tutor.?? \
-		runtime/tutor/tutor.??.utf-8 \
-		runtime/tutor/tutor.??.euc \
-		runtime/tutor/tutor.??.sjis \
-		runtime/tutor/tutor.??.iso9 \
-		runtime/tutor/tutor.??.big5 \
-		runtime/tutor/tutor.??.cp1250 \
-		runtime/tutor/tutor.??.cp1251 \
-		runtime/tutor/tutor.??.cp737 \
-		runtime/tutor/tutor.??_??.utf-8 \
-		runtime/tutor/tutor.bar \
-		runtime/tutor/tutor.bar.utf-8 \
+		runtime/tutor/it/vim-01-beginner.tutor \
+		runtime/tutor/it/vim-01-beginner.tutor.json \
+		runtime/tutor/ru/vim-01-beginner.tutor \
+		runtime/tutor/ru/vim-01-beginner.tutor.json \
+		runtime/tutor/ru/vim-02-beginner.tutor \
+		runtime/tutor/ru/vim-02-beginner.tutor.json \
+		runtime/tutor/sr/vim-01-beginner.tutor \
+		runtime/tutor/sr/vim-01-beginner.tutor.json \
+		runtime/tutor/sr/vim-02-beginner.tutor \
+		runtime/tutor/sr/vim-02-beginner.tutor.json \
+		runtime/tutor/zh/vim-01-beginner.tutor \
+		runtime/tutor/zh/vim-01-beginner.tutor.json \
+		runtime/tutor/tutor1.?? \
+		runtime/tutor/tutor1.??_?? \
+		runtime/tutor/tutor1.bar \
+		runtime/tutor/tutor2.?? \
 		runtime/spell/README.txt \
 		runtime/spell/??/*.diff \
 		runtime/spell/??/main.aap \
@@ -1100,6 +1193,7 @@ LANG_SRC = \
 		src/po/sjiscorr.c \
 		src/po/big5corr.c \
 		src/po/*.po \
+		src/po/vim.pot \
 
 # The language files for the Win32 lang archive.
 LANG_DOS = \
@@ -1109,12 +1203,14 @@ LANG_DOS = \
 # be excluded from distribution tarballs and the like.
 # This excludes them from the CI check for unlisted files.
 IGNORE = \
-		.appveyor.yml \
 		.github/FUNDING.yml \
 		.github/labeler.yml \
 		.github/workflows/label.yml \
+		AGENTS.md \
 		SECURITY.md \
 		ci/unlisted.make \
+		ci/hlgroups.make \
+		ci/hlgroups.ignore \
 		src/libvterm/CODE-MAP \
 		runtime/syntax/testdir/input/html_html \
 

Makefile

@@ -61,6 +61,10 @@ indenttest:
 # Executable used for running the syntax tests.
 VIM_FOR_SYNTAXTEST = ../../src/vim
 
+# (For local testing only with GNU Make.)
+VIM_SYNTAX_TEST_FILTER =
+VIM_SYNTAX_TEST_WAIT_TIME =
+
 syntaxtest:
 	cd runtime/syntax && \
 		$(MAKE) clean && \
@@ -94,14 +98,14 @@ syntaxtest:
 #    Before creating an archive first delete all backup files, *.orig, etc.
 
 MAJOR = 9
-MINOR = 1
+MINOR = 2
 
 # CHECKLIST for creating a new version:
 #
 # - Update Vim version number.  For a test version in: src/version.h,
 #   READMEdir/Contents, MAJOR/MINOR above, VIMMAJOR and VIMMINOR in
 #   src/Makefile, README.txt, README.md, src/README.md, READMEdir/README*.txt,
-#   runtime/doc/*.txt and make nsis/gvim_version.nsh.
+#   runtime/doc/*.txt.
 #   For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.manifest.
 # - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, Lua, Cscope and
 #   "huge" features.  Add MZscheme if you can make it work.
@@ -111,6 +115,7 @@ MINOR = 1
 # - With these features: "make depend" (works best with gcc).
 # - If you have a lint program: "make lint" and check the output (ignore GTK
 #   warnings).
+# - compile release versions using -DNDEBUG to disable assert()s
 # - If you have valgrind, enable it in src/testdir/Makefile and run "make
 #   test".  Enable EXITFREE, disable GUI, scheme and tcl to avoid false alarms.
 #   Check the valgrind output.
@@ -153,17 +158,17 @@ MINOR = 1
 # - > make dossrc
 #   > make dosrt
 #   Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
-#   This creates the directory vim/vim90 and puts all files in there.
+#   This creates the directory vim/vim91 and puts all files in there.
 # Win32 console version build:
 # - See src/INSTALLpc.txt for installing the compiler and SDK.
 # - Set environment for Visual C++ 2015:
 #   > cd src
-#   > msvc2015.bat
+#   > msvc-latest.bat
 # - Build the console binary:
-#   > nmake -f Make_mvc.mak
+#   > nmake.exe -f Make_mvc.mak
 # - Run the tests and check the output:
-#   > nmake -f Make_mvc.mak testclean
-#   > nmake -f Make_mvc.mak test
+#   > nmake.exe -f Make_mvc.mak testclean
+#   > nmake.exe -f Make_mvc.mak test
 # - Rename (using ../tools/rename.bat):
 #           vim.exe to vimw32.exe
 #           tee/tee.exe to teew32.exe
@@ -173,10 +178,10 @@ MINOR = 1
 #           uninstall.exe to uninstallw32.exe
 # Win32 GUI version build:
 # - > cd src
-#   > nmake -f Make_mvc.mak GUI=yes
+#   > nmake.exe -f Make_mvc.mak "GUI=yes"
 # - Run the tests and check the output:
-#   > nmake -f Make_mvc.mak testclean
-#   > nmake -f Make_mvc.mak testgvim
+#   > nmake.exe -f Make_mvc.mak testclean
+#   > nmake.exe -f Make_mvc.mak testgvim
 # - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
 # - Move gvim.pdb to here.
 # - Copy "GvimExt/gvimext.dll" to here.
@@ -188,8 +193,8 @@ MINOR = 1
 #   > cd src
 #   > bigvim.bat
 # - Run the tests:
-#   > nmake -f Make_mvc.mak testclean
-#   > nmake -f Make_mvc.mak testgvim
+#   > nmake.exe -f Make_mvc.mak testclean
+#   > nmake.exe -f Make_mvc.mak testgvim
 #   - check the output.
 # - Rename "gvim.exe" to "gvim_ole.exe".
 # - Rename gvim.pdb to "gvim_ole.pdb".
@@ -209,13 +214,13 @@ MINOR = 1
 #	gvimext64.dll in src/GvimExt
 #   gvimext64.dll can be obtained from:
 #   https://github.com/vim/vim-win32-installer/releases
-#	It is part of gvim_9.0.*_x64.zip as vim/vim90/GvimExt/gvimext64.dll.
+#	It is part of gvim_9.1.*_x64.zip as vim/vim91/GvimExt/gvimext64.dll.
 # - Make sure there is a diff.exe two levels up (get it from a previous Vim
 #   version).  Also put winpty32.dll and winpty-agent.exe there.
 # - go to ../nsis and do:
-#   > unzip icons.zip
-#   > makensis gvim.nsi  (takes a few minutes).
-#      ignore warning for libwinpthread-1.dll
+#   > nmake.exe -f Make_mvc.mak all
+#    (takes a few minutes).
+#    See nsis/README.txt for details.
 # - Copy gvim##.exe to the dist directory.
 #
 # 64 bit builds (these are not in the normal distribution, the 32 bit build
@@ -223,9 +228,9 @@ MINOR = 1
 # Like the console and GUI version, but first run vcvars64.bat or
 #   "..\VC\vcvarsall.bat x86_amd64".
 # - Build the console version:
-#   > nmake -f Make_mvc.mak
+#   > nmake.exe -f Make_mvc.mak
 # - Build the GUI version:
-#   > nmake -f Make_mvc.mak GUI=yes
+#   > nmake.exe -f Make_mvc.mak "GUI=yes"
 # - Build the OLE version with interfaces:
 #   > bigvim64.bat
 #
@@ -263,8 +268,8 @@ dist:
 # Clean up some files to avoid they are included.
 # Copy README files to the top directory.
 prepare:
-	if test -f runtime/doc/uganda.nsis.txt; then \
-		rm runtime/doc/uganda.nsis.???; fi
+	if test -f lang/LICENSE.nsis.txt; then \
+		rm -f lang/LICENSE*.nsis.txt; fi
 	for name in $(IN_README_DIR); do \
 	  cp READMEdir/"$$name" .; \
 	  done
@@ -285,10 +290,10 @@ dist/$(COMMENT_RT): dist/comment
 	echo "Vim - Vi IMproved - v$(VDOT) runtime files for MS-DOS and MS-Windows" > dist/$(COMMENT_RT)
 
 dist/$(COMMENT_W32): dist/comment
-	echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows NT/95" > dist/$(COMMENT_W32)
+	echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows" > dist/$(COMMENT_W32)
 
 dist/$(COMMENT_GVIM): dist/comment
-	echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows NT/95" > dist/$(COMMENT_GVIM)
+	echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows" > dist/$(COMMENT_GVIM)
 
 dist/$(COMMENT_OLE): dist/comment
 	echo "Vim - Vi IMproved - v$(VDOT) MS-Windows GUI binaries with OLE support" > dist/$(COMMENT_OLE)
@@ -405,8 +410,7 @@ amisrc: dist prepare
 	mv dist/vim$(VERSION)src.tar.gz dist/vim$(VERSION)src.tgz
 
 # MS-DOS sources
-dossrc: dist dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt \
-	nsis/gvim_version.nsh
+dossrc: dist dist/$(COMMENT_SRC) license
 	-rm -rf dist/vim$(VERSION)src.zip
 	-rm -rf dist/vim
 	mkdir dist/vim
@@ -417,23 +421,15 @@ dossrc: dist dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt \
 		$(SRC_DOS_BIN) \
 		$(SRC_AMI_DOS) \
 		$(SRC_DOS_UNIX) \
-		runtime/doc/uganda.nsis.??? \
-		nsis/gvim_version.nsh \
+		lang/LICENSE.*.txt \
+		lang/README.*.txt \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
 	mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
 	rmdir dist/vim/$(VIMRTDIR)/runtime
 	cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC)
 
-runtime/doc/uganda.nsis.txt: runtime/doc/uganda.???
-	cd runtime/doc && $(MAKE) uganda.nsis.txt
-
-nsis/gvim_version.nsh: Makefile
-	echo "# Generated from Makefile: define the version numbers" > $@
-	echo "!ifndef __GVIM_VER__NSH__"  >> $@
-	echo "!define __GVIM_VER__NSH__"  >> $@
-	echo "!define VER_MAJOR $(MAJOR)" >> $@
-	echo "!define VER_MINOR $(MINOR)" >> $@
-	echo "!endif" >> $@
+license:
+	cd nsis && $(MAKE) -f Makefile $@
 
 dosrt: dist dist/$(COMMENT_RT) dosrt_files
 	-rm -rf dist/vim$(VERSION)rt.zip
@@ -464,6 +460,7 @@ dosrt_files: dist prepare
 		$(LANG_GEN_BIN) \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
 	-rm $(IN_README_DIR)
+	mv dist/vim/$(VIMRTDIR)/lang/ dist/vim/$(VIMRTDIR)/readme/
 	mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
 	rmdir dist/vim/$(VIMRTDIR)/runtime
 # Add the message translations.  Trick: skip ja.mo/ja.euc-jp.mo and use

README.md

@@ -1,13 +1,78 @@
-Vim - the text editor - for macOS
+<h1 align=center>
+<img src=https://macvim.org/docs/MacVim.png alt="MacVim logo" style="height:4em"><br>
+MacVim
+</h1>
+
+<p align="center">
+<a href="https://macvim.org/">Website</a> · <a href="https://macvim.org/docs/gui_mac.txt">Documentation</a>
+</p>
+<p align="center">
+<a href="https://github.com/macvim-dev/macvim/actions/workflows/ci-macvim.yaml?query=branch%3Amaster+event%3Apush"><img src="https://github.com/macvim-dev/macvim/actions/workflows/ci-macvim.yaml/badge.svg" alt="MacVim GitHub CI"></a>
+<a href="https://github.com/macvim-dev/macvim/releases/latest"><img src="https://img.shields.io/github/v/release/macvim-dev/macvim?label=GitHub%20Release&display=release" alt="GitHub release"></a>
+<a href="https://repology.org/project/macvim/versions"><img src="https://repology.org/badge/tiny-repos/macvim.svg" alt="Packaging status"></a>
+</p>
 
 
-- MacVim homepage https://macvim-dev.github.io/macvim
+MacVim is a macOS version of the [Vim](https://github.com/vim/vim) text editor, providing a graphical user interface for Vim, while tightly integrating with macOS and providing features specific to the platform.
 
-- Download the latest version from [Releases](https://github.com/macvim-dev/macvim/releases/latest).
+<hr>
 
-- Vim README: [README_vim.md](README_vim.md)
+<p align="center">
+  <picture>
+    <source srcset="https://macvim.org/images/macvim-screenshot-light.png"  media="(prefers-color-scheme: light)"/>
+    <source srcset="https://macvim.org/images/macvim-screenshot-dark.png"  media="(prefers-color-scheme: dark)"/>
+    <img width="535" alt="macvim-screenshot-light" src="https://macvim.org/images/macvim-screenshot-light.png" />
+  </picture>
+</p>
 
-- [![MacVim GitHub CI](https://github.com/macvim-dev/macvim/actions/workflows/ci-macvim.yaml/badge.svg)](https://github.com/macvim-dev/macvim/actions/workflows/ci-macvim.yaml)
+## Features
 
-- Packaged in [![Homebrew package](https://repology.org/badge/version-for-repo/homebrew/macvim.svg)](https://repology.org/metapackage/macvim/versions) [![MacPorts package](https://repology.org/badge/version-for-repo/macports/macvim.svg)](https://repology.org/metapackage/macvim/versions)
+- Smooth native GUI that supports menus, dialog boxes, toolbars, and scroll bars.
+- Native and non-native full-screen modes.
+- Trackpad gestures, Touch Bar, and Command key shortcuts can be mapped to Vim actions.
+- Integrates with system services, dictionary lookup, and Apple Intelligence Writing Tools.
+- Vim GUI tabs with customizable colors.
+- Font ligatures and accurate text rendering.
+
+## Getting Started
+
+See [installation documentation](https://github.com/macvim-dev/macvim/wiki/Installing) for more details and alternative methods to install.
+
+### Download
+
+You can download the latest version of MacVim from the [Releases](https://github.com/macvim-dev/macvim/releases/latest) page.
+
+### Install via Package Manager
+
+If you would like to install using a package manager, MacVim can be installed via Homebrew:
+
+  ```zsh
+  brew install macvim
+  ```
+
+MacVim is also available as a Homebrew cask. It will install the same pre-built binary as the one available from GitHub release:
+
+  ```zsh
+  brew install --cask macvim-app
+  ```
+
+After installation, MacVim can be launched using the Dock or in the terminal using the `mvim` command.
+
+### Building from Source
+
+If you prefer to build MacVim from source, detailed instructions are provided in the [Building MacVim](https://github.com/macvim-dev/macvim/wiki/Building) guide.
+
+## Relationship with Vim
+
+MacVim is a downstream fork of Vim, and routinely [merges from upstream](https://github.com/macvim-dev/macvim/wiki/Merging-from-upstream-Vim). The original Vim README can be found at [README_vim.md](README_vim.md). Vim itself is also available for macOS, but it does not have a GUI.
+
+In Homebrew, there are both a `macvim` and `vim` package. Both packages will provide a terminal version of Vim with similar features. The `vim` package is from the upstream Vim project and is usually a bit more up-to-date in core Vim features, while the `macvim` package will provide the additional GUI version bundled as an app.
+
+## License
+
+MacVim is released under the [Vim License](https://github.com/macvim-dev/macvim/blob/master/LICENSE).
+
+## Support
+
+If you encounter any issues or have questions, feel free to [open an issue](https://github.com/macvim-dev/macvim/issues) or visit the [discussions](https://github.com/macvim-dev/macvim/discussions) page.
 

README.rux.txt

@@ -1,161 +0,0 @@
-README.rux.txt для версии 9.1 программы Vim — Vi IMproved.
-
-
-ЧТО ТАКОЕ РЕДАКТОР VIM?
-
-Программа Vim — это значительно улучшенная версия старого доброго редактора Vi
-из системы UNIX.  При разработке этого редактора было добавлено множество новых
-возможностей: многоуровневая отмена изменений, подсветка синтаксиса, журнал
-командной строки, интерактивная справка, проверка орфографии, подстановка
-наименований файлов и команд, операции с произвольными блоками текста,
-встроенный язык программирования и т. д.  Также доступен графический интерфейс
-пользователя (GUI).  И при этом сохраняется совместимость с редактором Vi,
-и те, у кого Vi «в крови», будут чувствовать себя как дома.  Подробности о
-различиях с редактором Vi см. в файле "runtime/doc/vi_diff.txt".
-
-Этот редактор очень удобен для работы с исходным кодом программ, а также
-разного рода других текстовых файлов.  Все команды вводятся набором обычных
-символов клавиатуры, поэтому те, кто освоил десятипальцевый метод печати, могут
-работать очень быстро.  Кроме того, пользователи могут назначить на
-функциональные клавиши клавиатуры необходимые команды, и использовать
-манипулятор «мышь».
-
-Редактор Vim работает в ОС MS Windows (7, 8, 10, 11), macOS, Haiku, VMS и
-практически во всех UNIX-подобных системах.  А перенос на другие платформы не
-должен представлять особой сложности.
-Предыдущие версии редактора Vim работают в операционных системах OS/2, MS-DOS,
-MS Windows 95/98/Me/NT/2000/XP/Vista, AmigaDOS, Atari MiNT, BeOS и RISC OS.
-Но поддержка этих версий больше не осуществляется.
-
-
-ПРЕДОСТАВЛЕНИЕ РЕДАКТОРА Vim
-
-Для установки редактора Vim можно воспользоваться привычным диспетчером пакетов.
-В системах Mac и Linux уже предустановленна начальная версия программы Vim,
-но вам все равно нужно установить редактор Vim, если вы хотите получить больше
-возможностей.
-
-Существуют отдельные версии для Unix, PC, Amiga и некоторых других систем.
-Данный файл README.rux.txt поставляется вместе с архивом рабочих файлов
-программы.  Этот архив включает в себя документацию, файлы подсветки синтаксиса
-и другие файлы, которые используются редактором во время работы.  Чтобы
-запустить программу Vim, вы должны получить либо архив с исполняемыми файлами,
-либо архив с исходным кодом.  Какой из них вам нужен, зависит от того, на какой
-системе вы хотите запустить редактор Vim, и есть ли для этой системы
-исполняемые файлы или вы должны компилировать программу самостоятельно.
-Чтобы узнать о доступных в настоящее время пакетах программы, посмотрите на
-веб‐странице https://www.vim.org/download.php.
-
-Несколько полезных мест, где можно получить последнюю версию редактора Vim:
-* Посмотрите в git-хранилище на GitHub: https://github.com/vim/vim.
-* Получить исходный код в виде архива: https://github.com/vim/vim/tags.
-* Получить исполняемый файл для ОС Windows из хранилища vim-win32-installer:
-https://github.com/vim/vim-win32-installer/releases.
-
-
-КОМПИЛЯЦИЯ РЕДАКТОРА Vim
-
-Если для вашей системы уже есть готовые исполняемые файлы, вам не нужно самому
-компилировать редактор Vim.  Если вы скачали архив с исходным кодом, то всё
-необходимое для компиляции программы Vim находится в каталоге "src".
-Инструкции смотрите в файле src/INSTALL.
-
-
-УСТАНОВКА ПРОГРАММЫ Vim
-
-Инструкции для конкретной системы смотрите в одном из нижеуказанных файлов.
-Или в каталоге READMEdir (на https://github.com/vim/vim), или в основном
-каталоге (если вы распаковываете архив):
-
-README_ami.txt		Amiga
-README_unix.txt		Unix
-README_dos.txt		MS-DOS и MS Windows
-README_mac.txt		Macintosh
-README_haiku.txt	Haiku
-README_vms.txt		VMS
-
-Существует ещё несколько файлов README_*.txt, в зависимости от предоставляемого
-пакета.
-
-
-ДОКУМЕНТАЦИЯ ПО РЕДАКТОРУ Vim
-
-Учебник Vim — это часовой практический курс для начинающих.  Как правило, для
-работы с ним нужно набрать команду "vimtutor".  Чтобы получить дополнительную
-информацию, смотрите раздел документации ":help tutor".
-
-Лучше всего воспользоваться командой ":help" в редакторе Vim.  Если у вас ещё
-нет исполняемого файла программы, прочитайте файл "runtime/doc/help.txt".
-В нём содержатся отсылки на другие полезные файлы документации.  Руководство
-пользователя можно читать как книгу, и оно рекомендуется для обучения работе
-с редактором Vim.  Смотрите ":help user-manual".
-
-
-ЛИЦЕНЗИОННЫЕ ПРАВА
-
-Редактор Vim является благотворительным программным обеспечением.
-Использование и копирование программы Vim не ограничено, однако рекомендуется
-сделать добровольное пожертвование для нуждающихся детей в Уганде.  Чтобы узнать
-подробности, прочитайте, пожалуйста, файл "runtime/doc/uganda.rux" (введите
-команду ":help uganda" в редакторе Vim).
-
-Краткое описание лицензии.
-Нет никаких ограничений на использование или распространение немодифицированной
-копии программы Vim.  Части программы Vim также могут предоставляться отдельно,
-но текст лицензии Vim всегда должен быть включён в поставку.
-Для модифицированных версий программы действует несколько ограничений.
-Лицензия Vim совместима с лицензией GNU GPL, вы можете компилировать
-и распространять программу Vim с библиотеками, лицензированными под GNU GPL.
-
-
-ФИНАНСОВАЯ ПОДДЕРЖКА ДЛЯ РАЗРАБОТКИ РЕДАКТОРА Vim
-
-Устранение ошибок и добавление новых функциональных возможностей требует
-вложения немалого количества времени и сил.  Выразить признательность за труд
-и подкрепить заинтересованность разработчиков программы в дальнейшей работе
-над редактором Vim можно с помощью оказания финансовой поддержки.
-
-Пожертвованные вами деньги будут в основном направлены на оказание помощи детям
-Уганды, см. "runtime/doc/uganda.rux".  Однако в любом случае финансирование
-будет способствовать повышению заинтересованности команды разработчиков
-в продолжении работы над редактором Vim!
-
-Самая свежая информация об оказании финансовой поддержки публикуется на
-веб-сайте программы Vim:
-	https://www.vim.org/sponsor/
-
-
-ПОМОЩЬ В РАЗРАБОТКЕ РЕДАКТОРА Vim
-
-Если вы хотите помочь сделать редактор Vim лучше, смотрите файл CONTRIBUTING.md.
-
-
-ДОПОЛНИТЕЛЬНАЯ ИНФОРМАЦИЯ
-
-Для системе macOS вы може использовать MacVim:  https://macvim.org
-
-Последние новости о редакторе Vim можно найти на его домашней странице:
-	https://www.vim.org/
-
-Если у вас возникли вопросы, посмотрите полезные советы или документацию по
-редактору Vim:
-	https://www.vim.org/docs.php
-	https://vim.fandom.com/wiki/Vim_Tips_Wiki
-
-Если у вас все ещё остались вопросы или есть сложности, воспользуйтесь одним
-из списков рассылки, чтобы обсудить их с пользователями и разработчиками:
-	https://www.vim.org/maillist.php
-
-Если ничего не помогает, сообщайте об ошибках непосредственно в список рассылки
-vim-dev:
-	<vim-dev@vim.org>
-
-
-ОСНОВНОЙ АВТОР ПРОГРАММЫ
-
-Большая часть редактора Vim была создана Брамом Моленаром <Bram@vim.org>,
-см. ":help Bram-Moolenaar"
-
-Присылайте все прочие комментарии, исправления, цветы и предложения в список
-рассылки vim-dev:
-	<vim-dev@vim.org>

README.txt

@@ -1,4 +1,4 @@
-README.txt for version 9.1 of Vim: Vi IMproved.
+README.txt for version 9.2 of Vim: Vi IMproved.
 
 
 WHAT IS VIM?
@@ -15,6 +15,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 mapped to commands by the user, and the mouse can be used.
 
+Vim also aims to provide a (mostly) POSIX-compatible vi implementation, when
+compiled with a minimal feature set (typically called vim.tiny), which is used
+by many Linux distributions as the default vi editor.
+
 Vim runs under MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS and almost all
 flavours of UNIX.  Porting to other systems should not be very difficult.
 Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,

README_VIM9.md

@@ -28,7 +28,7 @@ way:
 * Local variables are not available in an l: dictionary.
 * A few more things that slow us down, such as exception handling details.
 
-I Implemented a "proof of concept" and measured the time to run a simple
+I implemented a "proof of concept" and measured the time to run a simple
 for loop with an addition (Justin used this example in his presentation,
 full code is below):
 
@@ -224,7 +224,7 @@ Eventually this will lead to Vim 9!
 
 ## Code for sum time measurements
 
-Vim was build with -O2.
+Vim was built with -O2.
 
 ``` vim
 func VimOld()

README_vim.md

@@ -1,7 +1,6 @@
 # [![Vim The editor](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)
 
 [![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22)
-[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim)
 [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim)
 [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master)
 [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim)
@@ -12,7 +11,9 @@
 If you find a bug or want to discuss the best way to add a new feature, please
 [open an issue](https://github.com/vim/vim/issues/new/choose).
 If you have a question or want to discuss the best way to do something with
-Vim, you can use [StackExchange](https://vi.stackexchange.com/)
+Vim, you can join [`#vim`](https://web.libera.chat/#vim),
+[reddit.com/r/vim](https://reddit.com/r/vim),
+use [StackExchange](https://vi.stackexchange.com/),
 or one of the [Maillists](https://www.vim.org/community.php).
 
 ## What is Vim?
@@ -32,6 +33,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 mapped to commands by the user, and the mouse can be used.
 
+Vim also aims to provide a (mostly) POSIX-compatible vi implementation, when
+compiled with a minimal feature set (typically called vim.tiny), which is used
+by many Linux distributions as the default vi editor.
+
 Vim runs under MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS and almost all
 flavours of UNIX.  Porting to other systems should not be very difficult.
 Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
@@ -150,4 +155,4 @@ Most of Vim was created by Bram Moolenaar `<Bram@vim.org>`
 Send any other comments, patches, flowers and suggestions to the vim-dev mailing list:
 	`<vim-dev@vim.org>`
 
-This is `README.md` for version 9.1 of Vim: Vi IMproved.
+This is `README.md` for version 9.2 of Vim: Vi IMproved.

READMEdir/Contents

@@ -9,15 +9,15 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...
 
-		Version 9.1.  Also runs under UNIX, MS-Windows, Mac, etc.
-		vim91rt.tgz  contains the documentation and syntax files.
-		vim91bin.tgz contains the binaries.
-		vim91src.tgz contains the sources.
+		Version 9.2.  Also runs under UNIX, MS-Windows, Mac, etc.
+		vim92rt.tgz  contains the documentation and syntax files.
+		vim92bin.tgz contains the binaries.
+		vim92src.tgz contains the sources.
 		Author: Bram Moolenaar et al.
 
 
 Xxd		Hex dumper and reader.  Can be used to view files as hex, edit
 		them and write them back.  Can also be used to patch files.
 
-		Version 2023 Oct 25
-		Author: Juergen Weigert
+		Version 2025 Nov 26
+		Author: Juergen Weigert et al.

READMEdir/README_ami.txt

@@ -1,4 +1,4 @@
-README_ami.txt for version 9.1 of Vim: Vi IMproved.
+README_ami.txt for version 9.2 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.
@@ -16,8 +16,8 @@ easily upgrade to a new version.  For example:
 You would then unpack the archives like this:
 
   cd dh0:editors
-  tar xf t:vim91bin.tar
-  tar xf t:vim91rt.tar
+  tar xf t:vim92bin.tar
+  tar xf t:vim92rt.tar
 
 Set the $VIM environment variable to point to the top directory of your Vim
 files.  For the above example:

READMEdir/README_amibin.txt

@@ -1,8 +1,8 @@
-README_amibin.txt for version 9.1 of Vim: Vi IMproved.
+README_amibin.txt for version 9.2 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim90rt.tgz).
+These files are in the runtime archive (vim92rt.tgz).
 
 
 The Amiga "bin" archive contains the Vim executable for the Amiga.  It was

READMEdir/README_amisrc.txt

@@ -1,8 +1,8 @@
-README_amisrc.txt for version 9.1 of Vim: Vi IMproved.
+README_amisrc.txt for version 9.2 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim90rt.tgz).
+These files are in the runtime archive (vim92rt.tgz).
 
 
 The Amiga source archive contains the files needed to compile Vim on the

READMEdir/README_bindos.txt

@@ -1,16 +1,16 @@
-README_bindos.txt for version 9.1 of Vim: Vi IMproved.
+README_bindos.txt for version 9.2 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim90rt.zip).
+These files are in the runtime archive (vim92rt.zip).
 
 
 There are several binary distributions of Vim for the PC.  You would normally
 pick only one of them, but it's also possible to install several.
 These ones are available (the version number may differ):
-	vim91w32.zip	Windows 95/98/NT/etc. console version
-	gvim91.zip	Windows 95/98/NT/etc. GUI version
-	gvim91ole.zip	Windows 95/98/NT/etc. GUI version with OLE
+	vim92w32.zip	Windows console version
+	gvim92.zip	Windows GUI version
+	gvim92ole.zip	Windows GUI version with OLE
 
-You MUST also get the runtime archive (vim91rt.zip).
-The sources are also available (vim91src.zip).
+You MUST also get the runtime archive (vim92rt.zip).
+The sources are also available (vim92src.zip).

READMEdir/README_dos.txt

@@ -1,4 +1,4 @@
-README_dos.txt for version 9.1 of Vim: Vi IMproved.
+README_dos.txt for version 9.2 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on MS-Windows systems.
 See "README.txt" for general information about Vim.
@@ -41,19 +41,19 @@ These are the normal steps to install Vim from the .zip archives:
    located.  Check the $VIM setting to see where it points to:
 	set VIM
    For example, if you have
-	C:\vim\vim91
+	C:\vim\vim92
    do
 	cd C:\
    Binary and runtime Vim archives are normally unpacked in the same location,
    on top of each other.
 
-2. Unpack the zip archives.  This will create a new directory "vim\vim91",
+2. Unpack the zip archives.  This will create a new directory "vim\vim92",
    in which all the distributed Vim files are placed.  Since the directory
    name includes the version number, it is unlikely that you overwrite
    existing files.
    Examples:
-	pkunzip -d gvim91.zip
-	unzip vim91w32.zip
+	pkunzip -d gvim92.zip
+	unzip vim92w32.zip
 
    You need to unpack the runtime archive and at least one of the binary
    archives.  When using more than one binary version, be careful not to
@@ -65,7 +65,7 @@ These are the normal steps to install Vim from the .zip archives:
    won't move or copy the runtime files.
 
 3. Change to the new directory:
-	cd vim\vim91
+	cd vim\vim92
    Run the "install.exe" program.  It will ask you a number of questions about
    how you would like to have your Vim setup.  Among these are:
    - You can tell it to write a "_vimrc" file with your preferences in the
@@ -76,8 +76,8 @@ These are the normal steps to install Vim from the .zip archives:
      console or in a shell.  You can select one of the directories in your
      $PATH.  If you skip this, you can add Vim to the search path manually:
      The simplest is to add a line to your autoexec.bat.  Examples:
-	set path=%path%;C:\vim\vim91
-	set path=%path%;D:\editors\vim\vim91
+	set path=%path%;C:\vim\vim92
+	set path=%path%;D:\editors\vim\vim92
    - Create entries for Vim on the desktop and in the Start menu.
 
 That's it!
@@ -89,8 +89,8 @@ Remarks:
   won't show a menubar.  Then you need to set the $VIM environment variable to
   point to the top directory of your Vim files.  Example:
     set VIM=C:\editors\vim
-  Vim version 9.1 will look for your vimrc file in $VIM, and for the runtime
-  files in $VIM/vim91.  See ":help $VIM" for more information.
+  Vim version 9.2 will look for your vimrc file in $VIM, and for the runtime
+  files in $VIM/vim92.  See ":help $VIM" for more information.
 
 - To avoid confusion between distributed files of different versions and your
   own modified vim scripts, it is recommended to use this directory layout:
@@ -101,14 +101,14 @@ Remarks:
 	C:\vim\vimfiles\ftplugin\*.vim	Filetype plugins
 	C:\vim\...			Other files you made.
   Distributed files:
-	C:\vim\vim91\vim.exe		The Vim version 9.1 executable.
-	C:\vim\vim91\doc\*.txt		The version 9.1 documentation files.
-	C:\vim\vim91\bugreport.vim	A Vim version 9.1 script.
-	C:\vim\vim91\...		Other version 9.1 distributed files.
+	C:\vim\vim92\vim.exe		The Vim version 9.2 executable.
+	C:\vim\vim92\doc\*.txt		The version 9.2 documentation files.
+	C:\vim\vim92\bugreport.vim	A Vim version 9.2 script.
+	C:\vim\vim92\...		Other version 9.2 distributed files.
   In this case the $VIM environment variable would be set like this:
 	set VIM=C:\vim
-  Then $VIMRUNTIME will automatically be set to "$VIM\vim91".  Don't add
-  "vim91" to $VIM, that won't work.
+  Then $VIMRUNTIME will automatically be set to "$VIM\vim92".  Don't add
+  "vim92" to $VIM, that won't work.
 
 - You can put your Vim executable anywhere else.  If the executable is not
   with the other Vim files, you should set $VIM. The simplest is to add a line
@@ -120,30 +120,6 @@ Remarks:
   entry, you can remove it by running the "uninstall.exe".  See
   ":help win32-popup-menu".
 
-- In Windows 95/98/NT you can create a shortcut to Vim.  This works for all
-  DOS and Win32 console versions.  For the console version this gives you the
-  opportunity to set defaults for the Console where Vim runs in.
-
-  1. On the desktop, click right to get a menu.  Select New/Shortcut.
-  2. In the dialog, enter Command line: "C:\command.com".  Click "Next".
-  3. Enter any name.  Click "Finish".
-     The new shortcut will appear on the desktop.
-  4. With the mouse pointer on the new shortcut, click right to get a menu.
-     Select Properties.
-  5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
-     Vim executable.  Examples:
-	C:\command.com /c C:\vim\vim91\vim.exe
-	C:\command.com /c D:\editors\vim\vim91\vim.exe
-  6. Select the font, window size, etc. that you like.  If this isn't
-     possible, select "Advanced" in the Program tab, and deselect "MS-DOS
-     mode".
-  7. Click OK.
-
-  For gvim, you can use a normal shortcut on the desktop, and set the size of
-  the Window in your $VIM/_gvimrc:
-	set lines=30 columns=90
-
-
 For further information, type one of these inside Vim:
 	:help dos
 	:help win32

READMEdir/README_extra.txt

@@ -1,4 +1,4 @@
-README_extra.txt for version 9.1 of Vim: Vi IMproved.
+README_extra.txt for version 9.2 of Vim: Vi IMproved.
 
 These extra files of Vim are for special purposes.  This README explains what
 the files are for.  For general information about Vim, see the "README.txt"
@@ -29,7 +29,7 @@ src/gui_w32.*		Files for the Win32 GUI.
 src/gui_w48.*		Files for the Win32 and Win16 GUI.
 src/Make_mvc.mak	MS Visual C++ makefile for the Win32 GUI.
 
-src/if_ole.*		OLE automation interface, for MS Windows 95 and NT.
+src/if_ole.*		OLE automation interface, for MS Windows.
 
 src/GvimExt/*		DLL for the "Edit with Vim" context menu entry
 

READMEdir/README_haiku.txt

@@ -1,4 +1,4 @@
-README_haiku.txt for version 9.1 of Vim: Vi IMproved.
+README_haiku.txt for version 9.2 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Haiku operating system.
 See "README.txt" for general information about Vim.

READMEdir/README_mac.txt

@@ -1,4 +1,4 @@
-README_mac.txt for version 9.1 of Vim: Vi IMproved.
+README_mac.txt for version 9.2 of Vim: Vi IMproved.
 
 How to install MacVim?
 ========================

READMEdir/README_ole.txt

@@ -1,9 +1,9 @@
-README_ole.txt for version 9.1 of Vim: Vi IMproved.
+README_ole.txt for version 9.2 of Vim: Vi IMproved.
 
 This archive contains gvim.exe with OLE interface.
 This version of gvim.exe can also load a number of interface dynamically (you
 can optionally install the .dll files for each interface).
-It is only for MS-Windows 95/98/ME/NT/2000/XP.
+It is only for MS-Windows.
 
 Also see the README_bindos.txt, README_dos.txt and README.txt files.
 

READMEdir/README_os2.txt

@@ -1,4 +1,4 @@
-README_os2.txt for version 9.1 of Vim: Vi IMproved.
+README_os2.txt for version 9.2 of Vim: Vi IMproved.
 
 This file used to explain the installation of Vim on OS/2 systems.
 However, support for OS/2 has been removed in patch 7.4.1008.

READMEdir/README_os390.txt

@@ -1,4 +1,4 @@
-README_os390.txt for version 9.1 of Vim: Vi IMproved.
+README_os390.txt for version 9.2 of Vim: Vi IMproved.
 
 This readme explains how to build Vim on z/OS.  Formerly called OS/390.
 See "README.txt" for general information about Vim.

READMEdir/README_src.txt

@@ -1,8 +1,8 @@
-README_src.txt for version 9.1 of Vim: Vi IMproved.
+README_src.txt for version 9.2 of Vim: Vi IMproved.
 
 The source archive contains the files needed to compile Vim on Unix systems.
 It is packed for Unix systems (NL line separator).
 
 For more information, see the README.txt file that comes with the runtime
-archive (vim-9.1-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive (vim-9.2-rt.tar.gz).  To be able to run Vim you MUST get the runtime
 archive too!

READMEdir/README_srcdos.txt

@@ -1,8 +1,8 @@
-README_srcdos.txt for version 9.1 of Vim: Vi IMproved.
+README_srcdos.txt for version 9.2 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-Windows.
-These files are in the runtime archive (vim90rt.zip).
+These files are in the runtime archive (vim92rt.zip).
 
 
 The DOS source archive contains the files needed to compile Vim on MS-Windows.

READMEdir/README_unix.txt

@@ -1,4 +1,4 @@
-README_unix.txt for version 9.1 of Vim: Vi IMproved.
+README_unix.txt for version 9.2 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.

READMEdir/README_vms.txt

@@ -1,4 +1,4 @@
-README_vms.txt for version 9.1 of Vim: Vi IMproved.
+README_vms.txt for version 9.2 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on VMS systems.
 See "README.txt" in the runtime archive for information about Vim.

READMEdir/README_w32s.txt

@@ -1,4 +1,4 @@
-README_w32s.txt for version 9.1 of Vim: Vi IMproved.
+README_w32s.txt for version 9.2 of Vim: Vi IMproved.
 
 This file used to explain the installation of Vim on MS-Windows 3.1 and 3.11
 systems.  However, support for MS-Windows 3.1 and 3.11 has been removed in

SECURITY.md

@@ -2,9 +2,16 @@
 
 ## Reporting a vulnerability
 
-If you want to report a security issue, please privately disclose the issue to the vim-security mailing list
-vim-security@googlegroups.com
-
-This is a private list, read only by the maintainers, but anybody can post, after moderation.
+If you want to report a security issue, please privately disclose the issue either via:
+- The vim-security mailing list: vim-security@googlegroups.com  
+  This is a private list, read only by the maintainers, but anybody can post.
+- [GitHub Security Advisories](https://github.com/vim/vim/security/advisories/new)
 
 **Please don't publicly disclose the issue until it has been addressed by us.**
+
+## Guidelines for reporting
+- Clearly explain **why** the behaviour is a security issue, not just that a bug exists.
+- Keep reports concise and focused.
+- Do not flood us with a list of issues. Report them one by one to ensure to not overwhelm us with the work load.
+- Do **not** submit AI-generated reports without carefully reviewing them first. Low-quality or
+  speculative reports waste maintainer time and will be closed without action, and repeat offenders **will be banned**.

ci/appveyor.bat

@@ -1,131 +0,0 @@
-@echo off
-:: Batch file for building/testing Vim on AppVeyor
-set target=%1
-set "GETTEXT_PATH=c:\gettext64\bin"
-
-setlocal ENABLEDELAYEDEXPANSION
-cd %APPVEYOR_BUILD_FOLDER%
-
-:: Python3
-set "PYTHON3_VER=311"
-set "PYTHON3_RELEASE=3.11.1"
-set "PYTHON3_URL=https://www.python.org/ftp/python/%PYTHON3_RELEASE%/python-%PYTHON3_RELEASE%-amd64.exe"
-set "PYTHON3_DIR=C:\python%PYTHON3_VER%-x64"
-
-:: Gettext-tools, iconv and libraries
-set "GETTEXT64_URL=https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-shared-64.zip"
-set "GETTEXT64_DIR=c:\gettext64"
-
-set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
-
-if exist "%VSWHERE%" (
-  for /f "usebackq delims=" %%i in (
-    `"%VSWHERE%" -products * -latest -property installationPath`
-  ) do (
-    set "VCVARSALL=%%i\VC\Auxiliary\Build\vcvarsall.bat"
-  )
-)
-
-if not exist "%VCVARSALL%" (
-  set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
-)
-call "%VCVARSALL%" x64
-
-goto %target%
-echo Unknown build target.
-exit 1
-
-:: ----------------------------------------------------------------------------
-:install
-@echo on
-if not exist downloads mkdir downloads
-
-:: Python 3
-if not exist %PYTHON3_DIR% (
-  call :downloadfile %PYTHON3_URL% downloads\python3.exe
-  cmd /c start /wait downloads\python3.exe /quiet TargetDir=%PYTHON3_DIR% ^
-      Include_pip=0 Include_tcltk=0 Include_test=0 Include_tools=0 ^
-      AssociateFiles=0 Shortcuts=0 Include_doc=0 Include_launcher=0 ^
-      InstallLauncherAllUsers=0
-)
-:: GETTEXT
-if not exist %GETTEXT64_DIR% (
-  mkdir %GETTEXT64_DIR%
-  call :downloadfile %GETTEXT64_URL% downloads\gettext64.zip
-  cmd /c powershell.exe -NoLogo -NoProfile -Command ^
-    Add-Type -AssemblyName 'System.IO.Compression.FileSystem'; ^
-    [System.IO.Compression.ZipFile]::ExtractToDirectory^('downloads\gettext64.zip', ^
-    '%GETTEXT64_DIR%'^)
-    copy /y %GETTEXT64_DIR%\bin\libintl-8.dll C:\projects\vim\src\ || exit 1
-    copy /y %GETTEXT64_DIR%\bin\libiconv-2.dll C:\projects\vim\src\ || exit 1
-)
-
-@echo off
-goto :eof
-
-:: ----------------------------------------------------------------------------
-:build
-
-cd src
-
-echo "Building MSVC 64bit console Version"
-nmake -f Make_mvc.mak CPU=AMD64 ^
-    OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
-    FEATURES=%FEATURE%
-if not exist vim.exe (
-    echo Build failure.
-    exit 1
-)
-
-:: build MSVC huge version with python and channel support
-:: GUI needs to be last, so that testing works
-echo "Building MSVC 64bit GUI Version"
-if "%FEATURE%" == "HUGE" (
-    nmake -f Make_mvc.mak CPU=AMD64 ^
-        OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
-        PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
-        PYTHON3_VER=%PYTHON3_VER% DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
-        FEATURES=%FEATURE%
-) ELSE (
-    nmake -f Make_mvc.mak CPU=AMD64 ^
-        OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
-        FEATURES=%FEATURE%
-)
-if not exist gvim.exe (
-    echo Build failure.
-    exit 1
-)
-.\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt || exit 1
-
-echo "version output MSVC console"
-.\vim --version || exit 1
-echo "version output MSVC GUI"
-type ver_msvc.txt || exit 1
-
-goto :eof
-
-:: ----------------------------------------------------------------------------
-:test
-@echo on
-cd src/testdir
-:: Testing with MSVC gvim
-path %PYTHON3_DIR%;%GETTEXT_PATH%;%PATH%
-nmake -f Make_mvc.mak VIMPROG=..\gvim
-nmake -f Make_mvc.mak clean
-:: Testing with MSVC console version
-nmake -f Make_mvc.mak VIMPROG=..\vim
-
-@echo off
-goto :eof
-
-:: ----------------------------------------------------------------------------
-:downloadfile
-:: call :downloadfile <URL> <localfile>
-if not exist %2 (
-	curl -f -L %1 -o %2
-)
-if ERRORLEVEL 1 (
-	rem Retry once.
-	curl -f -L %1 -o %2 || exit 1
-)
-@goto :eof

ci/config.mk.brew-libiconv.sed

@@ -0,0 +1,8 @@
+# Use Homebrew GNU libiconv to work around broken Apple iconv. Use static
+# linking as we don't want our binary releases to pull in third-party
+# dependencies.
+#
+# If gettext is configured in the build, it also needs to be built against GNU
+# libiconv. Otherwise we would get a link error from this.
+/^CFLAGS[[:blank:]]*=/s/$/ -I\/opt\/homebrew\/opt\/libiconv\/include/
+/^LIBS[[:blank:]]*=/s/-liconv/\/opt\/homebrew\/opt\/libiconv\/lib\/libiconv.a/

ci/config.mk.sed

@@ -1,3 +1,3 @@
 /^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Werror -Wno-deprecated-declarations/
-/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function -Wno-shadow/
+/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function -Wno-strict-prototypes -Wno-shadow/
 /^RUBY_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-parameter -Wno-strict-prototypes/

ci/ddebs.list

@@ -0,0 +1,2 @@
+deb http://ddebs.ubuntu.com noble main restricted universe multiverse
+deb http://ddebs.ubuntu.com noble-updates main restricted universe multiverse

ci/gen_testset.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+
+import argparse
+import itertools
+import json
+import re
+import subprocess
+
+
+def generate_testset(n):
+    cp = subprocess.run(["make", "-C", "src/testdir", "-npq"], capture_output=True)
+
+    tests = set()
+    for line in cp.stdout.decode().split("\n"):
+        if re.match(r"^(NEW_TESTS_RES|TEST_VIM9_RES) = ", line):
+            tests.update(re.findall(r"\btest\w+\.res\b", line))
+
+    tests = sorted(list(tests))
+    # move test_alot*.res to the end
+    tests = (
+        [t for t in tests if not t.startswith("test_alot")]
+        + [t for t in tests if t.startswith("test_alot_")]
+        + ["test_alot.res"]
+    )
+    targets = tests
+
+    if n > 1:
+        targets = [ts for ts in itertools.batched(tests, n)]
+        targets = [[t for t in ts if t] for ts in itertools.zip_longest(*targets)]
+
+    return targets
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("n", type=int, nargs="?", default=1)
+    args = parser.parse_args()
+
+    print(json.dumps(generate_testset(args.n)))
+
+
+if __name__ == "__main__":
+    main()

ci/hlgroups.ignore

@@ -0,0 +1,70 @@
+ColorColumn
+ComplMatchIns
+Conceal
+Cursor
+CursorColumn
+CursorIM
+CursorLine
+CursorLineNr
+debugBreakpoint
+debugPC
+DiffAdd
+DiffChange
+DiffDelete
+DiffText
+Directory
+ErrorMsg
+FoldColumn
+Folded
+Ignore
+IncSearch
+lCursor
+LineNr
+LineNrAbove
+LineNrBelow
+MatchParen
+Menu
+ModeMsg
+MoreMsg
+MsgArea
+NonText
+Normal
+Pmenu
+PmenuSbar
+PmenuSel
+PmenuThumb
+PmenuShadow
+Question
+Scrollbar
+Search
+SignColumn
+SpecialKey
+SpellBad
+SpellCap
+SpellLocal
+SpellRare
+StatusLine
+StatusLineNC
+StatusLineTerm
+StatusLineTermNC
+TabLine
+TabLineFill
+TabLineSel
+Terminal
+Title
+TitleBar
+TitleBarNC
+TOhtmlProgress
+TOhtml-progress-color
+ToolbarButton
+ToolbarLine
+Tooltip
+User1
+User1..9
+User9
+VertSplit
+Visual
+VisualNOS
+WarningMsg
+WildMenu
+WinColor

ci/hlgroups.make

@@ -0,0 +1,18 @@
+# vim: ft=make
+SHELL = /bin/bash
+
+# Default target to actually run the comparison:
+.PHONY: check
+.INTERMEDIATE: hlgroups deflinks hlgroups.stripped
+
+check: hlgroups.stripped deflinks
+	diff hlgroups.stripped deflinks
+
+hlgroups:
+	grep '\*hl-' ../runtime/doc/*txt | sed -E -e 's/.*:<?\s*//' -e 's/hl-//g' -e 's/\*//g' -e 's/ /\n/g' | sort > hlgroups
+
+deflinks: ../src/highlight.c
+	grep '"default link'  $< | sed 's/.*default link\s*\(.*\)\s.*/\1/' | sort > deflinks
+
+hlgroups.stripped: hlgroups.ignore hlgroups
+	grep -v -x -F -f hlgroups.ignore hlgroups > hlgroups.stripped

ci/if_feat_check.vim

@@ -0,0 +1,15 @@
+if 1 " This prevents it from being run in tiny versions
+  " Check for required features
+  if exists("g:required")
+    for feature in g:required
+      if !has(feature)
+        echo "Error: Feature '" .. feature .. "' not found"
+        echo ''
+        cquit
+      endif
+    endfor
+    echo "\nChecked features: " .. string(g:required)
+    echo ''
+  endif
+endif
+" vim: sts=2 sw=2 et

ci/if_ver-1.vim

@@ -1,6 +1,6 @@
-" Print all interface versions for Ubuntu. Part 1.
+" Print all interface versions. Part 1.
 
-if 1
+if 1 " This prevents it from being run in tiny versions
   execute 'source' expand('<sfile>:h') .. '/if_ver-cmd.vim'
 
   echo "*** Interface versions ***\n"

ci/if_ver-2.vim

@@ -1,6 +1,8 @@
-" Print py3 interface versions for Ubuntu. Part 2.
+" Print py3 interface versions. Part 2.
+" This is done separately from part 1 because Vim cannot concurrently load
+" Python 2 and 3 together.
 
-if 1
+if 1 " This prevents it from being run in tiny versions
   execute 'source' expand('<sfile>:h') .. '/if_ver-cmd.vim'
 
   echo 'Python 3:'

ci/lychee.toml

@@ -0,0 +1,47 @@
+#############################  Runtime  #############################
+
+# Reasonable concurrency to avoid rate-limiting small hosts.
+max_concurrency = 14
+
+# File extensions to scan
+extensions = ["c", "h", "md", "html", "txt"]
+
+#############################  Requests  ############################
+
+# Accepted status codes
+# - Include 429 (Too Many Requests) to avoid marking throttled links as dead.
+accept = ["100..=103", "200..=299", "429"]
+
+# Retry each request a few times on transient network errors
+max_retries = 2
+retry_wait_time = 2
+
+# Timeout per request in seconds
+timeout = 60
+
+#############################  Exclusions  ##########################
+
+exclude = [
+  '^https?://sys/file$',
+  '^file://.*',
+  '^https?://(www\.)?badges\.debian\.net/.*$',
+  '^https?://(www\.)?repology\.org/.*$',
+  '^https?://scan\.coverity\.com/.*$',
+  '^https?://(www\.)?img\.shields\.io/.*$',
+  '^https?://(www\.)?fossies\.org/.*$',
+  '^https?://(www\.)?adobe\.com.*$',
+  '^https?://(www\.)?google\.com.*$',
+  '^https?://(www\.)?forum\.vmssoftware\.com/.*$',
+  '^http://vim\.sourceforge\.net/scripts/script\.php\?script_id=40$',
+  '^https://is\.gd/.*$',
+  '^https://wiki\.contextgarden\.net/Vim$',
+  '^https://github\.com/you/foobar\.git$',
+  '^https?://flatassembler\.net',
+  '^https?://www\.fleiner\.com/vim/download.html',
+]
+
+# Lychee only reads UTF-8 files
+exclude_path = [
+  'src/po',
+  'src/testdir',
+]

ci/pinned-pkgs

@@ -0,0 +1,69 @@
+# Unfortunately ubtunu does not keep the debug packages strictly up-to-date
+# with the main packages. So this file needs to pin the main packages back to
+# the version for which debug packages are available.
+
+Package: libwayland-client0
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-client0
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+Package: libwayland-cursor0
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-cursor0
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+Package: libwayland-egl1
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-egl1
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+Package: libwayland-dev
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-dev
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+Package: libwayland-server0
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-server0
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+Package: libwayland-bin
+Pin: version 1.20.0-1
+Pin-Priority: 1000
+
+Package: libwayland-bin
+Pin: version 1.20.0-1ubuntu0.1
+Pin-Priority: 100
+
+# As of 2025-04-27 the base library package libgtk-3-0t64 is still at 3.24.41-4ubuntu1.2
+Package: libgtk-3-0t64-dbgsym
+Pin: version 3.24.41-4ubuntu1.2
+Pin-Priority: 1000
+
+Package: libgtk-3-0t64-dbgsym
+Pin: version 3.24.41-4ubuntu1.3
+Pin-Priority: 100
+
+# As of 2025-04-27 the base binary package libgtk-3-bin is still at 3.24.41-4ubuntu1.2
+Package: libgtk-3-bin-dbgsym
+Pin: version 3.24.41-4ubuntu1.2
+Pin-Priority: 1000
+
+Package: libgtk-3-bin-dbgsym
+Pin: version 3.24.41-4ubuntu1.3
+Pin-Priority: 100

ci/unlisted.make

@@ -21,7 +21,7 @@ $(eval all_patterns := $(shell \
 			p; \
 		}'))
 
-# In Makefile's `prepeare` target, all the IN_README_DIR files are moved from
+# In Makefile's `prepare` target, all the IN_README_DIR files are moved from
 # READMEdir to the root, so add those files in their Git-tracked location:
 all_patterns := $(all_patterns) \
 	$(foreach readme, $(IN_README_DIR), READMEdir/$(readme))

lang/LICENSE.it.txt

@@ -0,0 +1,99 @@
+LICENZA VIM
+
+Nota: Agli effetti legali ha valore non la seguente traduzione italiana, ma
+l'originale inglese su cui è basata. È alla versione inglese che si fa
+riferimento qui sotto quando si parla di "questa licenza" (NdT).
+
+I)  Non ci sono restrizioni alla distribuzione di copie non modificate di Vim,
+    alla condizione che esse includano il testo di questa licenza.  Si possono
+    anche distribuire parti non modificate di Vim, sempre senza restrizioni,
+    alla condizione che esse includano il testo di questa licenza.  È anche
+    consentito includere programmi eseguibili da voi preparati a partire dai
+    file sorgenti Vim non modificati, più i vostri esempi di utilizzo e i
+    vostri script Vim.
+
+II) È consentito distribuire una versione modificata (o estesa) di Vim,
+    contenente programmi eseguibile e/o codice sorgente, quando siano
+    rispettare le seguenti quattro condizioni:
+    1) Il testo di questa licenza deve essere incluso senza modifiche.
+    2) La versione modificata di Vim dev'essere distribuita in una della
+       seguenti cinque maniere:
+       a) Se voi personalmente modificate a Vim, dovete descrivere
+          chiaramente nella distribuzione come è possibile mettersi in
+          contatto con voi.  Quando il manutentore vi chiede (in qualsiasi
+          forma) una copia della versione modificata di Vim da voi
+          distribuita, dovete rendere disponibili le vostre modifiche,
+          compreso il codice sorgente, al manutentore, senza alcuna spesa.
+          Il manutentore si riserva il diritto di includere le vostre
+          modifiche nella versione ufficiale di Vim.  Quel che il manutentore
+          potrà fare con le vostre modifiche e sotto quale licenza esse
+          verranno distribuite può essere oggetto di negoziazione.  Se non c'è
+          stata alcuna negoziazione, questa licenza, o una versione successiva
+          della stessa è anche applicabile alle vostre modifiche.
+          I manutentori correnti sono elencati qui:
+          https://github.com/orgs/vim/people.
+          Se dovessero cambiare, ne sarò dato annuncio nei luoghi appropriati
+          (verosimilmente vim.sf.net, www.vim.org e/o comp.editors).  Quando
+          sia completamente impossibile contattare il manutentore, l'obbligo
+          di spedirgli le vostre modifiche viene meno.  Una volta che il
+          manutentore abbia confermato di aver ricevuto le vostre modifiche,
+          non sarà necessario spedirle ulteriormente.
+       b) Se avete ricevuto un Vim modificato che era stato distribuito come
+          descritto al punto a) potete ulteriormente distribuirlo senza
+          modificarlo, come menzionato al punto I).  Se fate ulteriori
+          modifiche, il testo al punto a) si applica a queste modifiche.
+       c) Includete tutte le modifiche, compreso il codice sorgente, con ogni
+          copia del Vim modificato da voi distribuito.  Questo può essere
+          fatto sotto forma dell'output di un comando "diff", che contenga
+          anche il contesto [ossia anche le linee non modificate di sorgente
+          che vengono prima o dopo le modifiche - NdT].  Potete scegliere
+          quale licenza volete utilizzare per il nuovo codice sorgente che voi
+          aggiungere.  Le modifiche e la relativa licenza non devono impedire
+          a terze parti di apportare le loro proprie modifiche a Vim.
+       d) Quando avete un Vim modificato che comprende modifiche quali quelle
+          menzionate al punto c), potete distribuirlo senza il codice sorgente
+          che descrive le modifiche, se le seguenti tre condizioni sono
+          soddisfatte:
+          - La licenza applicabile alle modifiche vi consente di distribuire
+            le modifiche al manutentore Vim senza alcun costo o restrizione, e
+            permette al manutentore Vim di includere le modifiche nella
+            versione ufficiale di Vim senza alcun costo o restrizione.
+          - Le modifiche da voi fatte sono conservate per almeno tre anni,
+            dopo che avrete distribuito per l'ultima volta il Vim modificato
+            corrispondente alle modifiche stesse.  Quando il manutentore o
+            qualcuno a cui voi avete distribuito il Vim modificato vi chiede
+            (in qualsiasi forma) le modifiche, entro il periodo qui indicato,
+            dovete fargliele avere.
+          - Dovete descrivere chiaramente nella distribuzione come è possibile
+            mettersi in contatto con voi.  Questa informazione di contatto
+            deve rimanere valida per almeno tre anni dopo l'ultima data di
+            distribuzione della corrispondente modifica di Vim, oppure il più
+            a lungo possibile.
+       e) Quando al GNU General Public License (GPL) si applica alle
+          modifiche, potete distribuire il Vim modificato sotto la versione 2
+          della licenza GNU GPL versione 2 o una qualsiasi versione successiva
+          della stessa licenza.
+    3) Un messaggio deve essere aggiunto, almeno all'output del comando
+       ":version" e nella schermata introduttiva, in modo che l'utilizzatore
+       del Vim modificato sia in grado di comprendere cosa è stato modificato.
+       Quando si distribuisca come menzionato al punto 2)e) l'aggiunta del
+       messaggio è richiesta solo se ciò non conduca a conflitti con la
+       licenza usata per le modifiche.
+    4) L'informazione di contatto, richiesta ai punto 2)a) e 2)d) non deve
+       essere rimossa o modificata, tranne che per il fatto che la persona
+       stessa può apportare delle correzioni.
+
+III) Se distribuite una versione modificata di Vim, siete incoraggiati a
+     utilizzare la licenza Vim per le vostre modifiche, e a mettere le
+     modifiche a disposizione del manutentore, compreso il codice sorgente.
+     Il modo preferito in cui fare questo è tramite e-mail o caricando
+     i file su un server ed inviandone l'indirizzo (URL) tramite e-mail.
+     Se il numero di modifiche è piccolo (per esempio, una modifica a un
+     Makefile) inviare tramite email l'output del comando diff con contesto
+     può essere sufficiente.  L'indirizzo e-mail da utilizzare è
+     <maintainer@vim.org>
+
+IV)  Non è consentito rimuovere questa licenza dalla distribuzione dei codici
+     sorgente Vim, anche in parte, o da una versione di Vim modificata.
+     Potete usare questa licenza per precedenti versioni di Vim, invece della
+     licenza con cui esse sono state distribuite, a vostra scelta.

lang/LICENSE.pt_br.txt

@@ -0,0 +1,81 @@
+LICENÇA DO VIM
+
+I) Não há restrições para distribuir cópias não modificadas do Vim, exceto
+   que elas devem incluir este texto de licença. Você também pode distribuir
+   partes não modificadas do Vim, igualmente irrestritas, exceto que elas
+   devem incluir este texto de licença. Você também tem permissão para incluir
+   executáveis que você fez a partir das fontes não modificadas do Vim, além 
+   de seus próprios exemplos de uso e scripts do Vim.
+
+II) É permitido distribuir uma versão modificada (ou estendida) do Vim,
+    incluindo executáveis e/ou código-fonte, quando as quatro
+    condições a seguir forem atendidas:
+    1) Este texto de licença deve ser incluído sem modificações.
+    2) O Vim modificado deve ser distribuído de uma das cinco formas a seguir:
+       a) Se você fizer alterações no Vim, deverá descrever claramente na
+          distribuição como entrar em contato com você. Quando o mantenedor
+          solicitar a você (de qualquer forma) uma cópia do Vim modificado que
+          você distribuiu, você deverá disponibilizar suas alterações,
+          incluindo o código-fonte, ao mantenedor sem taxa. O mantenedor
+          reserva o direito de incluir suas alterações na versão oficial
+          do Vim. O que o mantenedor fará com suas alterações e sob qual
+          licença elas serão distribuídas é negociável. Se não houve negociação
+          então esta licença, ou uma versão posterior, também se aplica às suas
+          alterações. Os mantenedores atuais estão listados aqui:
+          https://github.com/orgs/vim/people. Se isso mudar, será anunciado em
+          lugares apropriados (provavelmente vim.sf.net, www.vim.org e/ou
+          comp.editors). Quando for completamente impossível contatar o
+          mantenedor, a obrigação de enviar a ele suas alterações cessa.
+          Uma vez que o mantenedor tenha confirmado que ele recebeu suas
+          alterações, elas não precisarão ser enviadas novamente.
+       b) Se você recebeu um Vim modificado que foi distribuído como
+          mencionado em a), você tem permissão para distribuí-lo sem
+          modificações, como mencionado em I). Se você fizer alterações
+          adicionais, o texto em a) se aplica a essas alterações.
+       c) Forneça todas as alterações, incluindo o código-fonte, com cada cópia
+          do Vim modificado que você distribuir. Isso pode ser feito na forma
+          de um diff de contexto. Você pode escolher qual licença usar para o
+          novo código que você adicionar. As alterações e sua licença não devem
+          restringir outros de fazer suas próprias alterações na versão oficial
+          do Vim.
+       d) Quando você tem um Vim modificado que inclui alterações conforme
+          mencionado em c), você pode distribuí-lo sem o código-fonte para as
+          alterações se as três condições a seguir forem atendidas:
+          - A licença que se aplica às alterações permite que você distribua
+            as alterações para o mantenedor do Vim sem taxa ou restrição, e
+            permite que o mantenedor do Vim inclua as alterações na
+            versão oficial do Vim sem taxa ou restrição.
+          - Você mantém as alterações por pelo menos três anos após a última
+            distribuição do Vim modificado correspondente. Quando o mantenedor
+            ou alguém para quem você distribuiu o Vim modificado solicitar a
+            você (de qualquer forma) as alterações dentro deste período, você
+            deve disponibilizá-las a ele.
+          - Você descreve claramente na distribuição como entrar em contato
+            com você. Estas informações de contato devem permanecer válidas por
+            pelo menos três anos após a última distribuição do Vim modificado
+            correspondente, ou pelo maior tempo possível.
+       e) Quando a Licença Pública Geral GNU (GPL) se aplica às alterações,
+          você pode distribuir o Vim modificado sob a GNU GPL versão 2 ou
+          qualquer versão posterior.
+    3) Uma mensagem deve ser adicionada, no mínimo na saída do comando
+       ":version" e na tela de introdução, de modo que o usuário do Vim
+       modificado seja capaz de ver que ele foi modificado. Ao distribuir
+       conforme mencionado em 2)e), só é necessário adicionar a mensagem
+       na medida em que isso não entre em conflito com a licença usada para
+       as alterações.
+    4) As informações de contato conforme exigido em 2)a) e 2)d) não devem ser
+       removidas ou alteradas, exceto que a própria pessoa pode fazer
+       correções.
+
+III) Se você distribuir uma versão modificada do Vim, encorajamos que use
+     a licença do Vim para suas alterações e disponibilizá-las ao
+     mantenedor, incluindo o código-fonte. A maneira preferida de fazer isso é
+     por e-mail ou enviando os arquivos para um servidor e enviando a URL por
+     e-mail. Se o número de alterações for pequeno (por exemplo, um Makefile
+     modificado), enviar um diff de contexto por e-mail será suficiente.
+     O endereço de e-mail a ser usado é <maintainer@vim.org>
+
+IV) Não é permitido remover esta licença da distribuição das fontes do Vim,
+    partes dela ou de uma versão modificada. Você pode usar esta licença
+    para versões anteriores do Vim em vez da licença com a qual elas vieram,
+    a seu critério.

lang/LICENSE.ru.txt

@@ -0,0 +1,114 @@
+Примечание. Данный текст перевода лицензии Vim предоставляется с целью
+ознакомления и не является юридически значимым. Переводчик не несёт
+ответственности за возможные неточности и ошибки при переводе лицензии.
+Единственно юридически значимым является текст лицензии Vim на английском языке.
+
+ЛИЦЕНЗИЯ VIM
+
+I)  Неизменённые копии программы Vim могут распространяться без ограничения
+    при условии включения данного текста лицензии. Распространение
+    неизменённых копий отдельных частей программы Vim также возможно
+    при соблюдении условия о включении данного текста лицензии. Подобным
+    образом разрешается добавлять исполняемые файлы, скомпилированные
+    из неизменённого исходного кода программы Vim, а также собственные
+    примеры использования и командные файлы редактора Vim.
+
+II) Изменённую (или дополненную) версию программы Vim, включающую
+    исполняемые файлы и/или исходный код, допускается распространять
+    при соблюдении следующих четырёх условий:
+    1) Текст настоящей лицензии должен включаться в состав распространяемой
+    версии программы Vim без изменений.
+    2) Изменённая версия программы Vim должна распространяться одним
+    из следующих пяти способов:
+       a) При внесении изменений в программу Vim, в дистрибутиве должны
+	  быть явно указаны контактные данные лица, внёсшего эти изменения.
+	  Ответственному разработчику по его запросу (в любой форме) должна
+	  быть безвозмездно предоставлена копия распространяемой изменённой
+	  версии программы Vim, включая её исходный код. Ответственный
+	  разработчик оставляет за собой право включать сделанные изменения
+	  в официальную версию программы Vim. Конкретные действия
+	  ответственного разработчика, относительно переданных изменений,
+	  а также лицензионные условия, на основании которых будет
+	  осуществляться их распространение, могут быть дополнительно
+	  согласованы. Если согласование не проводилось, сделанные изменения
+	  будут распространяться на условиях настоящей лицензии или более
+	  поздней её версии. Лица, в данное время являющиеся ответственными
+	  за разработку, указаны в перечне, размещённом по адресу:
+	  https://github.com/orgs/vim/people.
+	  При изменении этой информации, актуальные данные будут
+	  опубликованы на соответствующих ресурсах (вероятнее всего
+	  по интернет‐адресам vim.sf.net, www.vim.org и/или comp.editors).
+	  В случае полной невозможности связаться с ответственным
+	  разработчиком, обязательства по отправке изменений утрачивают
+	  силу. После передачи подтверждения о получении изменений
+	  от ответственного разработчика, необходимость в повторной
+	  отправке копии изменённой программы Vim неприменима.
+       b) Если лицом получена изменённая версия программа Vim,
+	  распространяющаяся на условиях, указанных в ч. II) п. 2) пп. а)
+	  допускается дальнейшее её распространение этим лицом без внесения
+	  изменений и согласно ч. I) настоящей лицензии. В случае внесения
+	  дополнительных изменений, на эти изменения будут распространяться
+	  условия, указанные в ч. II) п. 2) пп. a).
+       c) Каждая копия распространяемой изменённой версии программы Vim
+	  должна включать информацию обо всех произведённых изменениях,
+	  включая исходный код. Эта информация может быть представлена
+	  в виде построчного сравнения файлов. Выбор лицензии, по условиям
+	  которой будет распространяться добавленный код, остаётся
+	  за автором этих изменений. Изменения и лицензия на эти изменения
+	  не должны запрещать другим лицам внесение своих собственных
+	  изменений в официальную версию программы Vim.
+       d) Изменённая версия программы Vim, содержащая изменения в
+	  соответствии с ч. II) п. 2 пп. c), может распространяться без
+	  исходного кода для этих изменений, при соблюдении следующих трёх
+	  условий:
+	  - Лицензия, применяемая к внесённым изменениям, предоставляет
+	    ответственному разработчику программы Vim возможность
+	    безвозмездного и неограниченного распространения этих изменений,
+	    а также право на безвозмездное и неограниченное включение этих
+	    изменений в официальную версию программы Vim.
+	  - Изменения должны сохраняться не менее трёх лет со времени
+	    распространения соответствующей изменённой версии программы Vim.
+	    В течение этого периода по запросу ответственного разработчика
+	    или другого пользователя изменённой версии программы Vim
+	    (в любой форме) необходимо предоставить исходный код данных
+	    изменений.
+	  - В дистрибутиве изменённой версии программы Vim должны быть явно
+	    указаны контактные данные лица, внёсшего эти изменения.
+	    Контактные данные должны сохранять актуальность в течение
+	    не менее трёх лет со времени последнего распространения
+	    соответствующей изменённой версии программы Vim или как можно
+	    дольше.
+       e) Если к изменениям, внесённым в программу Vim, применимы условия
+	  лицензии GNU General Public License (GNU GPL), допускается
+	  распространение изменённой версия программы Vim на условиях
+	  лицензии GNU GPL версии 2 или любой более поздней версии этой
+	  лицензии.
+    3) Необходимо добавить соответствующую информацию, которая должна быть
+       выведена в результате выполнения команды ":version" в программе Vim,
+       а также на экране приветствия программы Vim, чтобы пользователь
+       изменённой версии программы Vim имел возможность определить,
+       что он пользуется изменённой версией. При распространении
+       на условиях, указанных в ч. II) п. 2) пп. e) такую информацию
+       требуется добавлять только в том случае, когда она не противоречит
+       лицензии, распространяющейся на эти изменения.
+    4) Контактная информация, которая указывается по требованию ч. II) п. 2)
+       пп. a) и ч. II) п. 2) пп. d) не должна удаляться или изменяться никем
+       другим, кроме лица, указавшего данную контактную информацию.
+
+III) При распространении изменённой версии программы Vim рекомендуется
+     пользоваться лицензией Vim для произведённых изменений и обеспечить
+     доступ к этим изменениям ответственного разработчика, включая исходный
+     код изменений. Предпочтительным способом предоставления доступа
+     к произведённым изменениям является отправка этих изменений через
+     электронную почту или размещение файлов на сервер с отправкой
+     URL-адреса по электронной почте. Если количество изменений
+     незначительно (например, изменения в файле Makefile), достаточно будет
+     отправить через электронную почту файл построчного сравнения. Изменения
+     или URL-адреса должны быть направлены на адрес электронной почты
+     maintainer@vim.org
+
+IV)  Не допускается удаление настоящей лицензия из дистрибутива исходного
+     кода программы Vim, его отдельных частей или изменённой версии.
+     Допускается использование настоящей лицензию для предыдущих
+     изменённых выпусков программы Vim, взамен тех лицензий, с которыми
+     они распространялись.

lang/LICENSE.sv.txt

@@ -0,0 +1,78 @@
+VIM-LICENS
+
+I)  Det finns inga begränsningar för distribution av oförändrade kopior av Vim förutom
+    att de måste innehålla denna licenstext.  Du kan också distribuera
+    oförändrade delar av Vim, likaså utan begränsningar förutom att de måste
+    innehålla denna licenstext.  Du får också inkludera körbara filer
+    som du har skapat från de oförändrade Vim-källorna, samt dina egna användningsexempel
+    och Vim-skript.
+
+II) Det är tillåtet att distribuera en modifierad (eller utökad) version av Vim,
+    inklusive körbara filer och/eller källkod, när följande fyra
+    villkor är uppfyllda:
+    1) Denna licenstext måste inkluderas oförändrad.
+    2) Den modifierade Vim måste distribueras på ett av följande fem sätt:
+       a) Om du själv gör ändringar i Vim måste du tydligt beskriva
+          distributionen hur man kan kontakta dig.  När underhållaren ber dig
+          (på något sätt) om en kopia av den modifierade Vim du distribuerat, måste du
+          måste du göra dina ändringar, inklusive källkoden, tillgängliga för
+          underhållaren utan kostnad.  Underhållaren förbehåller sig rätten att
+          inkludera dina ändringar i den officiella versionen av Vim.  Vad
+          underhållaren kommer att göra med dina ändringar och under vilken licens de
+          kommer att distribueras är förhandlingsbart.  Om ingen förhandling har ägt rum
+          gäller denna licens, eller en senare version, även för dina ändringar.
+          De nuvarande underhållarna finns listade här: https://github.com/orgs/vim/people.
+          Om detta ändras kommer det att meddelas på lämpliga platser (troligen
+          vim.sf.net, www.vim.org och/eller comp.editors). När det är helt
+          omöjligt att kontakta underhållaren upphör skyldigheten att skicka
+          dina ändringar upphör.  När underhållaren har bekräftat att han har
+          mottagit dina ändringar behöver de inte skickas igen.
+       b) Om du har fått en modifierad Vim som distribuerats enligt
+          nämnts under a) får du distribuera den vidare
+          oförändrat, enligt vad som anges i I).  Om du gör ytterligare ändringar gäller
+          gäller texten under a) för dessa ändringar.
+       c) Tillhandahåll alla ändringar, inklusive källkod, med varje kopia av
+          den modifierade Vim du distribuerar.  Detta kan göras i form av en
+          kontextdiff.  Du kan välja vilken licens du vill använda för ny kod som du
+          lägger till.  Ändringarna och deras licens får inte hindra andra från att
+          göra egna ändringar i den officiella versionen av Vim.
+       d) När du har en modifierad Vim som innehåller ändringar enligt
+          under c), kan du distribuera den utan källkoden för
+          ändringarna om följande tre villkor är uppfyllda:
+          - Licensen som gäller för ändringarna tillåter dig att distribuera
+            ändringarna till Vim-underhållaren utan avgift eller begränsningar, och
+            tillåter Vim-underhållaren att inkludera ändringarna i den officiella
+            versionen av Vim utan avgift eller begränsningar.
+          - Du behåller ändringarna i minst tre år efter senaste
+            distribution av motsvarande modifierade Vim.  När underhållaren
+            eller någon som du distribuerat den modifierade Vim till ber dig (på
+            något sätt) om ändringarna inom denna period måste du göra dem
+            tillgängliga för honom.
+          - Du beskriver tydligt i distributionen hur man kan kontakta dig.  Denna
+            kontaktinformationen måste vara giltig i minst tre år
+            efter den sista distributionen av motsvarande modifierade Vim, eller så länge
+            som möjligt.
+       e) När GNU General Public License (GPL) gäller för ändringarna,
+          kan du distribuera den modifierade Vim under GNU GPL version 2 eller
+          någon senare version.
+    3) Ett meddelande måste läggas till, åtminstone i utdata från kommandot ":version"
+       och i introduktionsskärmen, så att användaren av den modifierade Vim
+       kan se att den har modifierats.  Vid distribution enligt
+       under 2)e) krävs det endast att meddelandet läggs till i den mån detta
+       inte strider mot den licens som används för ändringarna.
+    4) Kontaktinformationen som krävs enligt 2)a) och 2)d) får inte
+       tas bort eller ändras, förutom att personen själv kan göra
+       korrigeringar.
+
+III) Om du distribuerar en modifierad version av Vim uppmuntras du att använda
+     Vim-licensen för dina ändringar och göra dem tillgängliga för
+     underhållaren, inklusive källkoden.  Det bästa sättet att göra detta är
+     via e-post eller genom att ladda upp filerna till en server och e-posta URL:en.
+     Om antalet ändringar är litet (t.ex. en modifierad Makefile) räcker det att skicka ett
+     kontextdiff.  E-postadressen som ska användas är
+     <maintainer@vim.org>
+
+IV)  Det är inte tillåtet att ta bort denna licens från distributionen av Vim
+     källkoden, delar av den eller från en modifierad version.  Du får använda denna
+     licensen för tidigare Vim-utgåvor istället för den licens som de levererades med
+     med, om du så önskar.

lang/LICENSE.zh_cn.txt

@@ -0,0 +1,60 @@
+注意: 本译文仅供参考。若因译文错漏引发任何问题，译者概不承担责任。VIM 许可证的
+完整英文版本为唯一法律依据。如有任何疑问，以英文原文为准。
+
+VIM 许可证
+
+I)  可以任意发布没有修改的 Vim 的拷贝，但是必须保证包含本许可证。您也可以发布
+    未经修改的部分 Vim，同样也必须包含这份许可证。发布由未经修改的 Vim 源代码
+    所编译出的 Vim 可执行文件，外加您自己的应用实例和 Vim 脚本也是允许的。
+
+II) 在满足以下全部四个条件的前提下，您可以发布经过修改 (或扩充) 的 Vim 版本，
+    包括可执行文件 和/或 源代码:
+    1) 本许可证必须包含在内，并且不能被修改。
+    2) 经过修改的 Vim 必须以下述五种方式之一发布:
+      a) 如果您本人对 Vim 做了改动，您必须在发布版本里清楚地说明如何与您联系。
+         当 Vim 的维护者 (以任何方式) 向您索取您所发布的 Vim 时，您必须把所做
+         的改动包括源代码无偿地提供出来。维护者保留把这些改动加入 Vim 正式版本
+         的权利。至于维护者怎样处理这些改动，以及用什么许可证发布，可以协商。
+         如果没有协商，那么，本许可证，或者它更新的版本，同样适用于您做出的改
+         动。Vim 现在的几位维护者可见:
+              https://github.com/orgs/vim/people
+         如果维护者发生变动，会在合适的地方 (很可能是 vim.sf.net、www.vim.org
+         和/或 comp.editors) 公布，当完全不能与维护者联系时，发送变更的约定自
+         动终止。一旦维护者确认收到了您所做的修改，您就不必再次发送了。
+
+      b) 如果您得到的是一个修改过的 Vim，并且它是在条件 a) 下发布的，那么您可
+         以不加改动地在条件 I) 下发布它；如果您又做了额外的改动，则这些改动受
+         到 a) 款条文的约束。
+
+      c) 在您发布的经过修改的 Vim 的每一份拷贝里，提供所有的变更部分，包括源代
+         码。提供的形式可以采用上下文风格的差异比较记录 (context diff)。您可以
+         为添加的新代码选择许可证，但是这些更改和为其选择的许可证不能限制他人
+         对 Vim 正式版本作出自己的改动。
+
+      d) 在满足以下全部三个条件的前提下，您可以继续发布带有条件 c) 所提及之变
+         更的经过修改的 Vim，而不必在发布时提供更改部分的源代码:
+         - 这些变更所附带的许可证允许您把这些变更无偿地并且没有任何限制地提供
+           给 Vim 的维护者，而且允许 Vim 的维护者无偿地并且没有任何限制地把这
+           些更改加入到 Vim 的正式版本中。
+         - 从您最后一次发布更改的 Vim 之日起，您要保存这些改动至少三年时间。在
+           这期间，维护者或别人 (以任何方式) 向您要求提供这些变更时，您必须提
+           供给他。
+         - 您要在发布版本中清楚地说明如何与您联系，这个联系方式必须保证自最后
+           一次发布相应的经过修改的 Vim 之日起至少三年有效，或尽可能长。
+      e) 当这些变更以 GPL (GNU General Public License，GNU 通用公共许可证) 发
+         布时，您可以在 GPL 版本 2，或更高版本的 GPL 下发布修改过的 Vim。
+    3) 必须添加一条改动的信息。至少要放在 "version" 命令的输出和启动画面里，好
+       让用户知道自己用的是一个修改过的 Vim。当以 2)e) 条件发布时，只有不与变
+       更适用的许可证冲突，这个信息的添加才是必要的。
+    4) 在 2)a) 和 2)d) 条件里要求的联系方式不能随便更改或删除，除非是作者自己
+       作出的更正。
+
+III) 如果您发布一个更改过的 Vim，强烈建议您对变更部分使用 Vim 的许可证，并且对
+     维护者提供变更部分并开放源代码。最好的方式是通过电子邮件或者把文件放到服
+     务器上，通过电子邮件传送 URL。如果只修改了很少的部分 (例如，只是一个修改
+     过的 Makefile)，那么传送一个上下文风格的差异比较记录 (context diff) 就可
+     以了。电子邮件的地址是 <maintainer@vim.org>
+
+IV)  不允许从 Vim 的源代码的发行版本或其中部分的源代码里删除本许可证，即使来自
+     更改过的版本也是如此。您可能想用这份许可证代替以前版本的 Vim 里的许可证，
+     这可以由您自行决定。

lang/README.it.txt

@@ -0,0 +1,167 @@
+README.txt per la versione 9.1 di Vim: VI Migliorato.
+
+
+COS'È VIM?
+
+Vim è una versione migliorata del classico programma di videoscrittura UNIX
+Vi.  Molte nuove funzionalità sono state aggiunte: la possibilità di avere
+multipli annullamenti di comando, l'evidenziazione sintattica, una storia dei
+comandi immessi, file di aiuto facilmente consultabili, controlli ortografici,
+completamento di nomi di file, operazioni su blocchi di dati, un linguaggio di
+script, etc.  È anche disponibile una versione grafica (GUI).  Tuttavia è
+possibile lavorare come se si stesse usando il Vi "classico".  Chi avesse Vi
+"sulle dita" si troverà a suo agio.  Vedere il file "runtime/doc/vi_diff.txt"
+[in inglese] per dettagli sulle differenze di Vim rispetto a Vi.
+
+Questo editor è molto utile per modificare programmi e altri file di testo.
+Tutti i comandi sono immessi usando i tasti presenti sulla tastiera, in modo
+che chi è in grado di digitare usando tutte e dieci le dita può lavorare molto
+velocemente.  Inoltre, i tasti funzione possono essere mappati per inserire
+comandi dell'utente, ed è possibile usare il mouse.
+
+Vim è disponibile in ambiente MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS e
+in quasi tutte le varianti di Unix.  L'adattamento a nuovi sistemi operativi
+non dovrebbe essere molto difficile.
+Precedenti versioni di Vim funzionano in ambiente MS-DOS, MS-Windows
+95/98/Me/NT/2000/XP/Vista, Amiga DOS, Atari MiNT, BeOS, RISC OS e OS/2.
+Tali versioni non sono più supportate.
+
+
+DISTRIBUZIONE
+
+Spesso è possibile usare il vostro Gestore applicazioni preferito per
+installare Vim.  Negli ambienti Mac e Linux una versione base di Vim è inclusa
+nel sistema operativo, ma può ancora essere necessario installare Vim se si
+desiderano funzionalità ulteriori.
+
+Ci sono distribuzioni separate di Vim per gli ambienti Unix, PC, Amiga e per
+qualche altro sistema operativo.  Questo file README.txt è contenuto nelle
+directory che contengono i file usati da Vim in fase di esecuzione.  Nelle
+stesse directory sono presente la documentazione, i file usati per
+l'evidenziazione sintattica e altri file usati da Vim in fase di esecuzione.
+Per installare Vim occorre ottenere un archivio che contiene solo i file
+eseguibili, o un archivio che permette di compilare Vim a partire dai file
+sorgente.  Quale alternativa preferire dipende dal sistema su cui si vuole
+usare Vim, e dal preferire (o meno) di compilarlo direttamente a partire dai
+file sorgente.  Consultate "https://www.vim.org/download.php" per una
+panoramica delle distribuzioni correntemente disponibili.
+
+Alcuni siti da cui ottenere l'ultima versione di Vim:
+* Consultare la repository git in github: https://github.com/vim/vim.
+* Procurarsi il codice sorgente come archivio https://github.com/vim/vim/tags.
+* Ottenere un file per installare Vim in ambiente Windows dalla repository
+  vim-win32-installer:
+  https://github.com/vim/vim-win32-installer/releases.
+
+
+COMPILARE VIM
+
+Se si è ottenuta una distribuzione di file eseguibili di Vim non è necessario
+compilarlo.  Se si è ottenuta una distribuzione di file sorgente, tutto ciò
+che serve per compilare Vim è nella directory "src".  Vedere src/INSTALL per
+come procedere.
+
+
+INSTALLAZIONE
+
+Vedere uno dei file elencati più sotto per istruzioni riguardo a uno specifico
+sistema operativo.  Tali file sono (nella repository git) nella directory
+READMEdir oppure nella directory principale se si scompatta un archivio:
+
+README_ami.txt		Amiga
+README_unix.txt		Unix
+README_dos.txt		MS-DOS e MS-Windows
+README_mac.txt		Macintosh
+README_haiku.txt	Haiku
+README_vms.txt		VMS
+
+Esistono altri file README_*.txt, a seconda della distribuzione in uso.
+
+
+DOCUMENTAZIONE
+
+Esiste un corso di introduzione a Vim per principianti, della durata di circa
+un'ora.  Normalmente si può accedervi tramite il comando "vimtutor".  Vedere
+":help tutor" per ulteriori informazioni.
+
+Ma la cosa migliore è usare la documentazione disponibile in una sessione di
+Vim, tramite il comando ":help".  Se ancora non si ha a disposizione Vim, si
+può leggere il file "runtime/doc/help.txt".  Questo file contiene puntatori
+agli altri file che costituiscono la documentazione.
+All'interno della documentazione esiste anche uno User Manual (manuale utente)
+che si legge come un libro ed è raccomandato per imparare a usare Vim.
+Vedere ":help user-manual".  Il manuale utente è stato interamente tradotto in
+italiano, ed è disponibile, vedere:
+	https://www.vim.org/translations.php
+
+
+COPIE
+
+Vim è un Charityware (ossia eventuali offerte per il suo utilizzo vanno a
+un'attività caritativa).  Vim può essere usato e copiato liberamente, senza
+limitazioni, ma è incoraggiata un'offerta a favore di orfani ugandesi.  Si
+prega di leggere il file "runtime/doc/uganda.txt" per dettagli su come fare
+(il file si può visualizzare digitando ":help uganda" all'interno di Vim).
+
+Sommario della licenza: Non ci sono restrizioni nell'uso e nella distribuzione
+di una copia non modificata di Vim.  Parti di Vim possono anche essere
+distribuite, ma il testo della licenza va sempre incluso.  Per versioni
+modificate di Vim, valgono alcune limitazioni.  La licenza di Vim è
+compatibile con la licenza GPL, è possibile compilare Vim utilizzando librerie
+con licenza GPL e distribuirlo.
+
+
+SPONSORIZZAZIONI
+
+Correggere errori e aggiungere nuove funzionalità richiede tempo e fatica.
+Per mostrare la vostra stima per quest'attività e per fornire motivazioni
+agli sviluppatori perché continuino a lavorare su Vim, siete invitati a
+fare una donazione.
+
+Le somme donate saranno usate principalmente per aiutare dei bambini in
+Uganda.  Vedere "runtime/doc/uganda.txt".  Allo stesso tempo, le donazioni
+aumentano la motivazione del gruppo di sviluppo a continuare a lavorare su
+Vim!
+
+Informazioni più aggiornate sulla sponsorizzazione, possono essere trovate
+sul sito Internet di Vim:
+	https://www.vim.org/sponsor/
+
+
+CONTRIBUIRE
+
+Chi vuole contribuire a rendere Vim ancora migliore, può consultare
+il file CONTRIBUTING.md (in inglese).
+
+
+INFORMAZIONE
+
+Se il vostro sistema operativo è macOS, potete usare MacVim:
+	https://macvim.org
+
+Le ultime notizie riguardo a Vim si possono trovare sulla pagina Internet di
+Vim:
+	https://www.vim.org/
+
+Se avete problemi, è possibile consultare la documentazione Vim e i
+suggerimenti su come utilizzarlo:
+	https://www.vim.org/docs.php
+	https://vim.fandom.com/wiki/Vim_Tips_Wiki
+
+Se avete ancora problemi o qualsiasi altra richiesta, è possibile usare una
+delle mailing list per discuterne con utenti e sviluppatori di Vim:
+	https://www.vim.org/maillist.php
+
+Se nient'altro funziona, potete riferire direttamente i problemi incontrati
+alla mailing list degli sviluppatori, vim-dev:
+	<vim-dev@vim.org>
+
+
+AUTORE PRINCIPALE
+
+La maggior parte di Vim è stata creata da Bram Moolenaar <Bram@vim.org>,
+vedere ":help Bram-Moolenaar"
+
+Spedire tutti gli altri commenti, modifiche al codice sorgente, fiori e
+suggerimenti alla mailing list vim-dev:
+	<vim-dev@vim.org>

lang/README.pt_br.txt

@@ -0,0 +1,131 @@
+README.txt para a versão 9.1 do Vim: Vi IMproved.
+
+O QUE É VIM?
+
+Vim é uma versão muito melhorada do bom e velho editor UNIX Vi. Muitos novos
+recursos foram adicionados: desfazer multinível, destaque de sintaxe, histórico
+de linha de comando, ajuda on-line, verificação ortográfica, completar
+nome de arquivo, operações de bloco, linguagem de script, etc. Há também uma
+interface gráfica (GUI) disponível. Ainda assim, a compatibilidade com Vi é
+mantida, aqueles que têm Vi "nos dedos" se sentirão em casa.
+Veja "runtime/doc/vi_diff.txt" para diferenças com Vi.
+
+Este editor é muito útil para editar programas e outros arquivos de texto
+simples. Todos os comandos são fornecidos com caracteres normais do teclado,
+então aqueles que podem digitar com dez dedos podem trabalhar muito rápido.
+Além disso, as teclas de função podem ser mapeadas para comandos pelo usuário,
+e o mouse pode ser usado.
+
+O Vim funciona em MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS e quase todos
+os sabores do UNIX. A portabilidade para outros sistemas não deve ser difícil.
+Versões mais antigas do Vim rodam em MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
+Amiga DOS, Atari MiNT, BeOS, RISC OS e OS/2. Eles não são mais mantidos.
+
+DISTRIBUIÇÃO
+
+Você pode frequentemente usar seu gerenciador de pacotes favorito para
+instalar o Vim. No Mac e Linux, uma pequena versão do Vim é pré-instalada,
+você ainda precisa instalar o Vim se quiser mais recursos.
+
+Existem distribuições separadas para Unix, PC, Amiga e alguns outros sistemas.
+Este arquivo README.txt vem com o arquivo de tempo de execução. Ele inclui a
+documentação, arquivos de sintaxe e outros arquivos que são usados ​​em
+tempo de execução. Para executar o Vim, você deve obter um dos arquivos
+binários ou um arquivo fonte. Qual deles você precisa depende do sistema em
+que deseja executá-lo e se você deseja ou deve compilá-lo você mesmo.
+Verifique "https://www.vim.org/download.php" para uma visão geral das
+distribuições disponíveis atualmente.
+
+Alguns lugares populares para obter o Vim mais recente:
+* Confira o repositório git do github: https://github.com/vim/vim.
+* Obtenha o código-fonte como um arquivo: https://github.com/vim/vim/tags.
+* Obtenha um executável do Windows do repositório vim-win32-installer:
+https://github.com/vim/vim-win32-installer/releases.
+
+COMPILAR
+
+Se você obteve uma distribuição binária, não precisa compilar o Vim. Se você
+obteve uma distribuição de origem, todo o material para compilar o Vim está no
+diretório "src". Veja src/INSTALL para instruções.
+
+INSTALAÇÃO
+
+Veja um desses arquivos para instruções específicas do sistema. No diretório
+READMEdir (no repositório) ou no diretório superior (se você descompactar um
+arquivo):
+
+README_ami.txt		Amiga
+README_unix.txt		Unix
+README_dos.txt		MS-DOS e MS-Windows
+README_mac.txt		Macintosh
+README_haiku.txt	Haiku
+README_vms.txt		VMS
+
+Existem outros arquivos README_*.txt, dependendo da distribuição que você usou.
+
+DOCUMENTAÇÃO
+
+O tutor do Vim é um curso de treinamento de uma hora para iniciantes.
+Frequentemente, ele pode ser iniciado como "vimtutor". Veja ":help tutor"
+para mais informações.
+
+O melhor é usar ":help" no Vim. Se você ainda não tem um executável, leia
+"runtime/doc/help.txt". Ele contém direcionamentos para os outros arquivos
+de documentação. O Manual do Usuário é lido como um livro e é recomendado
+para aprender a usar o Vim. Veja ":help user-manual".
+
+CÓPIA
+
+O Vim é um Charityware. Você pode usá-lo e copiá-lo o quanto quiser, mas
+encorajamos que faça uma doação para ajudar órfãos em Uganda. Leia o arquivo
+"runtime/doc/uganda.txt" para detalhes (execute ":help uganda" dentro do Vim).
+
+Resumo da licença: Não há restrições quanto ao uso ou distribuição de uma
+cópia não modificada do Vim. Partes do Vim também podem ser distribuídas, mas
+o texto da licença deve sempre ser incluído. Para versões modificadas, algumas
+restrições se aplicam. A licença é compatível com GPL, você pode compilar o Vim
+com bibliotecas GPL e distribuí-lo.
+
+PATROCÍNIO
+
+Corrigir bugs e adicionar novos recursos exige muito tempo e esforço.
+Para mostrar seu apreço pelo trabalho e motivar os desenvolvedores a continuar
+trabalhando no Vim, envie uma doação.
+
+O dinheiro que você doou será usado principalmente para ajudar crianças em
+Uganda. Veja "runtime/doc/uganda.txt". Mas, ao mesmo tempo, as doações aumentam
+a motivação da equipe de desenvolvimento para continuar trabalhando no Vim!
+
+Para as informações mais recentes sobre patrocínio, consulte o site do Vim:
+  https://www.vim.org/sponsor/
+
+CONTRIBUIÇÕES
+
+Se você gostaria de ajudar a tornar o Vim melhor, veja o arquivo CONTRIBUTING.md.
+
+INFORMAÇÕES
+
+Se você estiver no macOS, pode usar o MacVim: https://macvim.org
+
+As últimas notícias sobre o Vim podem ser encontradas na página inicial do Vim:
+  https://www.vim.org/
+
+Se você tiver problemas, dê uma olhada na documentação ou dicas do Vim:
+  https://www.vim.org/docs.php
+  https://vim.fandom.com/wiki/Vim_Tips_Wiki
+
+Se você ainda tiver problemas ou quaisquer outras perguntas, use uma das listas
+de discussão para discuti-las com usuários e desenvolvedores do Vim:
+  https://www.vim.org/maillist.php
+
+Se nada mais funcionar, relate os bugs diretamente para a lista de discussão
+vim-dev:
+  <vim-dev@vim.org>
+
+AUTOR PRINCIPAL
+
+A maior parte do Vim foi criada por Bram Moolenaar <Bram@vim.org>,
+":help Bram-Moolenaar"
+
+Envie quaisquer outros comentários, patches, flores e sugestões para
+a lista de discussão vim-dev: <vim-dev@vim.org>

lang/README.ru.txt

@@ -0,0 +1,166 @@
+Краткое описание для версии 9.2 программы Vim — Vi IMproved.
+
+
+ЧТО ТАКОЕ РЕДАКТОР VIM?
+
+Программа Vim — это значительно улучшенная версия старого доброго редактора Vi
+из системы UNIX.  При разработке этого редактора было добавлено множество новых
+возможностей: многоуровневая отмена изменений, подсветка синтаксиса, журнал
+командной строки, интерактивная справка, проверка орфографии, подстановка
+наименований файлов и команд, операции с произвольными блоками текста,
+встроенный язык программирования и т. д.  Также доступен графический интерфейс
+пользователя (GUI).  И при этом сохраняется совместимость с редактором Vi,
+и те, у кого Vi «в крови», будут чувствовать себя как дома.  Подробности
+о различиях с редактором Vi см. в файле "runtime/doc/vi_diff.txt".
+
+Этот редактор очень удобен для работы с исходным кодом программ, а также
+разного рода других текстовых файлов.  Все команды вводятся набором обычных
+символов клавиатуры, поэтому те, кто освоил десятипальцевый метод печати, могут
+работать очень быстро.  Кроме того, пользователи могут назначить на
+функциональные клавиши клавиатуры необходимые команды, и использовать
+манипулятор «мышь».
+
+В редакторе Vim также обеспечивается (насколько это возможно) совместимость
+с POSIX-реализацией редактора vi, если он скомпилирован с минимальным набором
+функционала (обычно называемый vim.tiny). Данная сборка чаще всего используется
+во многих дистрибутивах Linux в качестве предустановленного редактора vi.
+
+Редактор Vim работает в ОС MS Windows (7, 8, 10, 11), macOS, Haiku, VMS
+и практически во всех UNIX-подобных системах.  А перенос на другие платформы
+не должен представлять особой сложности.
+Предыдущие версии редактора Vim работают в операционных системах OS/2, MS-DOS,
+MS Windows 95/98/Me/NT/2000/XP/Vista, AmigaDOS, Atari MiNT, BeOS и RISC OS.
+Но поддержка этих версий больше не осуществляется.
+
+
+ПРЕДОСТАВЛЕНИЕ РЕДАКТОРА Vim
+
+Для установки редактора Vim можно воспользоваться привычным диспетчером пакетов.
+В системах Mac и Linux уже предустановленна начальная версия программы Vim,
+но вам все равно нужно установить редактор Vim, если вы хотите получить больше
+возможностей.
+
+Существуют отдельные версии для Unix, PC, Amiga и некоторых других систем.
+Данный файл README.ru.txt поставляется вместе с архивом рабочих файлов
+программы.  Этот архив включает в себя документацию, файлы подсветки синтаксиса
+и другие файлы, которые используются редактором во время работы.  Чтобы
+запустить программу Vim, вы должны получить либо архив с исполняемыми файлами,
+либо архив с исходным кодом.  Какой из них вам нужен, зависит от того,
+на какой системе вы хотите запустить редактор Vim, и есть ли для этой системы
+исполняемые файлы или вы должны компилировать программу самостоятельно.
+Чтобы узнать о доступных в настоящее время пакетах программы, посмотрите
+на веб‐странице https://www.vim.org/download.php.
+
+Несколько полезных мест, где можно получить последнюю версию редактора Vim:
+* Посмотрите в git-хранилище на GitHub: https://github.com/vim/vim.
+* Получить исходный код в виде архива: https://github.com/vim/vim/tags.
+* Получить исполняемый файл для ОС Windows из хранилища vim-win32-installer:
+https://github.com/vim/vim-win32-installer/releases.
+
+
+КОМПИЛЯЦИЯ РЕДАКТОРА Vim
+
+Если для вашей системы уже есть готовые исполняемые файлы, вам не нужно самому
+компилировать редактор Vim.  Если вы скачали архив с исходным кодом,
+то всё необходимое для компиляции программы Vim находится в каталоге "src".
+Инструкции смотрите в файле src/INSTALL.
+
+
+УСТАНОВКА ПРОГРАММЫ Vim
+
+Инструкции для конкретной системы смотрите в одном из нижеуказанных файлов.
+Или в каталоге READMEdir (на https://github.com/vim/vim), или в основном
+каталоге (если вы распаковываете архив):
+
+README_ami.txt		Amiga
+README_unix.txt		Unix
+README_dos.txt		MS-DOS и MS Windows
+README_mac.txt		Macintosh
+README_haiku.txt	Haiku
+README_vms.txt		VMS
+
+Существует ещё несколько файлов README_*.txt, в зависимости от предоставляемого
+пакета.
+
+
+ДОКУМЕНТАЦИЯ ПО РЕДАКТОРУ Vim
+
+Учебник Vim — это часовой практический курс для начинающих.  Как правило,
+для работы с ним нужно набрать команду "vimtutor".  Чтобы получить
+дополнительную информацию, смотрите раздел документации ":help tutor".
+
+Лучше всего воспользоваться командой ":help" в редакторе Vim.  Если у вас
+ещё нет исполняемого файла программы, прочитайте файл "runtime/doc/help.txt".
+В нём содержатся отсылки на другие полезные файлы документации.  Руководство
+пользователя можно читать как книгу, и оно рекомендуется для обучения работе
+с редактором Vim.  Смотрите ":help user-manual".
+
+
+ЛИЦЕНЗИОННЫЕ ПРАВА
+
+Редактор Vim является благотворительным программным обеспечением.
+Использование и копирование программы Vim не ограничено, однако рекомендуется
+сделать добровольное пожертвование для нуждающихся детей в Уганде. Чтобы узнать
+подробности, прочитайте, пожалуйста, файл "runtime/doc/uganda.txt" (введите
+команду ":help uganda" в редакторе Vim).
+
+Краткое описание лицензии.
+Нет никаких ограничений на использование или распространение немодифицированной
+копии программы Vim.  Части программы Vim также могут предоставляться отдельно,
+но текст лицензии Vim всегда должен быть включён в поставку.
+Для модифицированных версий программы действует несколько ограничений.
+Лицензия Vim совместима с лицензией GNU GPL, вы можете компилировать
+и распространять программу Vim с библиотеками, лицензированными под GNU GPL.
+
+
+ФИНАНСОВАЯ ПОДДЕРЖКА ДЛЯ РАЗРАБОТКИ РЕДАКТОРА Vim
+
+Устранение ошибок и добавление новых функциональных возможностей требует
+вложения немалого количества времени и сил.  Выразить признательность за труд
+и подкрепить заинтересованность разработчиков программы в дальнейшей работе
+над редактором Vim можно с помощью оказания финансовой поддержки.
+
+Пожертвованные вами деньги будут в основном направлены на оказание помощи детям
+Уганды, см. "runtime/doc/uganda.txt".  Однако в любом случае финансирование
+будет способствовать повышению заинтересованности команды разработчиков
+в продолжении работы над редактором Vim!
+
+Самая свежая информация об оказании финансовой поддержки публикуется
+на веб-сайте программы Vim:
+	https://www.vim.org/sponsor/
+
+
+ПОМОЩЬ В РАЗРАБОТКЕ РЕДАКТОРА Vim
+
+Если вы хотите помочь сделать редактор Vim лучше, смотрите файл CONTRIBUTING.md.
+
+
+ДОПОЛНИТЕЛЬНАЯ ИНФОРМАЦИЯ
+
+Для системе macOS вы можете использовать MacVim:  https://macvim.org
+
+Последние новости о редакторе Vim можно найти на его домашней странице:
+	https://www.vim.org/
+
+Если у вас возникли вопросы, посмотрите полезные советы или документацию
+по редактору Vim:
+	https://www.vim.org/docs.php
+	https://vim.fandom.com/wiki/Vim_Tips_Wiki
+
+Если у вас все ещё остались вопросы или есть сложности, воспользуйтесь одним
+из списков рассылки, чтобы обсудить их с пользователями и разработчиками:
+	https://www.vim.org/maillist.php
+
+Если ничего не помогает, сообщайте об ошибках непосредственно в список рассылки
+vim-dev:
+	<vim-dev@vim.org>
+
+
+ОСНОВНОЙ АВТОР ПРОГРАММЫ
+
+Большая часть редактора Vim была создана Брамом Моленаром <Bram@vim.org>,
+см. ":help Bram-Moolenaar"
+
+Присылайте все прочие комментарии, исправления, цветы и предложения в список
+рассылки vim-dev:
+	<vim-dev@vim.org>

lang/README.sv.txt

@@ -0,0 +1,139 @@
+README.txt för version 9.1 av Vim: Vi IMproved.
+
+
+VAD ÄR VIM?
+
+Vim är en kraftigt förbättrad version av den gamla goda UNIX-editorn Vi.  Många nya
+funktioner har lagts till: ångra på flera nivåer, syntaxmarkering, kommandoradshistorik
+historik, onlinehjälp, stavningskontroll, filnamns komplettering, blockoperationer,
+skriptspråk etc.  Det finns också ett grafiskt användargränssnitt (GUI) tillgängligt.
+Vi-kompatibiliteten bibehålls dock, så de som har Vi "i fingrarna" kommer
+känna sig som hemma.  Se "runtime/doc/vi_diff.txt" för skillnader jämfört med Vi.
+
+Denna editor är mycket användbar för att redigera program och andra vanliga textfiler.
+Alla kommandon ges med vanliga tangentbordstecken, så de som kan skriva
+med tio fingrar kan arbeta mycket snabbt.  Dessutom kan funktionsknapparna
+mappas till kommandon av användaren, och musen kan användas.
+
+Vim syftar också till att tillhandahålla en (mestadels) POSIX-kompatibel vi-implementering när
+kompileras med en minimal uppsättning funktioner (vanligtvis kallad vim.tiny), som används
+av många Linux-distributioner som standardvi-redigerare.
+
+Vim körs under MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS och nästan alla
+varianter av UNIX.  Det bör inte vara särskilt svårt att porta till andra system.
+Äldre versioner av Vim körs på MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
+Amiga DOS, Atari MiNT, BeOS, RISC OS och OS/2.  Dessa underhålls inte längre.
+
+
+DISTRIBUTION
+
+Du kan ofta använda din favoritpakethanterare för att installera Vim.  På Mac och
+Linux är en liten version av Vim förinstallerad, men du behöver ändå installera Vim
+om du vill ha fler funktioner.
+
+Det finns separata distributioner för Unix, PC, Amiga och vissa andra system.
+Denna README.txt-fil medföljer runtime-arkivet.  Den innehåller
+dokumentation, syntaxfiler och andra filer som används vid körning.  För att köra
+Vim måste du skaffa antingen ett av binärarkiven eller ett källarkiv.
+Vilket du behöver beror på vilket system du vill köra det på och om du
+vill eller måste kompilera det själv.  Se "https://www.vim.org/download.php" för
+en översikt över de distributioner som för närvarande finns tillgängliga.
+
+Några populära ställen att hämta den senaste versionen av Vim:
+* Kolla in git-arkivet från github: https://github.com/vim/vim.
+* Hämta källkoden som ett arkiv: https://github.com/vim/vim/tags.
+* Hämta en Windows-körbar fil från vim-win32-installer-arkivet:
+  https://github.com/vim/vim-win32-installer/releases.
+
+
+KOMPILERING
+
+Om du har skaffat en binär distribution behöver du inte kompilera Vim.  Om du
+har skaffat en källkodsdistribution finns allt du behöver för att kompilera Vim i
+katalogen "src".  Se src/INSTALL för instruktioner.
+
+
+INSTALLATION
+
+Se någon av dessa filer för systemspecifika instruktioner.  Antingen i
+READMEdir-katalogen (i arkivet) eller i toppkatalogen (om du packar upp en
+arkiv):
+
+README_ami.txt        Amiga
+README_unix.txt       Unix
+README_dos.txt        MS-DOS och MS-Windows
+README_mac.txt        Macintosh
+README_haiku.txt      Haiku
+README_vms.txt        VMS
+
+Det finns andra README_*.txt-filer, beroende på vilken distribution du använde.
+
+
+DOKUMENTATION
+
+Vim-tutorn är en timmes lång utbildningskurs för nybörjare.  Ofta kan den
+startas som "vimtutor".  Se ":help tutor" för mer information.
+
+Det bästa är att använda ":help" i Vim.  Om du ännu inte har en körbar fil, läs
+"runtime/doc/help.txt".  Den innehåller hänvisningar till andra dokumentationsfiler.
+Användarhandboken läses som en bok och rekommenderas för att lära sig använda Vim.  Se
+":help user-manual".
+
+
+KOPIERING
+
+Vim är Charityware.  Du kan använda och kopiera det så mycket du vill, men du
+uppmuntras att göra en donation för att hjälpa föräldralösa barn i Uganda.  Läs filen
+"runtime/doc/uganda.txt" för mer information (skriv ":help uganda" i Vim).
+
+Sammanfattning av licensen: Det finns inga begränsningar för användning eller distribution av en
+oförändrad kopia av Vim.  Delar av Vim får också distribueras, men licenstexten
+texten måste alltid inkluderas.  För modifierade versioner gäller några begränsningar.
+Licensen är GPL-kompatibel, du kan kompilera Vim med GPL-bibliotek och
+distribuera det.
+
+
+SPONSRING
+
+Att fixa buggar och lägga till nya funktioner tar mycket tid och ansträngning.  För att visa
+din uppskattning för arbetet och motivera utvecklarna att fortsätta arbeta med
+Vim, skicka gärna en donation.
+
+Pengarna du donerar kommer huvudsakligen att användas för att hjälpa barn i Uganda.  Se
+"runtime/doc/uganda.txt".  Men samtidigt ökar donationerna
+utvecklingsteamets motivation att fortsätta arbeta med Vim!
+
+För den senaste informationen om sponsring, se Vims webbplats:
+	https://www.vim.org/sponsor/
+
+
+BIDRA
+
+Om du vill hjälpa till att förbättra Vim, se filen CONTRIBUTING.md.
+
+
+INFORMATION
+
+Om du använder macOS kan du använda MacVim: https://macvim.org
+
+De senaste nyheterna om Vim finns på Vims hemsida:
+	https://www.vim.org/
+
+Om du har problem, ta en titt på Vims dokumentation eller tips:
+	https://www.vim.org/docs.php
+	https://vim.fandom.com/wiki/Vim_Tips_Wiki
+
+Om du fortfarande har problem eller andra frågor, använd någon av mailinglistorna
+för att diskutera dem med Vim-användare och utvecklare:
+	https://www.vim.org/maillist.php
+
+Om inget annat fungerar, rapportera buggar direkt till vim-dev-maillistan:
+	<vim-dev@vim.org>
+
+
+HUVUDFÖRFATTARE
+
+Det mesta av Vim har skapats av Bram Moolenaar <Bram@vim.org>, ":help Bram-Moolenaar"
+
+Skicka övriga kommentarer, patchar, blommor och förslag till vim-dev
+: <vim-dev@vim.org>

lang/README.zh_cn.txt

@@ -0,0 +1,122 @@
+Vim: Vi IMproved 9.1 版本的 README.txt 文件
+
+
+什 么 是 VIM ？
+
+Vim 是经典 UNIX 编辑器 Vi 的一个极大改进版本。它新增了许多功能：多级撤销、语法高
+亮、命令行历史、在线帮助、拼写检查、文件名补全、块操作、脚本语言等。同时也提供了
+图形用户界面（GUI）。尽管如此，Vi 兼容性依然得以保留，习惯使用 Vi 的用户操作时仍
+会感到得心应手。与 Vi 的差异请参阅 "runtime/doc/vi_diff.txt"。
+
+此编辑器对于编辑代码和其他纯文本文件非常有用。所有命令都通过常规键盘字符输入，因
+此熟练盲打的用户能够高效工作。此外，用户可以将功能键映射到命令，并且可以使用鼠标。
+
+Vim 也致力于提供一个（基本）符合 POSIX 标准的 vi 实现。当它以最小功能集（通常称
+为 vim.tiny）编译时，被许多 Linux 发行版用作默认的 vi 编辑器。
+
+Vim 可在 MS-Windows (7, 8, 10, 11)、macOS、Haiku、VMS 以及几乎所有 UNIX 变体上运
+行。移植到其他系统应该不太困难。旧版本的 Vim 曾在 Amiga DOS、Atari MiNT、BeOS、
+MS-DOS、MS-Windows 95/98/Me/NT/2000/XP/Vista、RISC OS 和 OS/2 上运行。这些版本的
+维护现已终止。
+
+
+获 取 途 径
+
+通常你可以使用你喜欢的软件包管理器来安装 Vim。在 Mac 和 Linux 上，会预装一个简化
+版的 Vim，如果你需要更多功能，仍需要安装完整的 Vim。
+
+有针对 Unix、PC、Amiga 和其他一些系统的独立发行版。本 README.txt 文件随运行时存
+档一起提供。该存档包含文档、语法文件以及其他运行时使用的文件。要运行 Vim，你必须
+获取二进制存档或源代码存档之一。您需要哪一种取决于您想要运行 Vim 的系统以及您是
+否希望或必须自行编译。请查阅 "https://www.vim.org/download.php" 以了解当前可用的
+发行版概览。
+
+获取最新版 Vim 的常见方式：
+* 从 github 检出 git 仓库：https://github.com/vim/vim。
+* 以存档形式获取源代码：https://github.com/vim/vim/tags。
+* 从 vim-win32-installer 仓库获取 Windows 可执行文件：
+  https://github.com/vim/vim-win32-installer/releases。
+
+
+编 译
+
+如果你获得的是二进制发行版，则无需编译 Vim。如果你获得的是源代码发行版，编译 Vim
+所需的所有内容都在 "src" 目录中。请参阅 src/INSTALL 文件中的说明。
+
+
+安 装
+
+请查阅以下文件之一以获取系统特定的安装说明。这些文件位于仓库中的 READMEdir 目录，
+或者在你解压缩存档后的顶级目录中：
+
+README_ami.txt		Amiga
+README_unix.txt		Unix
+README_dos.txt		MS-DOS 和 MS-Windows
+README_mac.txt		Macintosh
+README_haiku.txt	Haiku
+README_vms.txt		VMS
+
+根据你使用的发行版，可能还有其他 README_*.txt 文件。
+
+
+文 档
+
+Vim tutor 是为初学者设计的一小时培训课程。通常可以通过 "vimtutor" 命令启动。更多
+信息请参阅 ":help tutor"。
+
+最佳方式是在 Vim 中使用 ":help" 命令。如果您尚未安装可执行文件，请阅读
+"runtime/doc/help.txt"。该文件包含指向其他文档文件的指引。用户手册采用书籍体例编
+排，是学习使用 Vim 的推荐资料。具体请参阅 ":help user-manual"。
+
+
+复 制 与 版 权
+
+Vim 是慈善软件。您可以尽情使用和复制它，但鼓励您捐款以帮助乌干达的孤儿。请阅读
+"runtime/doc/uganda.txt" 文件了解详情（在 Vim 中执行 ":help uganda"）。
+
+许可摘要：对于未经修改的 Vim 副本，其使用或分发不受任何限制。Vim 的部分内容亦可
+分发，但必须始终包含许可文本。对于修改版本，则需遵循若干限制条款。本许可证与 GPL
+兼容，您可使用 GPL 库编译 Vim 并进行分发。
+
+
+赞 助
+
+修复错误与增添新功能均需投入大量时间与精力。为支持开发工作并激励开发者持续完善
+Vim，敬请通过捐赠表达您的认可。
+
+您捐赠的资金将主要用于帮助乌干达的儿童。请参阅 "runtime/doc/uganda.txt"。但同时，
+您的捐赠也将激励开发团队持续投入 Vim 的开发工作。
+
+关于赞助的最新信息，请查看 Vim 网站：
+	https://www.vim.org/sponsor/
+
+
+贡 献
+
+如果您想帮助改进 Vim，请参阅 CONTRIBUTING.md 文件。
+
+
+信 息 与 支 持
+
+如果您在 macOS 上，可以使用 MacVim：https://macvim.org
+
+关于 Vim 的最新消息可以在 Vim 主页上找到：
+	https://www.vim.org/
+
+如果您遇到问题，请查阅 Vim 文档或使用技巧：
+	https://www.vim.org/docs.php
+	https://vim.fandom.com/wiki/Vim_Tips_Wiki
+
+如果您仍有问题或其他疑问，请使用其中一个邮件列表与 Vim 用户和开发者讨论：
+	https://www.vim.org/maillist.php
+
+如果其他方法都无效，请直接将错误报告发送到 vim-dev 邮件列表：
+	<vim-dev@vim.org>
+
+
+主 要 作 者
+
+Vim 主要由 Bram Moolenaar <Bram@vim.org> 创建，可通过 ":help Bram-Moolenaar" 命
+令了解更多信息。
+
+请将任何其他评论、补丁、鲜花和建议发送到 vim-dev 邮件列表：<vim-dev@vim.org>

nsis/Make_mvc.mak

@@ -0,0 +1,95 @@
+#
+# Makefile for MS Windows for create self-installing exe of Vim.
+# 2025-10-03, Restorer, restorer@mail2k.ru
+#
+
+
+# included common tools
+!INCLUDE ..\src\auto\nmake\tools.mak
+
+.SUFFIXES :
+
+!IFDEF PROGRAMW6432
+ProgFiles=%%PROGRAMFILES(x86)%%
+!ELSE
+ProgFiles=$(PROGRAMFILES)
+!ENDIF
+
+!IFDEF VIMSRC
+MKNSISFLAGS = /D"VIMSRC=$(VIMSRC)"
+!ENDIF
+
+!IFDEF VIMRT
+MKNSISFLAGS = $(MKNSISFLAGS) /D"VIMRT=$(VIMRT)"
+!ENDIF
+
+!IFDEF VIMTOOLS
+MKNSISFLAGS = $(MKNSISFLAGS) /D"VIMTOOLS=$(VIMTOOLS)"
+!ENDIF
+
+!IFDEF GETTEXT
+MKNSISFLAGS = $(MKNSISFLAGS) /D"GETTEXT=$(GETTEXT)"
+!ENDIF
+
+!IFDEF HAVE_UPX
+MKNSISFLAGS = $(MKNSISFLAGS) /DHAVE_UPX=$(HAVE_UPX)
+!ENDIF
+
+!IFDEF HAVE_NLS
+MKNSISFLAGS = $(MKNSISFLAGS) /DHAVE_NLS=$(HAVE_NLS)
+!ENDIF
+
+!IFDEF HAVE_MULTI_LANG
+MKNSISFLAGS = $(MKNSISFLAGS) /DHAVE_MULTI_LANG=$(HAVE_MULTI_LANG)
+!ENDIF
+
+!IFDEF WIN64
+MKNSISFLAGS = $(MKNSISFLAGS) /DWIN64=$(WIN64)
+!ENDIF
+
+!IFDEF ARM64
+MKNSISFLAGS = $(MKNSISFLAGS) /DARM64=$(ARM64)
+!ENDIF
+
+!IFDEF INCLUDE_LIBGCC
+MKNSISFLAGS = $(MKNSISFLAGS) /DINCLUDE_LIBGCC=$(INCLUDE_LIBGCC)
+!ENDIF
+
+!IFDEF X
+XX = /X"$(X:;=" /X")"
+!ENDIF
+
+# If necessary, correct the full path of the NSIS compiler in the next line.
+# Please do not enclose the path in quotation marks.
+MKNSIS = $(ProgFiles)\NSIS\makensis.exe
+
+MKNSISFLAGS = /INPUTCHARSET UTF8 $(MKNSISFLAGS)
+
+
+all : makeinst
+
+makeinst : prepare
+	^"$(MKNSIS)" $(MKNSISFLAGS) gvim.nsi $(XX)
+
+prepare : unzipicons license rename
+
+unzipicons : icons.zip
+	@ if exist %|fF\nul $(RD) %|fF
+	@ $(PS) $(PSFLAGS) \
+		Add-Type -AssemblyName 'System.IO.Compression.FileSystem'; \
+		[System.IO.Compression.ZipFile]::ExtractToDirectory('$**', '.')
+
+license : ..\lang\LICENSE.*.txt ..\LICENSE
+	!@ $(PS) $(PSFLAGS) \
+		Get-Content -Path '$**' -Encoding UTF8 ^| \
+		Set-Content -Path '..\lang\$(**B).nsis.txt' -Enc Unicode -Force
+
+rename :
+	@ ..\tools\rename.bat "$(SRC)" "$(DST)" 1> nul
+
+clean :
+	@ if exist ..\lang\LICENSE*.nsis.txt $(RM) ..\lang\LICENSE*.nsis.txt
+	@ if exist .\icons\nul $(RD) .\icons
+	@ if exist .\gvim??.exe $(RM) .\gvim??.exe
+
+# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=79 ft=make:

nsis/Makefile

@@ -0,0 +1,82 @@
+#
+# Makefile for UNIX-like for create self-installing exe of Vim.
+# 2025-10-03, Restorer, restorer@mail2k.ru
+#
+
+
+.SUFFIXES:
+.PHONY: all makeinst prepare rename clean 
+
+ifdef VIMSRC
+MKNSISFLAGS := -D"VIMSRC=$(VIMSRC)"
+endif
+
+ifdef VIMRT
+MKNSISFLAGS := $(MKNSISFLAGS) -D"VIMRT=$(VIMRT)"
+endif
+
+ifdef VIMTOOLS
+MKNSISFLAGS := $(MKNSISFLAGS) -D"VIMTOOLS=$(VIMTOOLS)"
+endif
+
+ifdef GETTEXT
+MKNSISFLAGS := $(MKNSISFLAGS) -D"GETTEXT=$(GETTEXT)"
+endif
+
+ifdef HAVE_UPX
+MKNSISFLAGS := $(MKNSISFLAGS) -DHAVE_UPX=$(HAVE_UPX)
+endif
+
+ifdef HAVE_NLS
+MKNSISFLAGS := $(MKNSISFLAGS) -DHAVE_NLS=$(HAVE_NLS)
+endif
+
+ifdef HAVE_MULTI_LANG
+MKNSISFLAGS := $(MKNSISFLAGS) -DHAVE_MULTI_LANG=$(HAVE_MULTI_LANG)
+endif
+
+ifdef WIN64
+MKNSISFLAGS := $(MKNSISFLAGS) -DWIN64=$(WIN64)
+endif
+
+ifdef ARM64
+MKNSISFLAGS := $(MKNSISFLAGS) -DARM64=$(ARM64)
+endif
+
+ifdef INCLUDE_LIBGCC
+MKNSISFLAGS := $(MKNSISFLAGS) -DINCLUDE_LIBGCC=$(INCLUDE_LIBGCC)
+endif
+
+ifdef X
+XX := -X"$(X:;=" -X")"
+endif
+
+MKNSISFLAGS := -INPUTCHARSET UTF8 $(MKNSISFLAGS)
+
+all: makeinst
+
+makeinst: prepare
+	makensis $(MKNSISFLAGS) gvim.nsi $(XX)
+
+prepare: unzipicons license rename
+
+unzipicons: icons.zip
+	if test -d `basename $? .zip` ; then rm -rf `basename $? .zip` ; fi
+	unzip $?
+
+license: ../lang/LICENSE.*.txt ../LICENSE
+	for lic in $? ; do \
+		bn=`basename $$lic .txt` ; \
+		awk 'sub("$$", "\r")' < $$lic | \
+		iconv -f UTF-8 -t UTF-16 > ../lang/$$bn.nsis.txt ; \
+	done
+
+rename:
+	../tools/rename.bat "$(SRC)" "$(DST)"
+
+clean:
+	rm -f ../lang/LICENSE*.nsis.txt
+	if test -d icons ; then rm -rf icons ; fi
+	if test -f gvim??.exe ; then rm -f gvim??.exe ; fi
+
+# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0 ft=make:

nsis/README.txt

@@ -3,22 +3,15 @@ Installation System (NSIS), available at http://nsis.sourceforge.net/
 
 To build the installable .exe file:
 
-1.  Unpack three archives:
-	PC sources
-	PC runtime
-	PC language files
-    You can generate these from the Unix sources and runtime plus the extra
-    archive (see the Makefile in the top directory).
+Preparatory stage
 
-2.  Go to the src directory and build:
-	gvim.exe (the OLE version),
-	vimrun.exe,
-	install.exe,
-	uninstall.exe,
-	tee/tee.exe,
-	xxd/xxd.exe
+1.  Clone using the git tool the Vim repository or download its zip file
+    available at:
+	https://github.com/vim/vim
 
-    Then execute tools/rename.bat to rename the executables.
+2.  Go to the "/src" directory and build the Vim editor, making sure to use the
+    following variable values: "GUI=yes"; "OLE=yes"; "VIMDLL=yes". See
+    INSTALLpc.txt and Make_mvc.mak for details.
 
 3.  Go to the GvimExt directory and build gvimext.dll (or get it from a binary
     archive).  Both 64- and 32-bit versions are needed and should be placed
@@ -32,8 +25,8 @@ To build the installable .exe file:
 	https://www.mediafire.com/file/9edk4g3xvfgzby0/diff4Vim.zip/file
     When will you have "diff.exe" put it in the "../.." directory (above the
     "vim91" directory, it's the same for all Vim versions).  However, you can
-    specify another directory by passing /DVIMTOOLS=<dir> option to the
-    "makensis.exe" program via the command line.
+    specify a different directory by specifying the appropriate makefile value.
+    How to do this is described below.
 
 5.  For the terminal window to work in Vim, the library winpty is required.
     You can get it at the following url:
@@ -41,8 +34,8 @@ To build the installable .exe file:
     For the 32-bit version, rename "winpty.dll" from ia32/bin to "winpty32.dll",
     and for the 64-bit version — "winpty.dll" from x64/bin to "winpty64.dll".
     Put the renamed file and "winpty-agent.exe" in "../.." (above the "vim91"
-    directory).  However, you can specify another directory by passing
-    /DVIMTOOLS=<dir> option to the "makensis.exe" program via the command line.
+    directory).  However, you can specify a different directory by specifying
+    the appropriate makefile value. How to do this is described below.
 
 6.  To use stronger encryption, add the Sodium library.  You can get it here:
 	https://github.com/jedisct1/libsodium/releases/download/1.0.19-RELEASE/libsodium-1.0.19-msvc.zip
@@ -52,12 +45,7 @@ To build the installable .exe file:
     "../.." directory (above the "vim91" directory, where "diff.exe" and
     "winpty{32|64}.dll").
 
-7.  On MS Windows do "nmake.exe -f Make_mvc.mak uganda.nsis.txt" in runtime/doc.
-    On Unix-like system do "make runtime/doc/uganda.nsis.txt" in top directory
-    or "make uganda.nsis.txt" in runtime/doc.  The created files
-    "uganda.nsis.???" will be automatically converted to DOS file format.
-
-8.  Get gettext and iconv DLLs from the following site:
+7.  Get gettext and iconv DLLs from the following site:
 	https://github.com/mlocati/gettext-iconv-windows/releases
     Both 64- and 32-bit versions are needed.
     Download the files gettextX.X.X.X-iconvX.XX-shared-{32,64}.zip, extract
@@ -74,35 +62,51 @@ To build the installable .exe file:
 		libintl-8.dll
 		libiconv-2.dll
 
-    The default <GETTEXT directory> is "..", however, you can specify another
-    directory by passing /DGETTEXT=<dir> option to "makensis.exe" program via
-    the command line.
+    The default <GETTEXT directory> is "../..".  However, you can specify a
+    different directory by specifying the appropriate makefile value. How to do
+    this is described below.
 
-
-Install NSIS if you didn't do that already.
-Download Unicode version the ShellExecAsUser plug-in for NSIS from:
+8.  Install NSIS if you didn't do that already.
+    Download Unicode version the ShellExecAsUser plug-in for NSIS from:
 	https://nsis.sourceforge.io/ShellExecAsUser_plug-in
-and put ShellExecAsUser.dll to path\to\NSIS\Plugins\x86-unicode
+    and put "ShellExecAsUser.dll" to path\to\NSIS\Plugins\x86-unicode
 
+Installer assembly stage
 
-Unpack the images:
-	cd nsis
-	unzip icons.zip or 7z x icons.zip (on Unix-like or MS Windows)
-	WinRar.exe x icons.zip (on MS Windows)
+    On MS Windows, open the Developer Command Prompt for VS and go to the
+    "/nsis" directory and type the command
+	    nmake.exe -lf Make_mvc.mak [variables] all
 
-Then build gvim.exe:
-	cd nsis
-	makensis.exe [options] gvim.nsi
+    After the installer is created and you copy it to the desired location, run
+    the following command in the "/nsis" directory
+	    nmake.exe -lf Make_mvc.mak clean
 
-Options (not mandatory):
-    /DVIMSRC=<dir>	— directory where location of gvim_ole.exe, vimw32.exe,
+    On UNIX-like systems, go to the "/nsis" directory and type the command
+	    make -f Makefile [variables] all
+
+    After the installer is created and you copy it to the desired location, run
+    the following command in the "/nsis" directory
+	    make -f Makefile clean
+
+Variables and their values available for building the installer (not mandatory):
+
+    "VIMSRC=<dir>"	— directory where location of gvim_ole.exe, vimw32.exe,
 			    GvimExt/*, etc.
-    /DVIMRT=<dir>	— directory where location of runtime files
-    /DVIMTOOLS=<dir>    — directory where location of extra tools: diff.exe,
-			    winpty{32|64}.dll, winpty-agent.exe, libsodium.dll
-    /DGETTEXT=<dir>     — directory where location of gettext libraries
-    /DHAVE_UPX=1	— additional compression of the installer.  UPX program
+    "VIMRT=<dir>"	— directory where location of runtime files.
+    "VIMTOOLS=<dir>"    — directory where location of extra tools: diff.exe,
+			    winpty{32|64}.dll, winpty-agent.exe, libsodium.dll.
+    "GETTEXT=<dir>"     — directory where location of gettext libraries.
+    "HAVE_UPX=1"	— additional compression of the installer.  UPX program
 			    must be installed.
-    /DHAVE_NLS=0	— do not add native language support
-    /DHAVE_MULTI_LANG=0 — to create an English-only the installer
-    /DWIN64=1		— to create a 64-bit the installer
+    "HAVE_NLS=0"	— do not add native language support.
+    "HAVE_MULTI_LANG=0" — to create an English-only the installer.
+    "WIN64=1"		— to create a 64-bit the installer.
+    "ARM64=1"		— to create the installer for ARM64. The WIN64 variable
+			    must be set to 1.
+    "X=<scriptcmd>"	— executes scriptcmd in script.  If multiple scriptcmd
+			    are specified, they are separated by a semicolon.
+			    Example "X=OutFile MyVim.exe;XPMode on"
+    "MKNSIS=<dir>"	— the directory where the "makensis.exe" program is
+			    located.
+
+Note: for icons used in the installer, see the README.txt in the icons.zip

nsis/auxiliary.nsh

@@ -0,0 +1,148 @@
+# -*- coding: utf-8 -*-
+# NSIS helper file for creating a self-installing exe for Vim.
+# Contains service macros and functions. 
+# Last Change:	2025-09-03
+#
+
+!ifndef __AUXILIARY__NSH__
+  !define __AUXILIARY__NSH__
+
+# See https://nsis.sourceforge.io/LogicLib
+;FileExists is already part of LogicLib, but returns true for directories
+;as well as files
+  !macro _FileExists2 _a _b _t _f
+    !insertmacro _LOGICLIB_TEMP
+    StrCpy $_LOGICLIB_TEMP "0"
+;if path is not blank, continue to next check
+    StrCmp `${_b}` `` +4 0
+;if path exists, continue to next check (IfFileExists returns true if this
+;is a directory)
+    IfFileExists `${_b}` `0` +3
+;if path is not a directory, continue to confirm exists
+    IfFileExists `${_b}\*.*` +2 0
+    StrCpy $_LOGICLIB_TEMP "1" ;file exists
+;now we have a definitive value - the file exists or it does not
+    StrCmp $_LOGICLIB_TEMP "1" `${_t}` `${_f}`
+  !macroend
+  !undef FileExists
+  !define FileExists `"" FileExists2`
+  !macro _DirExists _a _b _t _f
+    !insertmacro _LOGICLIB_TEMP
+    StrCpy $_LOGICLIB_TEMP "0"
+;if path is not blank, continue to next check
+    StrCmp `${_b}` `` +3 0
+;if directory exists, continue to confirm exists
+    IfFileExists `${_b}\*.*` 0 +2
+    StrCpy $_LOGICLIB_TEMP "1"
+    StrCmp $_LOGICLIB_TEMP "1" `${_t}` `${_f}`
+  !macroend
+  !define DirExists `"" DirExists`
+
+# Get parent directory
+# Share this function both on installer and uninstaller
+  !macro GetParent un
+    Function ${un}GetParent
+      Exch $0  ; old $0 is on top of stack
+      Push $1
+      Push $2
+      StrCpy $1 -1
+      ${Do}
+	StrCpy $2 $0 1 $1
+	${If} $2 == ""
+	${OrIf} $2 == "\"
+	  ${ExitDo}
+	${EndIf}
+	IntOp $1 $1 - 1
+      ${Loop}
+      StrCpy $0 $0 $1
+      Pop $2
+      Pop $1
+      Exch $0  ; put $0 on top of stack, restore $0 to original value
+    FunctionEnd
+  !macroend
+
+  !insertmacro GetParent ""
+  !insertmacro GetParent "un."
+
+# Get home directory
+  !macro GetHomeDir un
+    Function ${un}GetHomeDir
+      Push $0
+      Push $1
+      ReadEnvStr $0 "HOME"
+      ${If} $0 == ""
+	ReadEnvStr $0 "HOMEDRIVE"
+	ReadEnvStr $1 "HOMEPATH"
+	StrCpy $0 "$0$1"
+	${If} $0 == ""
+	  ReadEnvStr $0 "USERPROFILE"
+	${EndIf}
+      ${EndIf}
+      Pop $1
+      Exch $0  ; put $0 on top of stack, restore $0 to original value
+    FunctionEnd
+  !macroend
+
+  !insertmacro GetHomeDir ""
+  !insertmacro GetHomeDir "un."
+
+# Saving the status of sections of the current installation in the registry
+  !macro SaveSectionSelection section_id reg_value
+    ${If} ${SectionIsSelected} ${section_id}
+      WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" ${reg_value} 1
+    ${Else}
+      WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" ${reg_value} 0
+    ${EndIf}
+  !macroend
+
+# Reading the status of sections from the registry of the previous installation 
+  !macro LoadSectionSelection section_id reg_value
+    ClearErrors
+    ReadRegDWORD $3 HKLM "${UNINST_REG_KEY_VIM}" ${reg_value}
+    ${IfNot} ${Errors}
+      ${If} $3 = 1
+	!insertmacro SelectSection ${section_id}
+      ${Else}
+	!insertmacro UnselectSection ${section_id}
+      ${EndIf}
+    ${EndIf}
+  !macroend
+
+# Reading the settings for _vimrc from the registry of a previous installation
+  !macro LoadDefaultVimrc out_var reg_value default_value
+    ClearErrors
+    ReadRegStr ${out_var} HKLM "${UNINST_REG_KEY_VIM}" ${reg_value}
+    ${If} ${Errors}
+    ${OrIf} ${out_var} == ""
+      StrCpy ${out_var} ${default_value}
+    ${EndIf}
+  !macroend
+
+# Get user locale
+  !if ${HAVE_NLS}
+    Var lng_usr  ; variable containing the locale of the current user
+
+    !include "StrFunc.nsh"
+    ${StrRep}
+
+    Function GetUserLocale
+      ClearErrors
+      System::Call \
+	  'kernel32::GetUserDefaultLocaleName(t.r19, *i${NSIS_MAX_STRLEN})'
+      StrCmp $R9 "zh-cn" coincide 0
+      StrCmp $R9 "zh-tw" coincide 0
+      StrCmp $R9 "pt-br" 0 part
+      coincide:
+      System::Call 'User32::CharLower(t r19 r19)*i${NSIS_MAX_STRLEN}'
+      ${StrRep} $lng_usr "$R9" "-" "_"
+      Goto done
+      part:
+      StrCpy $lng_usr $R9 2
+      done:
+    FunctionEnd
+  !endif
+
+
+
+!endif # __AUXILIARY__NSH__
+# vi:set ts=8 sw=2 sts=2 tw=79 wm=0 ft=nsis:

nsis/gvim_version.nsh

@@ -1,6 +0,0 @@
-# Generated from Makefile: define the version numbers
-!ifndef __GVIM_VER__NSH__
-!define __GVIM_VER__NSH__
-!define VER_MAJOR 9
-!define VER_MINOR 1
-!endif

nsis/lang/README.txt

@@ -18,17 +18,46 @@ allowable length of strings.  For example:
  drop-down lists on the .vimrc page - 55 characters.
 Characters in this case mean characters of the English alphabet.
 
-If you do not yet have a translated "uganda.txt" file and a main "README.txt"
+Once the message translation file is ready, it must be included in the
+"gvim.nsi" file.
+Find the line "# Include support for other languages:" in the file "gvim.nsi"
+and specify the name of the file with your translation below the line
+!if ${HAVE_MULTI_LANG}, similar to the entries already there. File names are
+specified in alphabetical order.
+
+If you do not yet have a translated "LICENSE" file and/or a main "README.txt"
 file, set the following values:
 
 for the license file
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
 
 for the readme.txt file
 LangString vim_readme_file 0 "README.txt"
 
 Once you have the translations of these files, then set the values for these
 variables similarly to what is done in the other translation files.
-Also add the appropriate entries to the "gvim.nsi" file as done for other
-languages.
+Translation files should be located in the "lang" subdirectory of the root
+directory. The name of the files is as follows: "README.xx.txt", where xx is the
+language code according to ISO639.
 
+
+There are two ways to test the installer in different languages:
+
+1. Find and uncomment the "!define MUI_LANGDLL_ALWAYSSHOW" line in the
+   "gvim.nsi" file and rebuild the installer.
+   Now every time you run it, you will see a dialog box with the possibility to
+   select the language of the installer.
+
+2. If the Vim editor is already installed in your system, delete the
+   "Installer Language" parameter in the Windows registry under
+   "HKEY_CURRENT_USER\Software\Vim".
+   Or you can create a file "NoLangInstallerVim.reg" with the following content:
+
+	Windows Registry Editor Version 5.00
+
+	[HKEY_CURRENT_USER\Software\Vim]
+	"Installer Language"=-
+
+   and apply it by double-clicking on it.
+   After these steps, when you start the installer, a window with the installer
+   language selection will also be displayed. 

nsis/lang/danish.nsi

@@ -19,15 +19,15 @@ LangString ^UninstallCaption ${LANG_DANISH}         "$(^Name) Uninstall"
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_DANISH} "${VIMRT}\doc\uganda.nsis.dax"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_DANISH} "..\lang\LICENSE.da.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_DANISH} "README.dax.txt"
+#LangString vim_readme_file ${LANG_DANISH} "README.da.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/dutch.nsi

@@ -21,15 +21,15 @@ LangString ^UninstallCaption ${LANG_DUTCH} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_DUTCH} "${VIMRT}\doc\uganda.nsis.nlx"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_DUTCH} "..\lang\LICENSE.nl.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_DUTCH} "README.nlx.txt"
+#LangString vim_readme_file ${LANG_DUTCH} "README.nl.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/english.nsi

@@ -21,7 +21,7 @@ LangString ^UninstallCaption ${LANG_ENGLISH} \
 # License file for the license page                                       {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file ${LANG_ENGLISH} "${VIMRT}\doc\uganda.nsis.txt"
+LicenseLangString page_lic_file ${LANG_ENGLISH} "..\lang\LICENSE.nsis.txt"
 
 ##############################################################################
 # README.txt file, which is opened after installation                     {{{1

nsis/lang/german.nsi

@@ -21,15 +21,15 @@ LangString ^UninstallCaption ${LANG_GERMAN} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_GERMAN} "${VIMRT}\doc\uganda.nsis.dex"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_GERMAN} "..\lang\LICENSE.de.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_GERMAN} "README.dex.txt"
+#LangString vim_readme_file ${LANG_GERMAN} "README.de.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/greek.nsi

@@ -21,15 +21,15 @@ LangString ^UninstallCaption ${LANG_GREEK} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_GREEK} "${VIMRT}\doc\uganda.nsis.elx"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_GREEK} "..\lang\LICENSE.el.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_GREEK} "README.elx.txt"
+#LangString vim_readme_file ${LANG_GREEK} "README.el.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/italian.nsi

@@ -21,15 +21,13 @@ LangString ^UninstallCaption ${LANG_ITALIAN} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_ITALIAN} "${VIMRT}\doc\uganda.nsis.itx"
+LicenseLangString page_lic_file ${LANG_ITALIAN} "..\lang\LICENSE.it.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_ITALIAN} "README.itx.txt"
+LangString vim_readme_file ${LANG_ITALIAN} "README.it.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/japanese.nsi

@@ -31,8 +31,8 @@ LangString ^InstallBtn       ${LANG_JAPANESE} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_JAPANESE} "${VIMRT}\doc\uganda.nsis.jax"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_JAPANESE} "..\lang\LICENSE.ja.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1

nsis/lang/portuguesebr.nsi

@@ -0,0 +1,291 @@
+# vi:set ts=8 sts=4 sw=4 et fdm=marker:
+#
+# portuguesebr.nsi: Brazilian Portuguese strings for gvim NSIS installer.
+#
+# Locale ID    : 1046 
+# Locale Name  : pt-BR
+# fileencoding : UTF-8
+# Author       : Rafael Fontenelle
+
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+
+
+# Overwrite the default translation.
+# These strings should be always English.  Otherwise dosinst.c fails.
+LangString ^SetupCaption     ${LANG_PORTUGUESEBR} \
+        "Configuração do $(^Name)"
+LangString ^UninstallCaption ${LANG_PORTUGUESEBR} \
+        "Desinstalação do $(^Name)"
+
+##############################################################################
+# License file for the license page                                       {{{1
+##############################################################################
+
+LicenseLangString page_lic_file ${LANG_PORTUGUESEBR} "..\lang\LICENSE.pt_br.nsis.txt"
+
+##############################################################################
+# README.txt file, which is opened after installation                     {{{1
+##############################################################################
+
+LangString vim_readme_file ${LANG_PORTUGUESEBR} "README.pt_br.txt"
+
+##############################################################################
+# MUI Configuration Strings                                               {{{1
+##############################################################################
+
+#LangString str_dest_folder          ${LANG_PORTUGUESEBR} \
+#    "Pasta de destino (Deve terminar com $\"vim$\")"
+
+LangString str_show_readme          ${LANG_PORTUGUESEBR} \
+    "Mostrar o README ao concluir a instalação"
+
+# Install types:
+LangString str_type_typical         ${LANG_PORTUGUESEBR} \
+    "Típica"
+
+LangString str_type_minimal         ${LANG_PORTUGUESEBR} \
+    "Mínima"
+
+LangString str_type_full            ${LANG_PORTUGUESEBR} \
+    "Completa"
+
+
+##############################################################################
+# Section Titles & Description                                            {{{1
+##############################################################################
+
+LangString str_section_old_ver      ${LANG_PORTUGUESEBR} \
+    "Desinstalar versões existentes"
+LangString str_desc_old_ver         ${LANG_PORTUGUESEBR} \
+    "Desinstala versões do Vim existentes no seu sistema."
+
+LangString str_section_exe          ${LANG_PORTUGUESEBR} \
+    "Vim GUI e arquivos de runtime"
+LangString str_desc_exe             ${LANG_PORTUGUESEBR} \
+    "Executáveis ​​e arquivos de runtime do Vim GUI. Este componente \
+     é obrigatório."
+
+LangString str_section_console      ${LANG_PORTUGUESEBR} \
+    "Programa de console do Vim"
+LangString str_desc_console         ${LANG_PORTUGUESEBR} \
+    "Versão de console do Vim (vim.exe)."
+
+LangString str_section_batch        ${LANG_PORTUGUESEBR} \
+    "Criar arquivos .bat"
+LangString str_desc_batch           ${LANG_PORTUGUESEBR} \
+    "Cria arquivos .bat para variantes do Vim no diretório Windows para \
+     usar na linha de comando."
+
+LangString str_group_icons          ${LANG_PORTUGUESEBR} \
+    "Criar ícones para o Vim"
+LangString str_desc_icons           ${LANG_PORTUGUESEBR} \
+    "Cria ícones para Vim em vários locais para facilitar o acesso rápido."
+
+LangString str_section_desktop      ${LANG_PORTUGUESEBR} \
+    "Na área de trabalho"
+LangString str_desc_desktop         ${LANG_PORTUGUESEBR} \
+    "Cria ícones para executáveis do gVim na área de trabalho."
+
+LangString str_section_start_menu   ${LANG_PORTUGUESEBR} \
+    "Na pasta Programas do Menu Iniciar"
+LangString str_desc_start_menu      ${LANG_PORTUGUESEBR} \
+    "Adiciona Vim na pasta de programas do menu iniciar."
+
+#LangString str_section_quick_launch ${LANG_PORTUGUESEBR} \
+#    "Na barra de Inicialização Rápida"
+#LangString str_desc_quick_launch    ${LANG_PORTUGUESEBR} \
+#    "Adiciona um atalho para o Vim na barra de inicialização rápida."
+
+LangString str_section_edit_with    ${LANG_PORTUGUESEBR} \
+    "Adicionar menu de contexto do Vim"
+LangString str_desc_edit_with       ${LANG_PORTUGUESEBR} \
+    "Adiciona o Vim à lista $\"Abrir com...$\" do menu de contexto."
+
+#LangString str_section_edit_with32  ${LANG_PORTUGUESEBR} \
+#    "Versão 32 bits"
+#LangString str_desc_edit_with32     ${LANG_PORTUGUESEBR} \
+#    "Adiciona o Vim à lista $\"Abrir com...$\" do menu de contexto \
+#     para aplicativos 32 bits."
+
+#LangString str_section_edit_with64  ${LANG_PORTUGUESEBR} \
+#    "Versão 64 bits"
+#LangString str_desc_edit_with64     ${LANG_PORTUGUESEBR} \
+#    "Adiciona o Vim à lista $\"Abrir com...$\" do menu de contexto \
+#     para aplicativos 64 bits."
+
+LangString str_section_vim_rc       ${LANG_PORTUGUESEBR} \
+    "Criar configuração padrão"
+LangString str_desc_vim_rc          ${LANG_PORTUGUESEBR} \
+    "Cria um arquivo de configuração padrão (_vimrc) se não já existir."
+
+LangString str_group_plugin         ${LANG_PORTUGUESEBR} \
+    "Criar diretórios de plugins"
+LangString str_desc_plugin          ${LANG_PORTUGUESEBR} \
+    "Cria diretórios de plugins. Diretórios de plugins permitem estender \
+     o Vim adicionando um arquivo a um direótrio."
+
+LangString str_section_plugin_home  ${LANG_PORTUGUESEBR} \
+    "Privados"
+LangString str_desc_plugin_home     ${LANG_PORTUGUESEBR} \
+    "Cria diretórios de plugins no diretório HOME."
+
+LangString str_section_plugin_vim   ${LANG_PORTUGUESEBR} \
+    "Compartilhados"
+LangString str_desc_plugin_vim      ${LANG_PORTUGUESEBR} \
+    "Cria diretórios de plugins no diretório de instalação do Vim, \
+     o qual é usado por todos os usuários do sistema."
+
+LangString str_section_nls          ${LANG_PORTUGUESEBR} \
+    "Suporte ao idioma nativo"
+LangString str_desc_nls             ${LANG_PORTUGUESEBR} \
+    "Instala arquivos para suporte ao idioma nativo."
+
+LangString str_unsection_register   ${LANG_PORTUGUESEBR} \
+    "Desregistrar Vim"
+LangString str_desc_unregister      ${LANG_PORTUGUESEBR} \
+    "Remove os registras do Vim do sistema."
+
+LangString str_unsection_exe        ${LANG_PORTUGUESEBR} \
+    "Remover arquivos executáveis/runtime do Vim"
+LangString str_desc_rm_exe          ${LANG_PORTUGUESEBR} \
+    "Remove todos os arquivos executáveis e de runtime do Vim."
+
+LangString str_ungroup_plugin       ${LANG_PORTUGUESEBR} \
+    "Remover diretórios de plugins"
+LangString str_desc_rm_plugin       ${LANG_PORTUGUESEBR} \
+    "Remove os diretórios de plugins se eles estiverem vazios."
+
+LangString str_unsection_plugin_home ${LANG_PORTUGUESEBR} \
+    "Privados"
+LangString str_desc_rm_plugin_home  ${LANG_PORTUGUESEBR} \
+    "Remove os diretórios de plugins do diretório HOME."
+
+LangString str_unsection_plugin_vim ${LANG_PORTUGUESEBR} \
+    "Compartilhados"
+LangString str_desc_rm_plugin_vim   ${LANG_PORTUGUESEBR} \
+    "Remove os diretórios de plugins do diretório de instalação do Vim."
+
+LangString str_unsection_rootdir    ${LANG_PORTUGUESEBR} \
+    "Remover diretório raiz do Vim"
+LangString str_desc_rm_rootdir      ${LANG_PORTUGUESEBR} \
+    "Remove o diretório raiz do Vim. Ele contém seus \
+     arquivos de configuração do Vim!"
+
+
+##############################################################################
+# Messages                                                                {{{1
+##############################################################################
+
+#LangString str_msg_too_many_ver  ${LANG_PORTUGUESEBR} \
+#    "Encontradas $vim_old_ver_count versões do Vim em seu sistema.$\r$\n\
+#     Este instalador só consegue lidar com ${VIM_MAX_OLD_VER} versões\
+#     no máximo.$\r$\n\
+#     Por favor, remova algumas versões e comece novamente."
+
+#LangString str_msg_invalid_root  ${LANG_PORTUGUESEBR} \
+#    "Caminho de instalação inválido: $vim_install_root!$\r$\n\
+#     Ele deve terminar com $\"vim$\"."
+
+#LangString str_msg_bin_mismatch  ${LANG_PORTUGUESEBR} \
+#    "Incompatibilidade de caminho de binários!$\r$\n$\r$\n\
+#     Esperava que o caminho de binários fosse $\"$vim_bin_path$\",$\r$\n\
+#     mas o sistema indica que o caminho de binários é $\"$INSTDIR$\"."
+
+#LangString str_msg_vim_running   ${LANG_PORTUGUESEBR} \
+#    "Vim ainda está em execução em seu sistema.$\r$\n\
+#     Por favor, feche todas as instâncias do Vim para poder continuar."
+
+#LangString str_msg_register_ole  ${LANG_PORTUGUESEBR} \
+#    "Tentativa de registrar o Vim com OLE. \
+#     Não há mensagem que indique se isso funciona ou não."
+
+#LangString str_msg_unreg_ole     ${LANG_PORTUGUESEBR} \
+#    "Tentando desregistrar o Vim com OLE. \
+#     Não há mensagem que indique se isso funciona ou não."
+
+#LangString str_msg_rm_start      ${LANG_PORTUGUESEBR} \
+#    "Desinstalando a seguinte versão:"
+
+#LangString str_msg_rm_fail       ${LANG_PORTUGUESEBR} \
+#    "Falha ao desinstalar a seguinte versão:"
+
+#LangString str_msg_no_rm_key     ${LANG_PORTUGUESEBR} \
+#    "Não foi possível encontrar a chave de registro do desinstalador."
+
+#LangString str_msg_no_rm_reg     ${LANG_PORTUGUESEBR} \
+#    "Não foi possível encontrar o desinstalador a partir do registro."
+
+#LangString str_msg_no_rm_exe     ${LANG_PORTUGUESEBR} \
+#    "Não foi possível acessar o desinstalador."
+
+#LangString str_msg_rm_copy_fail  ${LANG_PORTUGUESEBR} \
+#    "Falha ao copiar o desinstalador para um diretório temporário."
+
+#LangString str_msg_rm_run_fail   ${LANG_PORTUGUESEBR} \
+#    "Falha ao executar o desinstalador."
+
+#LangString str_msg_abort_install ${LANG_PORTUGUESEBR} \
+#    "Instalador será interrompido."
+
+LangString str_msg_install_fail  ${LANG_PORTUGUESEBR} \
+    "A instalação falhou. Mais sorte na próxima vez."
+
+LangString str_msg_rm_exe_fail   ${LANG_PORTUGUESEBR} \
+    "Alguns arquivos em $0 não foram excluídos!$\r$\n\
+     Você deve fazê-lo manualmente."
+
+#LangString str_msg_rm_root_fail  ${LANG_PORTUGUESEBR} \
+#    "AVISO: Não foi possível remover $\"$vim_install_root$\", \
+#    pois não está vazio!"
+
+LangString str_msg_uninstalling  ${LANG_PORTUGUESEBR} \
+    "Desinstalando a versão antiga..."
+
+LangString str_msg_registering   ${LANG_PORTUGUESEBR} \
+    "Registrando..."
+
+LangString str_msg_unregistering ${LANG_PORTUGUESEBR} \
+    "Desregistrando..."
+
+
+##############################################################################
+# Dialog Box                                                              {{{1
+##############################################################################
+
+LangString str_vimrc_page_title    ${LANG_PORTUGUESEBR} \
+    "Escolher configurações do _vimrc"
+LangString str_vimrc_page_subtitle ${LANG_PORTUGUESEBR} \
+    "Escolha as configurações para melhorias, teclado e mouse."
+
+LangString str_msg_compat_title    ${LANG_PORTUGUESEBR} \
+    " Comportamento Vi / Vim "
+LangString str_msg_compat_desc     ${LANG_PORTUGUESEBR} \
+    "&Compatibilidade e melhorias"
+LangString str_msg_compat_vi       ${LANG_PORTUGUESEBR} \
+    "Compatível com Vi"
+LangString str_msg_compat_vim      ${LANG_PORTUGUESEBR} \
+    "Vim original"
+LangString str_msg_compat_defaults ${LANG_PORTUGUESEBR} \
+    "Vim com algumas melhorias (carrega defaults.vim)"
+LangString str_msg_compat_all      ${LANG_PORTUGUESEBR} \
+    "Vim com todas as melhorias (carrega vimrc_example.vim) (Padrão)"
+
+LangString str_msg_keymap_title   ${LANG_PORTUGUESEBR} \
+    " Mapeamentos "
+LangString str_msg_keymap_desc    ${LANG_PORTUGUESEBR} \
+    "&Remapear algumas teclas para o Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
+LangString str_msg_keymap_default ${LANG_PORTUGUESEBR} \
+    "Não remapear teclas (Padrão)"
+LangString str_msg_keymap_windows ${LANG_PORTUGUESEBR} \
+    "Remapear algumas teclas"
+
+LangString str_msg_mouse_title   ${LANG_PORTUGUESEBR} \
+    " Mouse "
+LangString str_msg_mouse_desc    ${LANG_PORTUGUESEBR} \
+    "&Comportamento de botões direito e esquerdo"
+LangString str_msg_mouse_default ${LANG_PORTUGUESEBR} \
+    "Direito: menu popup, Esquerdo: modo visual (Padrão)"
+LangString str_msg_mouse_windows ${LANG_PORTUGUESEBR} \
+    "Direito: menu popup, Esquerdo: modo de seleção (Windows)"
+LangString str_msg_mouse_unix    ${LANG_PORTUGUESEBR} \
+    "Direito: estende seleção, Esquerdo: modo visual (Unix)"

nsis/lang/russian.nsi

@@ -21,13 +21,13 @@ LangString ^UninstallCaption ${LANG_RUSSIAN} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file ${LANG_RUSSIAN} "${VIMRT}\doc\uganda.nsis.rux"
+LicenseLangString page_lic_file ${LANG_RUSSIAN} "..\lang\LICENSE.ru.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
-LangString vim_readme_file ${LANG_RUSSIAN} "README.rux.txt"
+LangString vim_readme_file ${LANG_RUSSIAN} "README.ru.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/serbian.nsi

@@ -21,15 +21,15 @@ LangString ^UninstallCaption ${LANG_SERBIAN} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_SERBIAN} "${VIMRT}\doc\uganda.nsis.srx"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_SERBIAN} "..\lang\LICENSE.sr.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_SERBIAN} "README.srx.txt"
+#LangString vim_readme_file ${LANG_SERBIAN} "README.sr.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/simpchinese.nsi

@@ -22,16 +22,14 @@ LangString ^UninstallCaption ${LANG_SIMPCHINESE} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_SIMPCHINESE} \
-#        "${VIMRT}\doc\uganda.nsis.cnx"
+LicenseLangString page_lic_file ${LANG_SIMPCHINESE} \
+        "..\lang\LICENSE.zh_cn.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_SIMPCHINESE} "README.cnx.txt"
+LangString vim_readme_file ${LANG_SIMPCHINESE} "README.zh_cn.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/swedish.nsi

@@ -0,0 +1,288 @@
+# vi:set ts=8 sts=4 sw=4 et fdm=marker:
+#
+# swedish.nsi: Svenska strängar för gvim NSIS-installationsprogram.
+#
+# Lokalisering-ID    : 1053
+# Lokalt namn  : sv
+# filkodning : UTF-8
+# Översättare       : Daniel Nylander
+
+!insertmacro MUI_LANGUAGE "Swedish"
+
+
+# Skriv över standardöversättningen.
+# Dessa strängar ska alltid vara på engelska.  Annars misslyckas dosinst.c.
+LangString ^SetupCaption     ${LANG_SWEDISH} \
+        "$(^Name) Setup"
+LangString ^UninstallCaption ${LANG_SWEDISH} \
+        "$(^Name) Uninstall"
+
+##############################################################################
+# Licensfil för licenssidan                                       {{{1
+##############################################################################
+
+LicenseLangString page_lic_file ${LANG_SWEDISH} "..\lang\LICENSE.sv.nsis.txt"
+
+##############################################################################
+# README.txt-fil, som öppnas efter installationen                     {{{1
+##############################################################################
+
+LangString vim_readme_file ${LANG_SWEDISH} "README.sv.txt"
+
+##############################################################################
+# MUI-konfigurationssträngar                                               {{{1
+##############################################################################
+
+#LangString str_dest_folder          ${LANG_SWEDISH} \
+#    "Målmapp (måste sluta med $\"vim$\")"
+
+LangString str_show_readme          ${LANG_SWEDISH} \
+    "Visa README efter avslutad installation"
+
+# Installationstyper:
+LangString str_type_typical         ${LANG_SWEDISH} \
+    "Typisk"
+
+LangString str_type_minimal         ${LANG_SWEDISH} \
+    "Minimal"
+
+LangString str_type_full            ${LANG_SWEDISH} \
+    "Fullständig"
+
+
+##############################################################################
+# Avsnittstitlar och beskrivning                                            {{{1
+##############################################################################
+
+LangString str_section_old_ver      ${LANG_SWEDISH} \
+    "Avinstallera befintliga versioner"
+LangString str_desc_old_ver         ${LANG_SWEDISH} \
+    "Avinstallera befintliga Vim-versioner från ditt system."
+
+LangString str_section_exe          ${LANG_SWEDISH} \
+    "Vim GUI och runtime-filer"
+LangString str_desc_exe             ${LANG_SWEDISH} \
+    "Vim GUI-körbara filer och runtime-filer.  Denna komponent krävs."
+
+LangString str_section_console      ${LANG_SWEDISH} \
+    "Vim-konsolprogram"
+LangString str_desc_console         ${LANG_SWEDISH} \
+    "Konsolversion av Vim (vim.exe)."
+
+LangString str_section_batch        ${LANG_SWEDISH} \
+    "Skapa .bat-filer"
+LangString str_desc_batch           ${LANG_SWEDISH} \
+    "Skapa .bat-filer för Vim-varianter i Windows-katalogen för \
+     kommandoradsanvändning."
+
+LangString str_group_icons          ${LANG_SWEDISH} \
+    "Skapa ikoner för Vim"
+LangString str_desc_icons           ${LANG_SWEDISH} \
+    "Skapa ikoner för Vim på olika platser för att underlätta åtkomsten."
+
+LangString str_section_desktop      ${LANG_SWEDISH} \
+    "På skrivbordet"
+LangString str_desc_desktop         ${LANG_SWEDISH} \
+    "Skapa ikoner för gVim-körbara filer på skrivbordet."
+
+LangString str_section_start_menu   ${LANG_SWEDISH} \
+    "I startmenyns programmapp"
+LangString str_desc_start_menu      ${LANG_SWEDISH} \
+    "Lägg till Vim i programmappen i startmenyn."
+
+#LangString str_section_quick_launch ${LANG_SWEDISH} \
+#    "I snabbstartfältet"
+#LangString str_desc_quick_launch    ${LANG_SWEDISH} \
+#    "Lägg till Vim-genväg i snabbstartfältet."
+
+LangString str_section_edit_with    ${LANG_SWEDISH} \
+    "Lägg till Vim-kontextmeny"
+LangString str_desc_edit_with       ${LANG_SWEDISH} \
+    "Lägg till Vim i listan över snabbmenyn $\"Öppna med...$\"."
+
+#LangString str_section_edit_with32  ${LANG_SWEDISH} \
+#    "32-bitarsversion"
+#LangString str_desc_edit_with32     ${LANG_SWEDISH} \
+#    "Lägg till Vim i listan över snabbmenyn $\"Öppna med...$\" \
+#     för 32-bitarsprogram."
+
+#LangString str_section_edit_with64  ${LANG_SWEDISH} \
+#    "64-bitarsversion"
+#LangString str_desc_edit_with64     ${LANG_SWEDISH} \
+#    "Lägg till Vim i listan över kontextmenyn $\"Öppna med...$\" \
+#     för 64-bitarsprogram."
+
+LangString str_section_vim_rc       ${LANG_SWEDISH} \
+    "Skapa standardkonfiguration"
+LangString str_desc_vim_rc          ${LANG_SWEDISH} \
+    "Skapa en standardkonfigurationsfil (_vimrc) om det inte redan finns en."
+
+LangString str_group_plugin         ${LANG_SWEDISH} \
+    "Skapa plugin-kataloger"
+LangString str_desc_plugin          ${LANG_SWEDISH} \
+    "Skapa plugin-kataloger.  Plugin-kataloger gör det möjligt att utöka Vim \
+     genom att släppa en fil i en katalog."
+
+LangString str_section_plugin_home  ${LANG_SWEDISH} \
+    "Privat"
+LangString str_desc_plugin_home     ${LANG_SWEDISH} \
+    "Skapa plugin-kataloger i HOME-katalogen."
+
+LangString str_section_plugin_vim   ${LANG_SWEDISH} \
+    "Delad"
+LangString str_desc_plugin_vim      ${LANG_SWEDISH} \
+    "Skapa plugin-kataloger i Vim-installationskatalogen, den används för \
+     alla på systemet."
+
+LangString str_section_nls          ${LANG_SWEDISH} \
+    "Stöd för modersmål"
+LangString str_desc_nls             ${LANG_SWEDISH} \
+    "Installera filer för stöd för modersmål."
+
+LangString str_unsection_register   ${LANG_SWEDISH} \
+    "Avregistrera Vim"
+LangString str_desc_unregister      ${LANG_SWEDISH} \
+    "Avregistrera Vim från systemet."
+
+LangString str_unsection_exe        ${LANG_SWEDISH} \
+    "Ta bort Vim-körbara filer/körningsfiler"
+LangString str_desc_rm_exe          ${LANG_SWEDISH} \
+    "Ta bort alla Vim-körbara filer och runtime-filer."
+
+LangString str_ungroup_plugin       ${LANG_SWEDISH} \
+    "Ta bort plugin-kataloger"
+LangString str_desc_rm_plugin       ${LANG_SWEDISH} \
+    "Ta bort plugin-katalogerna om de är tomma."
+
+LangString str_unsection_plugin_home ${LANG_SWEDISH} \
+    "Privat"
+LangString str_desc_rm_plugin_home  ${LANG_SWEDISH} \
+    "Ta bort plugin-katalogerna från HOME-katalogen."
+
+LangString str_unsection_plugin_vim ${LANG_SWEDISH} \
+    "Delad"
+LangString str_desc_rm_plugin_vim   ${LANG_SWEDISH} \
+    "Ta bort plugin-katalogerna från Vim-installationskatalogen."
+
+LangString str_unsection_rootdir    ${LANG_SWEDISH} \
+    "Ta bort Vim-rotkatalogen"
+LangString str_desc_rm_rootdir      ${LANG_SWEDISH} \
+    "Ta bort Vim-rotkatalogen. Den innehåller dina Vim-konfigurationsfiler!"
+
+
+##############################################################################
+# Meddelanden                                                                {{{1
+##############################################################################
+
+#LangString str_msg_too_many_ver  ${LANG_SWEDISH} \
+#    "Hittade $vim_old_ver_count Vim-versioner på ditt system.$\r$\n\
+#     Denna installationsprogram kan endast hantera ${VIM_MAX_OLD_VER} versioner \
+#    .$\r$\n\
+#     Ta bort några versioner och börja om."
+
+#LangString str_msg_invalid_root  ${LANG_SWEDISH} \
+#    "Ogiltig installationsväg: $vim_install_root!$\r$\n\
+#     Den ska sluta med $\"vim$\"."
+
+#LangString str_msg_bin_mismatch  ${LANG_SWEDISH} \
+#    "Binär sökväg stämmer inte!$\r$\n$\r$\n\
+#     Förväntar mig att binärvägen är $\"$vim_bin_path$\",$\r$\n\
+#     men systemet anger att binärvägen är $\"$INSTDIR$\"."
+
+#LangString str_msg_vim_running   ${LANG_SWEDISH} \
+#    "Vim körs fortfarande på ditt system.$\r$\n\
+#     Stäng alla instanser av Vim innan du fortsätter."
+
+#LangString str_msg_register_ole  ${LANG_SWEDISH} \
+#    "Försöker registrera Vim med OLE. \
+#     Det finns inget meddelande som anger om detta fungerar eller inte."
+
+#LangString str_msg_unreg_ole     ${LANG_SWEDISH} \
+#    "Försöker avregistrera Vim från OLE. \
+#     Det finns inget meddelande som anger om detta fungerar eller inte."
+
+#LangString str_msg_rm_start      ${LANG_SWEDISH} \
+#    "Avinstallera följande version:"
+
+#LangString str_msg_rm_fail       ${LANG_SWEDISH} \
+#    "Det gick inte att avinstallera följande version:"
+
+#LangString str_msg_no_rm_key     ${LANG_SWEDISH} \
+#    "Kan inte hitta avinstallationsnyckeln i registret."
+
+#LangString str_msg_no_rm_reg     ${LANG_SWEDISH} \
+#    "Kan inte hitta avinstallationsprogrammet i registret."
+
+#LangString str_msg_no_rm_exe     ${LANG_SWEDISH} \
+#    "Kan inte komma åt avinstallationsprogrammet."
+
+#LangString str_msg_rm_copy_fail  ${LANG_SWEDISH} \
+#    "Det gick inte att kopiera avinstallationsprogrammet till den tillfälliga katalogen."
+
+#LangString str_msg_rm_run_fail   ${LANG_SWEDISH} \
+#    "Det gick inte att köra avinstallationsprogrammet."
+
+#LangString str_msg_abort_install ${LANG_SWEDISH} \
+#    "Installationsprogrammet avbryts."
+
+LangString str_msg_install_fail  ${LANG_SWEDISH} \
+    "Installationen misslyckades. Bättre lycka nästa gång."
+
+LangString str_msg_rm_exe_fail   ${LANG_SWEDISH} \
+    "Vissa filer i $0 har inte raderats!$\r$\n\
+     Du måste göra det manuellt."
+
+#LangString str_msg_rm_root_fail  ${LANG_SWEDISH} \
+#    "VARNING: Kan inte ta bort $\"$vim_install_root$\", den är inte tom!"
+
+LangString str_msg_uninstalling  ${LANG_SWEDISH} \
+    "Avinstallerar den gamla versionen..."
+
+LangString str_msg_registering   ${LANG_SWEDISH} \
+    "Registrerar..."
+
+LangString str_msg_unregistering ${LANG_SWEDISH} \
+    "Avregistrerar..."
+
+
+##############################################################################
+# Dialogruta                                                              {{{1
+##############################################################################
+
+LangString str_vimrc_page_title    ${LANG_SWEDISH} \
+    "Välj _vimrc-inställningar"
+LangString str_vimrc_page_subtitle ${LANG_SWEDISH} \
+    "Välj inställningar för förbättringar, tangentbord och mus."
+
+LangString str_msg_compat_title    ${LANG_SWEDISH} \
+    " Vi / Vim-beteende "
+LangString str_msg_compat_desc     ${LANG_SWEDISH} \
+    "&Kompatibilitet och förbättringar"
+LangString str_msg_compat_vi       ${LANG_SWEDISH} \
+    "Vi-kompatibel"
+LangString str_msg_compat_vim      ${LANG_SWEDISH} \
+    "Vim original"
+LangString str_msg_compat_defaults ${LANG_SWEDISH} \
+    "Vim med vissa förbättringar (ladda defaults.vim)"
+LangString str_msg_compat_all      ${LANG_SWEDISH} \
+    "Vim med alla förbättringar (ladda vimrc_example.vim) (Standard)"
+
+LangString str_msg_keymap_title   ${LANG_SWEDISH} \
+    " Mappningar "
+LangString str_msg_keymap_desc    ${LANG_SWEDISH} \
+    "&Omkonfigurera några tangenter för Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
+LangString str_msg_keymap_default ${LANG_SWEDISH} \
+    "Omkonfigurera inte tangenter (standard)"
+LangString str_msg_keymap_windows ${LANG_SWEDISH} \
+    "Omkonfigurera några tangenter"
+
+LangString str_msg_mouse_title   ${LANG_SWEDISH} \
+    " Mus "
+LangString str_msg_mouse_desc    ${LANG_SWEDISH} \
+    "&Funktion för höger- och vänsterknapp"
+LangString str_msg_mouse_default ${LANG_SWEDISH} \
+    "Höger: popup-meny, Vänster: visuellt läge (Standard)"
+LangString str_msg_mouse_windows ${LANG_SWEDISH} \
+    "Höger: popup-meny, Vänster: välj läge (Windows)"
+LangString str_msg_mouse_unix    ${LANG_SWEDISH} \
+    "Höger: utökar valet, Vänster: visuellt läge (Unix)"

nsis/lang/tradchinese.nsi

@@ -22,16 +22,16 @@ LangString ^UninstallCaption ${LANG_TRADCHINESE} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
 #LicenseLangString page_lic_file ${LANG_TRADCHINESE} \
-#        "${VIMRT}\doc\uganda.nsis.twx"
+#        "..\lang\LICENSE.zh_tw.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_TRADCHINESE} "README.twx.txt"
+#LangString vim_readme_file ${LANG_TRADCHINESE} "README.zh_tw.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

nsis/lang/turkish.nsi

@@ -20,15 +20,15 @@ LangString ^UninstallCaption ${LANG_TURKISH} \
 # Translated license file for the license page                            {{{1
 ##############################################################################
 
-LicenseLangString page_lic_file 0 "${VIMRT}\doc\uganda.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_TURKISH} "${VIMRT}\doc\uganda.nsis.trx"
+LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
+#LicenseLangString page_lic_file ${LANG_TURKISH} "..\lang\LICENSE.tr.nsis.txt"
 
 ##############################################################################
 # Translated README.txt file, which is opened after installation          {{{1
 ##############################################################################
 
 LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_TURKISH} "README.trx.txt"
+#LangString vim_readme_file ${LANG_TURKISH} "README.tr.txt"
 
 ##############################################################################