Merge remote-tracking branch 'vim/master'

Author: ychin

.github/MAINTAINERS

@@ -16,7 +16,6 @@ runtime/autoload/hcl.vim				@gpanders
 runtime/autoload/modula2.vim				@dkearns
 runtime/autoload/rubycomplete.vim			@segfault @dkearns
 runtime/autoload/rust.vim				@lilyball
-runtime/autoload/typst.vim				@saccarosium
 runtime/autoload/xmlformat.vim				@chrisbra
 runtime/autoload/dist/json.vim				@habamax
 runtime/colors/blue.vim					@habamax @romainl @neutaaaaan
@@ -101,7 +100,6 @@ runtime/compiler/tidy.vim				@dkearns
 runtime/compiler/ts-node.vim				@dkearns
 runtime/compiler/tsc.vim				@dkearns
 runtime/compiler/typedoc.vim				@dkearns
-runtime/compiler/typst.vim				@saccarosium
 runtime/compiler/xmllint.vim				@dkearns
 runtime/compiler/xo.vim					@dkearns
 runtime/compiler/yamllint.vim				@romainl
@@ -122,7 +120,6 @@ runtime/ftplugin/abnf.vim				@A4-Tacks
 runtime/ftplugin/antlr4.vim				@jiangyinzuo
 runtime/ftplugin/apache.vim				@dubgeiser
 runtime/ftplugin/arduino.vim				@k-takata
-runtime/ftplugin/asciidoc.vim				@saccarosium
 runtime/ftplugin/astro.vim				@romainl
 runtime/ftplugin/asy.vim				@avidseeker
 runtime/ftplugin/autohotkey.vim				@telemachus
@@ -246,8 +243,8 @@ runtime/ftplugin/nu.vim					@mrcjkb
 runtime/ftplugin/octave.vim				@dkearns
 runtime/ftplugin/ondir.vim				@jparise
 runtime/ftplugin/opencl.vim				@Freed-Wu
+runtime/ftplugin/openscad.vim                           @squibid
 runtime/ftplugin/openvpn.vim				@ObserverOfTime
-runtime/ftplugin/org.vim				@saccarosium
 runtime/ftplugin/pascal.vim				@dkearns
 runtime/ftplugin/pbtxt.vim				@lakshayg
 runtime/ftplugin/pdf.vim				@tpope
@@ -314,7 +311,6 @@ runtime/ftplugin/tt2html.vim				@petdance
 runtime/ftplugin/twig.vim				@ribru17
 runtime/ftplugin/typescript.vim				@dkearns
 runtime/ftplugin/typescriptreact.vim			@dkearns
-runtime/ftplugin/typst.vim				@saccarosium
 runtime/ftplugin/uc.vim					@ribru17
 runtime/ftplugin/unison.vim				@chuwy
 runtime/ftplugin/v.vim					@ribru17
@@ -411,7 +407,6 @@ runtime/indent/teraterm.vim				@k-takata
 runtime/indent/terraform.vim				@gpanders
 runtime/indent/thrift.vim				@jiangyinzuo
 runtime/indent/typescript.vim				@HerringtonDarkholme
-runtime/indent/typst.vim				@saccarosium
 runtime/indent/vroom.vim				@dbarnett
 runtime/indent/xml.vim					@chrisbra
 runtime/indent/zsh.vim					@chrisbra
@@ -523,7 +518,6 @@ runtime/syntax/hog.vim					@wtfbbqhax
 runtime/syntax/hollywood.vim				@sodero
 runtime/syntax/html.vim					@dkearns
 runtime/syntax/htmlangular.vim				@dlvandenberg
-runtime/syntax/hyprlang.vim				@saccarosium
 runtime/syntax/i3config.vim				@hiqua
 runtime/syntax/icon.vim					@dkearns
 runtime/syntax/indent.vim				@dkearns
@@ -578,7 +572,6 @@ runtime/syntax/omnimark.vim				@kennypete
 runtime/syntax/ondir.vim				@jparise
 runtime/syntax/opencl.vim				@Freed-Wu
 runtime/syntax/openvpn.vim				@ObserverOfTime
-runtime/syntax/org.vim					@saccarosium
 runtime/syntax/pacmanlog.vim				@rpigott
 runtime/syntax/pascal.vim				@dkearns
 runtime/syntax/pbtxt.vim				@lakshayg

.github/labeler.yml

@@ -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/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@v4
+      - name: Run Lychee
+        uses: lycheeverse/lychee-action@v2
+        with:
+          args: --verbose --config ci/lychee.toml .

CONTRIBUTING.md

@@ -48,7 +48,7 @@ approvers are happy with that particular change.
 
 # 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
@@ -72,7 +72,8 @@ Or open [the todo file][todo list] on GitHub to see the latest version.
 
 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).
+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.
@@ -82,7 +83,18 @@ 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
 
@@ -95,6 +107,9 @@ PR with your changes against this repository here. For new filetypes, do not for
 - 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 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
 
@@ -144,3 +159,4 @@ mailing list. For other questions please use the [Vi Stack Exchange][8] website,
 [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

Filelist

@@ -12,6 +12,7 @@ SRC_ALL =	\
 		.github/workflows/ci.yml \
 		.github/workflows/codeql-analysis.yml \
 		.github/workflows/coverity.yml \
+		.github/workflows/link-check.yml \
 		.github/actions/test_artifacts/action.yml \
 		.github/dependabot.yml \
 		.gitignore \
@@ -24,6 +25,7 @@ SRC_ALL =	\
 		ci/config.mk*.sed \
 		ci/if_ver*.vim \
 		ci/if_feat_check.vim \
+		ci/lychee.toml \
 		ci/setup-xvfb.sh \
 		ci/setup-sway.sh \
 		ci/remove_snap.sh \

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
+retries = 2
+retry_wait_time = 2
+
+# Timeout per request in seconds
+timeout = 20
+
+#############################  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',
+]

runtime/autoload/dist/script.vim

@@ -4,7 +4,7 @@ vim9script
 # Invoked from "scripts.vim" in 'runtimepath'
 #
 # Maintainer:	The Vim Project <https://github.com/vim/vim>
-# Last Change:	2025 Apr 24
+# Last Change:	2025 Aug 09
 # Former Maintainer:	Bram Moolenaar <[email protected]>
 
 export def DetectFiletype()
@@ -264,6 +264,7 @@ def DetectFromText(line1: string)
 
   # ELM Mail files
   elseif line1 =~ '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .* \(19\|20\)\d\d$'
+      || line1 =~ '^\creturn-path:\s<.*@.*>$'
     setl ft=mail
 
   # Mason
@@ -286,6 +287,7 @@ def DetectFromText(line1: string)
     # Diff file:
     # - "diff" in first line (context diff)
     # - "Only in " in first line
+    # - "34,35c34,35" normal diff format output
     # - "--- " in first line and "+++ " in second line (unified diff).
     # - "*** " in first line and "--- " in second line (context diff).
     # - "# It was generated by makepatch " in the second line (makepatch diff).
@@ -294,7 +296,7 @@ def DetectFromText(line1: string)
     # - "=== ", "--- ", "+++ " (bzr diff, common case)
     # - "=== (removed|added|renamed|modified)" (bzr diff, alternative)
     # - "# HG changeset patch" in first line (Mercurial export format)
-  elseif line1 =~ '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\>\|# It was generated by makepatch \|Index:\s\+\f\+\r\=$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\|# HG changeset patch\)'
+  elseif line1 =~ '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\(,\d\+\)\=\>$\|# It was generated by makepatch \|Index:\s\+\f\+\r\=$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\|# HG changeset patch\)'
 	 || (line1 =~ '^--- ' && line2 =~ '^+++ ')
 	 || (line1 =~ '^\* looking for ' && line2 =~ '^\* comparing to ')
 	 || (line1 =~ '^\*\*\* ' && line2 =~ '^--- ')
@@ -453,6 +455,12 @@ def DetectFromText(line1: string)
   elseif line1 =~ '^#n\%($\|\s\)'
     setl ft=sed
 
+  elseif line1 =~ '^#\s\+Reconstructed via infocmp from file:'
+    setl ft=terminfo
+
+  elseif line1 =~ '^File: .*\.info,  Node: .*,  \%(Next\|Prev\): .*,  Up: \|This is the top of the INFO tree.'
+    setl ft=info
+
   else
     var lnum = 1
     while getline(lnum) =~ "^? " && lnum < line("$")

runtime/autoload/typst.vim

@@ -1,7 +1,7 @@
 " Language:    Typst
-" Previous Maintainer:  Gregory Anders
-" Maintainer:  Luca Saccarola <[email protected]>
-" Last Change: 2024 Dec 09
+" Previous Maintainer:  Luca Saccarola <[email protected]>
+" Maintainer: This runtime file is looking for a new maintainer.
+" Last Change: 2025 Aug 05
 " Based on:    https://github.com/kaarmu/typst.vim
 
 function! typst#indentexpr() abort