changeset 8851:1b38596644ba v7.4.1713

commit https://github.com/vim/vim/commit/f80663f17b2f2499b45eb4467088704c8298c385 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Apr 5 21:56:06 2016 +0200 patch 7.4.1713 Problem: GTK GUI doesn't work on Wayland. Solution: Specify that only the X11 backend is allowed. (Simon McVittie)
author Christian Brabandt <cb@256bit.org>
date Tue, 05 Apr 2016 22:00:05 +0200
parents be0dbaf8957f
children ccb4f86ae3e0
files src/gui_gtk_x11.c src/version.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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,