Skip to content

Commit dade0ee

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 5c5e809 + d22ff1c commit dade0ee

99 files changed

Lines changed: 2958 additions & 995 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.

.github/workflows/coverity.yml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: Coverity
2+
on:
3+
schedule:
4+
- cron: '42 0 * * *' # Run once per day, to avoid Coverity's submission limits
5+
workflow_dispatch:
6+
7+
permissions:
8+
contents: read # to fetch code (actions/checkout)
9+
10+
jobs:
11+
scan:
12+
runs-on: ubuntu-24.04
13+
14+
env:
15+
CC: gcc
16+
DEBIAN_FRONTEND: noninteractive
17+
TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
18+
19+
steps:
20+
- name: Checkout repository from github
21+
if: env.TOKEN
22+
uses: actions/checkout@v6.0.2
23+
24+
- name: Download Coverity
25+
if: env.TOKEN
26+
run: |
27+
wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=vim" -O coverity_tool.tgz
28+
mkdir cov-scan
29+
tar ax -f coverity_tool.tgz --strip-components=1 -C cov-scan
30+
31+
- name: Install packages
32+
if: env.TOKEN
33+
run: |
34+
sudo apt-get update && sudo apt-get install -y \
35+
autoconf \
36+
gettext \
37+
libcanberra-dev \
38+
libperl-dev \
39+
python3-dev \
40+
liblua5.4-dev \
41+
lua5.4 \
42+
ruby-dev \
43+
tcl-dev \
44+
libgtk2.0-dev \
45+
desktop-file-utils \
46+
libtool-bin \
47+
libsodium-dev
48+
49+
- name: Set up environment
50+
if: env.TOKEN
51+
run: |
52+
echo "$(pwd)/cov-scan/bin" >> $GITHUB_PATH
53+
(
54+
echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
55+
echo "CONFOPT=--enable-perlinterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
56+
) >> $GITHUB_ENV
57+
58+
- name: Configure
59+
if: env.TOKEN
60+
run: |
61+
./configure --with-features=huge ${CONFOPT} --enable-fail-if-missing
62+
# Append various warning flags to CFLAGS.
63+
sed -i -f ci/config.mk.sed src/auto/config.mk
64+
sed -i -f ci/config.mk.${CC}.sed src/auto/config.mk
65+
# -O2 gives false warning and turns it into an error:
66+
# warning: function may return address of local variable [-Wreturn-local-addr]
67+
sed -i 's/-O2 \?//' src/auto/config.mk
68+
69+
- name: Build/scan vim
70+
if: env.TOKEN
71+
run: |
72+
cov-build --dir cov-int make -j${NPROC}
73+
74+
- name: Submit results
75+
if: env.TOKEN
76+
run: |
77+
tar zcf cov-scan.tgz cov-int
78+
curl --form token=$TOKEN \
79+
--form email=$EMAIL \
80+
--form file=@cov-scan.tgz \
81+
--form version="$(git rev-parse HEAD)" \
82+
--form description="Automatic GHA scan" \
83+
'https://scan.coverity.com/builds?project=vim'
84+
env:
85+
EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}

Filelist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ SRC_ALL = \
1414
.github/workflows/ci-windows.yml \
1515
.github/workflows/ci.yml \
1616
.github/workflows/codeql-analysis.yml \
17+
.github/workflows/coverity.yml \
1718
.github/workflows/link-check.yml \
1819
.github/actions/build_vim_on_linux/action.yml \
1920
.github/actions/test_artifacts/action.yml \
@@ -517,6 +518,8 @@ SRC_UNIX = \
517518
src/gui_gtk4_da.h \
518519
src/gui_gtk4_tb.c \
519520
src/gui_gtk4_tb.h \
521+
src/gui_gtk4_menu.c \
522+
src/gui_gtk4_menu.h \
520523
src/gui_gtk_res.xml \
521524
src/gui_motif.c \
522525
src/gui_xmdlg.c \

README_vim.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
[![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)
44
[![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master)
5+
[![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim)
56
[![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim)
67
[![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim)
78
[![Fossies codespell report](https://fossies.org/linux/test/vim-master.tar.gz/codespell.svg)](https://fossies.org/linux/test/vim-master.tar.gz/codespell.html)

ci/lychee.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ exclude = [
2626
'^file://.*',
2727
'^https?://(www\.)?badges\.debian\.net/.*$',
2828
'^https?://(www\.)?repology\.org/.*$',
29+
'^https?://scan\.coverity\.com/.*$',
2930
'^https?://(www\.)?img\.shields\.io/.*$',
3031
'^https?://(www\.)?fossies\.org/.*$',
3132
'^https?://(www\.)?adobe\.com.*$',

runtime/doc/builtin.txt

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*builtin.txt* For Vim version 9.2. Last change: 2026 Jun 17
1+
*builtin.txt* For Vim version 9.2. Last change: 2026 Jun 24
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -9869,15 +9869,25 @@ server2client({clientid}, {string}) *server2client()*
98699869
Return type: |Number|
98709870

98719871

9872-
serverlist() *serverlist()*
9872+
serverlist([{dict}]) *serverlist()*
98739873
Return a list of available server names, one per line.
98749874
When there are no servers or the information is not available
9875-
an empty string is returned. See also |clientserver|.
9875+
an empty string is returned.
98769876
{only available when compiled with the |+clientserver| feature}
9877+
9878+
If {dict} is given, then it is a |Dictionary| supporting the
9879+
following options:
9880+
key type meaning ~
9881+
list |Boolean| Return a list of strings,
9882+
where each string is a server
9883+
name.
9884+
9885+
See also |clientserver|.
9886+
98779887
Example: >
98789888
:echo serverlist()
98799889
<
9880-
Return type: |String|
9890+
Return type: |String| or list<string>
98819891

98829892

98839893
setbufline({buf}, {lnum}, {text}) *setbufline()*

runtime/doc/change.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 9.2. Last change: 2026 Jun 18
1+
*change.txt* For Vim version 9.2. Last change: 2026 Jun 22
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1332,10 +1332,11 @@ and ":put" commands and with CTRL-R.
13321332
the command was executed completely from a mapping.
13331333
{not available when compiled without the |+cmdline_hist|
13341334
feature}
1335-
*quote_#* *quote#*
1336-
6. Alternate file register "#
1335+
1336+
6. Alternate file register "# *quote_#* *quote#* *@#*
13371337
Contains the |alternate-file| name for current window
1338-
This register is writeable and changes which buffer CTRL-^ enters.
1338+
This register is writable with `:let` and |setreg()|. This changes which buffer
1339+
CTRL-^ enters. You can't yank or delete into this register.
13391340
A String is matched against existing buffer names, like |:buffer|: >
13401341
let @# = 'buffer_name'
13411342
Also supports using buffer number and |file-pattern|.
@@ -1398,11 +1399,12 @@ When writing to this register, nothing happens. This can be used to delete
13981399
text without affecting the normal registers. When reading from this register,
13991400
nothing is returned.
14001401

1401-
10. Last search pattern register "/ *quote_/* *quote/*
1402+
10. Last search pattern register "/ *quote_/* *quote/*
14021403
Contains the most recent search-pattern. This is used for "n" and 'hlsearch'.
1403-
It is writable with `:let`, you can change it to have 'hlsearch' highlight
1404-
other matches without actually searching. You can't yank or delete into this
1405-
register. The search direction is available in |v:searchforward|.
1404+
This register is writable with `:let` and |setreg()|. You can change it to have
1405+
'hlsearch' highlight other matches without actually searching. You can't yank
1406+
or delete into this register. The search direction is available in
1407+
|v:searchforward|.
14061408
Note that the value is restored when returning from a function
14071409
|function-search-undo|.
14081410

runtime/doc/gui_x11.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*gui_x11.txt* For Vim version 9.2. Last change: 2026 Jun 13
1+
*gui_x11.txt* For Vim version 9.2. Last change: 2026 Jun 24
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -791,5 +791,16 @@ Most newer applications will provide their current selection via PRIMARY ("*)
791791
and use CLIPBOARD ("+) for cut/copy/paste operations. You thus have access to
792792
both by choosing to use either of the "* or "+ registers.
793793

794+
*gtk4-menu-navigation*
795+
In the GTK 4 GUI, you may also navigate the menu items with these keyboard
796+
mappings:
797+
key meaning ~
798+
<Tab> <Down> Go to next item
799+
<S-Tab> <Up> Go to previous item
800+
<Left> Go to parent submenu
801+
<Right> Go to current item's submenu
802+
<C-Left> Go to next menu bar item
803+
<C-Right> Go to previous menu bar item
804+
794805

795806
vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

runtime/doc/options.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 9.2. Last change: 2026 Jun 17
1+
*options.txt* For Vim version 9.2. Last change: 2026 Jun 23
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -6594,7 +6594,7 @@ A jump table for the options with a short description can be found at |Q_op|.
65946594
x <number> any X11 pointer number (see X11/cursorfont.h)
65956595

65966596
The "avail" column contains a 'w' if the shape is available for Win32,
6597-
x for X11 (including GTK+ 2), g for GTK+ 3.
6597+
x for X11 (including GTK+ 2), g for GTK+ 3 and GTK 4.
65986598
Any modes not specified or shapes not available use the normal mouse
65996599
pointer.
66006600

runtime/doc/tags

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4057,6 +4057,7 @@ $quote eval.txt /*$quote*
40574057
?<CR> pattern.txt /*?<CR>*
40584058
?? eval.txt /*??*
40594059
@ repeat.txt /*@*
4060+
@# change.txt /*@#*
40604061
@/ change.txt /*@\/*
40614062
@: repeat.txt /*@:*
40624063
@= change.txt /*@=*
@@ -8366,6 +8367,7 @@ gtk-css gui_x11.txt /*gtk-css*
83668367
gtk-tooltip-colors gui_x11.txt /*gtk-tooltip-colors*
83678368
gtk3-slow gui_x11.txt /*gtk3-slow*
83688369
gtk4-hwaccel gui_x11.txt /*gtk4-hwaccel*
8370+
gtk4-menu-navigation gui_x11.txt /*gtk4-menu-navigation*
83698371
gtk4-slow gui_x11.txt /*gtk4-slow*
83708372
gu change.txt /*gu*
83718373
gugu change.txt /*gugu*
@@ -11182,6 +11184,7 @@ tempfile change.txt /*tempfile*
1118211184
template autocmd.txt /*template*
1118311185
tempname() builtin.txt /*tempname()*
1118411186
term++close terminal.txt /*term++close*
11187+
term++noclose terminal.txt /*term++noclose*
1118511188
term++open terminal.txt /*term++open*
1118611189
term++shell terminal.txt /*term++shell*
1118711190
term-dependent-settings term.txt /*term-dependent-settings*

runtime/doc/terminal.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*terminal.txt* For Vim version 9.2. Last change: 2026 Apr 06
1+
*terminal.txt* For Vim version 9.2. Last change: 2026 Jun 24
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -232,7 +232,7 @@ Command syntax ~
232232
keys in the terminal window. For MS-Windows see the
233233
++eof argument below.
234234

235-
*term++close* *term++open*
235+
*term++close* *term++noclose* *term++open*
236236
Supported [options] are:
237237
++close The terminal window will close
238238
automatically when the job terminates.
@@ -1001,9 +1001,11 @@ term_start({cmd} [, {options}]) *term_start()*
10011001
terminal window, see |term_setkill()|
10021002
"term_finish" What to do when the job is finished:
10031003
"close": close any windows
1004+
"noclose": window will not be opened
10041005
"open": open window if needed
10051006
Note that "open" can be interruptive.
1006-
See |term++close| and |term++open|.
1007+
See |term++close|, |term++noclose| and
1008+
|term++open|.
10071009
"term_opencmd" command to use for opening the window
10081010
when "open" is used for "term_finish";
10091011
must have "%d" where the buffer number

0 commit comments

Comments
 (0)