Mercurial > vim
changeset 1494:58a14bafc1f0 v7.1.209
updated for version 7.1-209
author | vimboss |
---|---|
date | Sun, 06 Jan 2008 14:17:07 +0000 |
parents | 3c17132458a1 |
children | 04265ffbda1f |
files | src/gui_gtk_x11.c src/version.c |
diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -6660,6 +6660,7 @@ clip_mch_request_selection(VimClipboard 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->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)