thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 9.1.0457: tests: test_gui fails on Wayland

Browse Source 
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>
This commit is contained in:
Christian Brabandt 2024-06-01 20:55:09 +02:00
parent 88d4f255b7
commit e5bc2e4bc9
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/eval.txt
View File

@ -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 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:warningmsg Last given warning message. It's allowed to set this variable.
*v:windowid* *windowid-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 terminal and Vim connects to the X server (|-X|) this will be
set to the window ID. set to the window ID.
When an MS-Windows GUI is running this will be set to the When an MS-Windows GUI is running this will be set to the

2
src/testdir/test_gui.vim
View File

@ -899,7 +899,7 @@ func Test_set_term()
endfunc endfunc
func Test_windowid_variable() 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) call assert_true(v:windowid > 0)
else else
call assert_equal(0, v:windowid) call assert_equal(0, v:windowid)

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
457,
/**/ /**/
456, 456,
/**/ /**/