patch 9.1.1585: Wayland: gvim still needs GVIM_ENABLE_WAYLAND
Commit:
https://github.com/vim/vim/commit/48a3b146b49d508f1d592974105c690b7af62ea8
Author: Christoffer Aasted <[email protected]>
Date: Wed Jul 23 21:05:51 2025 +0200
patch 9.1.1585: Wayland: gvim still needs GVIM_ENABLE_WAYLAND
Problem: Wayland: gvim still needs GVIM_ENABLE_WAYLAND
Solution: Drop the GVIM_ENABLE_WAYLAND code, always enable both X11 and
Wayland GUI support (Christoffer Aasted)
closes: #17817
Signed-off-by: Christoffer Aasted <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt
index 4a0d04c88..4ae03f0e8 100644
--- a/runtime/doc/gui_x11.txt
+++ b/runtime/doc/gui_x11.txt
@@ -1,4 +1,4 @@
-*gui_x11.txt* For Vim version 9.1. Last change: 2024 Nov 17
+*gui_x11.txt* For Vim version 9.1. Last change: 2025 Jul 23
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -649,9 +649,8 @@ X11R5 with a library for X11R6 probably doesn't work
(although the linking
won't give an error message, Vim will crash later).
*gui-wayland*
-Initial support for the Wayland display server protocol has landed in patch
-9.1.0064. To enable it, you need to set the environment variable
-"$GVIM_ENABLE_WAYLAND" in your shell.
+Support for the Wayland display server protocol has landed in patch
+9.1.0064.
Note: The Wayland protocol is subject to some restrictions, so the following
functions won't work: |getwinpos()|, |getwinposx()|, |getwinposy()| and the
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 49ed4271d..14a3367b6 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -1732,15 +1732,6 @@ gui_mch_init_check(void)
}
#endif
-#if GTK_CHECK_VERSION(3,10,0)
- // Vim currently assumes that Gtk means X11, so it cannot use native Gtk
- // support for other backends such as Wayland.
- //
- // Use an environment variable to enable unfinished Wayland support.
- if (getenv("GVIM_ENABLE_WAYLAND") == NULL)
- gdk_set_allowed_backends ("x11");
-#endif
-
#ifdef FEAT_GUI_GNOME
if (gtk_socket_id == 0)
using_gnome = 1;
diff --git a/src/version.c b/src/version.c
index 74aa8a18a..c894f2f80 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1585,
/**/
1584,
/**/
--
--
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 [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1ueevg-006A1T-FT%40256bit.org.
