diff options
| author | vimboss <devnull@localhost> | 2008-01-06 14:17:07 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2008-01-06 14:17:07 +0000 |
| commit | 7bc7dc6ebad2065c78799c2b9fed65fea05501cf (patch) | |
| tree | a33076a85a82aa5ea34dde9c2e890da3dc2e7611 | |
| parent | cde9c1c6d1ac9c5c5bec00c048a703f2f3992e4c (diff) | |
| download | vim-7-1-209.tar.gz | |
| -rw-r--r-- | src/gui_gtk_x11.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 3235f40d..207e33eb 100644 --- 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 6d926791..570d8700 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 209, +/**/ 208, /**/ 207, |