patch 9.1.0457: tests: test_gui fails on Wayland
Commit:
https://github.com/vim/vim/commit/e5bc2e4bc9e7456daef480dd422252dbf444c58c
Author: Christian Brabandt <c...@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 <c...@256bit.org>
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index ae93b35b3..18cd2c123 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 2ff8d3400..d53750f19 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 6e02c3e58..221fcf8c7 100644
--- 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1sDUBz-003ipS-Fo%40256bit.org.
