Skip to content

Commit e7db949

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents a3db3e7 + 276920e commit e7db949

239 files changed

Lines changed: 6906 additions & 1190 deletions

File tree

Some content is hidden

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

.cirrus.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/labeler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ CI:
44
- all:
55
- changed-files:
66
- any-glob-to-any-file:
7-
- '.cirrus.yml'
87
- '.github/dependabot.yml'
98
- '.github/labeler.yml'
109
- '.github/workflows/*'

.github/workflows/ci-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383

8484
steps:
8585
- name: Checkout repository from GitHub
86-
uses: actions/checkout@v6
86+
uses: actions/checkout@v6.0.2
8787

8888
- name: Build
8989
timeout-minutes: 15

.github/workflows/ci-linux_asan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- name: Checkout repository from GitHub
40-
uses: actions/checkout@v6
40+
uses: actions/checkout@v6.0.2
4141

4242
- name: Build
4343
timeout-minutes: 15

.github/workflows/ci-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: Checkout repository from GitHub
35-
uses: actions/checkout@v6
35+
uses: actions/checkout@v6.0.2
3636

3737
- name: Install packages
3838
if: matrix.features == 'huge'

.github/workflows/ci-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
release: false
129129

130130
- name: Checkout repository from GitHub
131-
uses: actions/checkout@v6
131+
uses: actions/checkout@v6.0.2
132132

133133
- name: Create a list of download URLs
134134
shell: cmd

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Checkout repository from github
47-
uses: actions/checkout@v6
47+
uses: actions/checkout@v6.0.2
4848

4949
# Initializes the CodeQL tools for scanning.
5050
- name: Initialize CodeQL

.github/workflows/coverity.yml

Lines changed: 0 additions & 85 deletions
This file was deleted.

.github/workflows/link-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
lychee:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v6
11+
- uses: actions/checkout@v6.0.2
1212
- name: Run Lychee
1313
uses: lycheeverse/lychee-action@v2
1414
with:

Filelist

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
# Source files for all source archives.
55
SRC_ALL = \
6-
.cirrus.yml \
76
.gitattributes \
87
.git-blame-ignore-revs \
98
.github/MAINTAINERS \
@@ -15,7 +14,6 @@ SRC_ALL = \
1514
.github/workflows/ci-windows.yml \
1615
.github/workflows/ci.yml \
1716
.github/workflows/codeql-analysis.yml \
18-
.github/workflows/coverity.yml \
1917
.github/workflows/link-check.yml \
2018
.github/actions/build_vim_on_linux/action.yml \
2119
.github/actions/test_artifacts/action.yml \
@@ -149,6 +147,9 @@ SRC_ALL = \
149147
src/session.c \
150148
src/sha256.c \
151149
src/sign.c \
150+
src/sixel.c \
151+
src/kitty.c \
152+
src/cairo.c \
152153
src/socketserver.c \
153154
src/sound.c \
154155
src/spell.c \
@@ -349,6 +350,9 @@ SRC_ALL = \
349350
src/proto/session.pro \
350351
src/proto/sha256.pro \
351352
src/proto/sign.pro \
353+
src/proto/sixel.pro \
354+
src/proto/kitty.pro \
355+
src/proto/cairo.pro \
352356
src/proto/socketserver.pro \
353357
src/proto/sound.pro \
354358
src/proto/spell.pro \
@@ -507,6 +511,8 @@ SRC_UNIX = \
507511
src/gui_gtk4.c \
508512
src/gui_gtk4_f.c \
509513
src/gui_gtk4_f.h \
514+
src/gui_gtk4_cb.c \
515+
src/gui_gtk4_cb.h \
510516
src/gui_gtk_res.xml \
511517
src/gui_motif.c \
512518
src/gui_xmdlg.c \

0 commit comments

Comments
 (0)