updated for version 7.1-209

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 3235f40d567e0c1c8d1f02a20ff0fa9b816415db..207e33eb383cabc9bd071071096606af2b7c39ce 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -6660,6 +6660,7 @@ clip_mch_request_selection(VimClipboard *cbd)
     unsigned   i;
     int                nbytes;
     char_u     *buffer;
+    time_t     start;
 
     for (i = 0; i < N_SELECTION_TARGETS; ++i)
     {
@@ -6670,7 +6671,11 @@ clip_mch_request_selection(VimClipboard *cbd)
                              cbd->gtk_sel_atom, target,
                              (guint32)GDK_CURRENT_TIME);
 
-       while (received_selection == RS_NONE)
+       /* Hack: Wait up to three seconds for the selection.  A hang was
+        * noticed here when using the netrw plugin combined with ":gui"
+        * during the FocusGained event. */
+       start = time(NULL);
+       while (received_selection == RS_NONE && time(NULL) < start + 3)
            gtk_main(); /* wait for selection_received_cb */
 
        if (received_selection != RS_FAIL)

diff --git a/src/version.c b/src/version.c
index 6d9267911c7587d076e5ee7a3da0e9dd967c831a..570d8700f600758d9d042aabca80ed8da08a9fee 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    209,
 /**/
     208,
 /**/