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>

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index ae93b35b3fd255cbd901acaa79ab27b38ffc3c72..18cd2c12376f4a4ffd1a943e5b73c2a13f414e02 100644 (file)
--- 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 2ff8d3400bda5097184de972071ce5e2ce95d067..d53750f19f8aaef363f50cda5553f330dc9c8204 100644 (file)
--- 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 6e02c3e58e4a57d0f6d56f09984dd766dbc1ae71..221fcf8c72d59d257e43f9bca75d232fe7d39b55 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    457,
 /**/
     456,
 /**/