patch 7.4.1713

Problem:    GTK GUI doesn't work on Wayland.
Solution:   Specify that only the X11 backend is allowed. (Simon McVittie)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index aa4137ac5f7cb9237f998fb494f4e6a09ce019fc..00196ebe80d629bacbaf2c8ad5953add7ddf6197 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -1679,6 +1679,12 @@ 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. */
+    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 91f02a5b88c31f7eb863f8b2cda5b88355cc3d30..f22af28dc1d968612cad6d2f1ae93a9e73c40fee 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1713,
 /**/
     1712,
 /**/