Mercurial > vim
changeset 35310:d4b4476bf768 v9.1.0457
patch 9.1.0457: tests: test_gui fails on Wayland
Commit: https://github.com/vim/vim/commit/e5bc2e4bc9e7456daef480dd422252dbf444c58c
Author: Christian Brabandt <cb@256bit.org>
Date: Sat Jun 1 20:55:09 2024 +0200
patch 9.1.0457: tests: test_gui fails on Wayland
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 01 Jun 2024 21:15:03 +0200 |
| parents | 74d92af90f75 |
| children | f49669961601 |
| files | runtime/doc/eval.txt src/testdir/test_gui.vim src/version.c |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 start 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
--- 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)