diff options
| author | Christian Brabandt <cb@256bit.org> | 2024-06-01 20:55:09 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-06-01 20:59:14 +0200 |
| commit | e5bc2e4bc9e7456daef480dd422252dbf444c58c (patch) | |
| tree | 3c457d06467797b18f7d2db709b600ab3a086a3e | |
| parent | 88d4f255b7b7a19bb4f6489e0ad0956e47d51fed (diff) | |
patch 9.1.0457: tests: test_gui fails on Waylandv9.1.0457
v:windowid is set in GUI buils with Wayland
Problem: tests: test_gui fails on Wayland
(after: 9.1.0064, Gary Johnson)
Solution: drop the "empty($WAYLAND_DISPLAY)" condition in the test
fixes: #14886
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/doc/eval.txt | 4 | ||||
| -rw-r--r-- | src/testdir/test_gui.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index ae93b35b3f..18cd2c1237 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 9.1. Last change: 2024 May 05 +*eval.txt* For Vim version 9.1. Last change: 2024 Jun 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2727,7 +2727,7 @@ v:vim_did_enter Zero until most of startup is done. It is set to one just v:warningmsg Last given warning message. It's allowed to set this variable. *v:windowid* *windowid-variable* -v:windowid When any X11 based GUI is running or when running in a +v:windowid When any X11/Wayland based GUI is running or when running in a terminal and Vim connects to the X server (|-X|) this will be set to the window ID. When an MS-Windows GUI is running this will be set to the diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index 2ff8d3400b..d53750f19f 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -899,7 +899,7 @@ func Test_set_term() endfunc func Test_windowid_variable() - if (g:x11_based_gui && empty($WAYLAND_DISPLAY)) || has('win32') + if g:x11_based_gui || has('win32') call assert_true(v:windowid > 0) else call assert_equal(0, v:windowid) diff --git a/src/version.c b/src/version.c index 6e02c3e58e..221fcf8c72 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 457, +/**/ 456, /**/ 455, |