To: vim_dev@googlegroups.com
Subject: Patch 7.4.1713
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.1713
Problem:    GTK GUI doesn't work on Wayland.
Solution:   Specify that only the X11 backend is allowed. (Simon McVittie)
Files:      src/gui_gtk_x11.c


*** ../vim-7.4.1712/src/gui_gtk_x11.c	2016-03-12 16:28:13.881691468 +0100
--- src/gui_gtk_x11.c	2016-04-05 21:53:34.267228176 +0200
***************
*** 1679,1684 ****
--- 1679,1690 ----
      }
  #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;
*** ../vim-7.4.1712/src/version.c	2016-04-05 21:12:55.979983324 +0200
--- src/version.c	2016-04-05 21:52:04.932136164 +0200
***************
*** 750,751 ****
--- 750,753 ----
  {   /* Add new patch number below this line */
+ /**/
+     1713,
  /**/

-- 
A computer without Windows is like a fish without a bicycle.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///