Skip to content

Commit 70df8b3

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 00042fe + d1833d2 commit 70df8b3

File tree

240 files changed

+3994
-1308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+3994
-1308
lines changed

.github/MAINTAINERS

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ runtime/autoload/hcl.vim @gpanders
1616
runtime/autoload/modula2.vim @dkearns
1717
runtime/autoload/rubycomplete.vim @segfault @dkearns
1818
runtime/autoload/rust.vim @lilyball
19-
runtime/autoload/typst.vim @saccarosium
2019
runtime/autoload/xmlformat.vim @chrisbra
2120
runtime/autoload/dist/json.vim @habamax
2221
runtime/colors/blue.vim @habamax @romainl @neutaaaaan
@@ -101,7 +100,6 @@ runtime/compiler/tidy.vim @dkearns
101100
runtime/compiler/ts-node.vim @dkearns
102101
runtime/compiler/tsc.vim @dkearns
103102
runtime/compiler/typedoc.vim @dkearns
104-
runtime/compiler/typst.vim @saccarosium
105103
runtime/compiler/xmllint.vim @dkearns
106104
runtime/compiler/xo.vim @dkearns
107105
runtime/compiler/yamllint.vim @romainl
@@ -122,7 +120,6 @@ runtime/ftplugin/abnf.vim @A4-Tacks
122120
runtime/ftplugin/antlr4.vim @jiangyinzuo
123121
runtime/ftplugin/apache.vim @dubgeiser
124122
runtime/ftplugin/arduino.vim @k-takata
125-
runtime/ftplugin/asciidoc.vim @saccarosium
126123
runtime/ftplugin/astro.vim @romainl
127124
runtime/ftplugin/asy.vim @avidseeker
128125
runtime/ftplugin/autohotkey.vim @telemachus
@@ -246,8 +243,8 @@ runtime/ftplugin/nu.vim @mrcjkb
246243
runtime/ftplugin/octave.vim @dkearns
247244
runtime/ftplugin/ondir.vim @jparise
248245
runtime/ftplugin/opencl.vim @Freed-Wu
246+
runtime/ftplugin/openscad.vim @squibid
249247
runtime/ftplugin/openvpn.vim @ObserverOfTime
250-
runtime/ftplugin/org.vim @saccarosium
251248
runtime/ftplugin/pascal.vim @dkearns
252249
runtime/ftplugin/pbtxt.vim @lakshayg
253250
runtime/ftplugin/pdf.vim @tpope
@@ -314,7 +311,6 @@ runtime/ftplugin/tt2html.vim @petdance
314311
runtime/ftplugin/twig.vim @ribru17
315312
runtime/ftplugin/typescript.vim @dkearns
316313
runtime/ftplugin/typescriptreact.vim @dkearns
317-
runtime/ftplugin/typst.vim @saccarosium
318314
runtime/ftplugin/uc.vim @ribru17
319315
runtime/ftplugin/unison.vim @chuwy
320316
runtime/ftplugin/v.vim @ribru17
@@ -411,7 +407,6 @@ runtime/indent/teraterm.vim @k-takata
411407
runtime/indent/terraform.vim @gpanders
412408
runtime/indent/thrift.vim @jiangyinzuo
413409
runtime/indent/typescript.vim @HerringtonDarkholme
414-
runtime/indent/typst.vim @saccarosium
415410
runtime/indent/vroom.vim @dbarnett
416411
runtime/indent/xml.vim @chrisbra
417412
runtime/indent/zsh.vim @chrisbra
@@ -523,7 +518,6 @@ runtime/syntax/hog.vim @wtfbbqhax
523518
runtime/syntax/hollywood.vim @sodero
524519
runtime/syntax/html.vim @dkearns
525520
runtime/syntax/htmlangular.vim @dlvandenberg
526-
runtime/syntax/hyprlang.vim @saccarosium
527521
runtime/syntax/i3config.vim @hiqua
528522
runtime/syntax/icon.vim @dkearns
529523
runtime/syntax/indent.vim @dkearns
@@ -578,7 +572,6 @@ runtime/syntax/omnimark.vim @kennypete
578572
runtime/syntax/ondir.vim @jparise
579573
runtime/syntax/opencl.vim @Freed-Wu
580574
runtime/syntax/openvpn.vim @ObserverOfTime
581-
runtime/syntax/org.vim @saccarosium
582575
runtime/syntax/pacmanlog.vim @rpigott
583576
runtime/syntax/pascal.vim @dkearns
584577
runtime/syntax/pbtxt.vim @lakshayg

.github/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ plugin-netrw:
146146
- changed-files:
147147
- any-glob-to-any-file:
148148
- 'runtime/plugin/netrwPlugin.vim'
149-
- 'runtime/autoload/netrw*'
149+
- 'runtime/pack/dist/opt/netrw/**'
150150

151151
xxd:
152152
- all:

.github/workflows/link-check.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# .github/workflows/link-check.yml
2+
name: Check Links
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 3 * * 0' # Every Sunday at 03:00 UTC
7+
jobs:
8+
lychee:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- name: Run Lychee
13+
uses: lycheeverse/lychee-action@v2
14+
with:
15+
args: --verbose --config ci/lychee.toml .

CONTRIBUTING.md

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ approvers are happy with that particular change.
4848

4949
# Reporting issues
5050

51-
We use GitHub issues, but that is not a requirement. Writing to the Vim
51+
We use GitHub [issues][17], but that is not a requirement. Writing to the Vim
5252
mailing list is also fine.
5353

5454
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.
7272

7373
The latest version of these files can be obtained from the repository.
7474
They are usually not updated with numbered patches. However, they may
75-
or may not work with older Vim releases (since they may contain new features).
75+
or may not work with older Vim releases (since they may depend on new
76+
features).
7677

7778
If you find a problem with one of these files or have a suggestion for
7879
improvement, please first try to contact the maintainer directly.
@@ -82,7 +83,18 @@ upstream repository. You may also check the [MAINTAINERS][11] file.
8283
The maintainer will take care of issues and send updates to the Vim project for
8384
distribution with Vim.
8485

85-
If the maintainer does not respond, contact the [vim-dev][0] mailing list.
86+
If the maintainer does not respond, contact the [vim-dev][0] mailing list or
87+
open an [issue][17] here.
88+
89+
Note: Whether or not to use Vim9 script is up to the maintainer. For runtime
90+
files maintained here, we aim to preserve compatibility with Neovim if
91+
possible. Please wrap Vim9 script with a guard like this:
92+
```vim
93+
if has('vim9script')
94+
" use Vim9 script implementation
95+
[...]
96+
endif
97+
```
8698

8799
## Contributing new runtime files
88100

@@ -95,6 +107,9 @@ PR with your changes against this repository here. For new filetypes, do not for
95107
- add yourself as Maintainer to the top of file (again, keep the header similar to
96108
other runtime files)
97109
- add yourself to the [MAINTAINERS][11] file.
110+
- add a guard `if has('vim9script')` if you like to maintain Neovim
111+
compatibility but want to use Vim9 script (or restrict yourself to legacy Vim
112+
script)
98113

99114
# Translations
100115

@@ -144,3 +159,4 @@ mailing list. For other questions please use the [Vi Stack Exchange][8] website,
144159
[14]: https://github.com/vim/vim/blob/master/runtime/doc/syntax.txt
145160
[15]: https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin
146161
[16]: https://github.com/vim/vim/blob/master/runtime/doc/helphelp.txt
162+
[17]: https://github.com/vim/vim/issues

Filelist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ SRC_ALL = \
1212
.github/workflows/ci.yml \
1313
.github/workflows/codeql-analysis.yml \
1414
.github/workflows/coverity.yml \
15+
.github/workflows/link-check.yml \
1516
.github/actions/test_artifacts/action.yml \
1617
.github/dependabot.yml \
1718
.gitignore \
@@ -24,6 +25,7 @@ SRC_ALL = \
2425
ci/config.mk*.sed \
2526
ci/if_ver*.vim \
2627
ci/if_feat_check.vim \
28+
ci/lychee.toml \
2729
ci/setup-xvfb.sh \
2830
ci/setup-sway.sh \
2931
ci/remove_snap.sh \

ci/lychee.toml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
############################# Runtime #############################
2+
3+
# Reasonable concurrency to avoid rate-limiting small hosts.
4+
max_concurrency = 14
5+
6+
# File extensions to scan
7+
extensions = ["c", "h", "md", "html", "txt"]
8+
9+
############################# Requests ############################
10+
11+
# Accepted status codes
12+
# - Include 429 (Too Many Requests) to avoid marking throttled links as dead.
13+
accept = ["100..=103", "200..=299", "429"]
14+
15+
# Retry each request a few times on transient network errors
16+
retries = 2
17+
retry_wait_time = 2
18+
19+
# Timeout per request in seconds
20+
timeout = 20
21+
22+
############################# Exclusions ##########################
23+
24+
exclude = [
25+
'^https?://sys/file$',
26+
'^file://.*',
27+
'^https?://(www\.)?badges\.debian\.net/.*$',
28+
'^https?://(www\.)?repology\.org/.*$',
29+
'^https?://scan\.coverity\.com/.*$',
30+
'^https?://(www\.)?img\.shields\.io/.*$',
31+
'^https?://(www\.)?fossies\.org/.*$',
32+
'^https?://(www\.)?adobe\.com.*$',
33+
'^https?://(www\.)?google\.com.*$',
34+
'^https?://(www\.)?forum\.vmssoftware\.com/.*$',
35+
'^http://vim\.sourceforge\.net/scripts/script\.php\?script_id=40$',
36+
'^https://is\.gd/.*$',
37+
'^https://wiki\.contextgarden\.net/Vim$',
38+
'^https://github\.com/you/foobar\.git$',
39+
'^https?://flatassembler\.net',
40+
'^https?://www\.fleiner\.com/vim/download.html',
41+
]
42+
43+
# Lychee only reads UTF-8 files
44+
exclude_path = [
45+
'src/po',
46+
'src/testdir',
47+
]

runtime/autoload/dist/script.vim

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vim9script
44
# Invoked from "scripts.vim" in 'runtimepath'
55
#
66
# Maintainer: The Vim Project <https://github.com/vim/vim>
7-
# Last Change: 2025 Apr 24
7+
# Last Change: 2025 Aug 09
88
# Former Maintainer: Bram Moolenaar <[email protected]>
99

1010
export def DetectFiletype()
@@ -264,6 +264,7 @@ def DetectFromText(line1: string)
264264

265265
# ELM Mail files
266266
elseif line1 =~ '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .* \(19\|20\)\d\d$'
267+
|| line1 =~ '^\creturn-path:\s<.*@.*>$'
267268
setl ft=mail
268269

269270
# Mason
@@ -286,6 +287,7 @@ def DetectFromText(line1: string)
286287
# Diff file:
287288
# - "diff" in first line (context diff)
288289
# - "Only in " in first line
290+
# - "34,35c34,35" normal diff format output
289291
# - "--- " in first line and "+++ " in second line (unified diff).
290292
# - "*** " in first line and "--- " in second line (context diff).
291293
# - "# It was generated by makepatch " in the second line (makepatch diff).
@@ -294,7 +296,7 @@ def DetectFromText(line1: string)
294296
# - "=== ", "--- ", "+++ " (bzr diff, common case)
295297
# - "=== (removed|added|renamed|modified)" (bzr diff, alternative)
296298
# - "# HG changeset patch" in first line (Mercurial export format)
297-
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\)'
299+
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\)'
298300
|| (line1 =~ '^--- ' && line2 =~ '^+++ ')
299301
|| (line1 =~ '^\* looking for ' && line2 =~ '^\* comparing to ')
300302
|| (line1 =~ '^\*\*\* ' && line2 =~ '^--- ')
@@ -453,6 +455,12 @@ def DetectFromText(line1: string)
453455
elseif line1 =~ '^#n\%($\|\s\)'
454456
setl ft=sed
455457

458+
elseif line1 =~ '^#\s\+Reconstructed via infocmp from file:'
459+
setl ft=terminfo
460+
461+
elseif line1 =~ '^File: .*\.info, Node: .*, \%(Next\|Prev\): .*, Up: \|This is the top of the INFO tree.'
462+
setl ft=info
463+
456464
else
457465
var lnum = 1
458466
while getline(lnum) =~ "^? " && lnum < line("$")

runtime/autoload/typst.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Language: Typst
2-
" Previous Maintainer: Gregory Anders
3-
" Maintainer: Luca Saccarola <[email protected]>
4-
" Last Change: 2024 Dec 09
2+
" Previous Maintainer: Luca Saccarola <[email protected]>
3+
" Maintainer: This runtime file is looking for a new maintainer.
4+
" Last Change: 2025 Aug 05
55
" Based on: https://github.com/kaarmu/typst.vim
66

77
function! typst#indentexpr() abort

0 commit comments

Comments
 (0)