summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui_gtk_x11.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index aa4137ac5f..00196ebe80 100644
--- 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 91f02a5b88..f22af28dc1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1713,
+/**/
1712,
/**/
1711,