Mirror of the Vim source from https://github.com/vim/vim
Revisão | 58a14bafc1f08b9712732a26a44c2a93e34e6ae2 (tree) |
---|---|
Hora | 2008-01-06 23:17:07 |
Autor | vimboss |
Commiter | vimboss |
updated for version 7.1-209
@@ -6660,6 +6660,7 @@ | ||
6660 | 6660 | unsigned i; |
6661 | 6661 | int nbytes; |
6662 | 6662 | char_u *buffer; |
6663 | + time_t start; | |
6663 | 6664 | |
6664 | 6665 | for (i = 0; i < N_SELECTION_TARGETS; ++i) |
6665 | 6666 | { |
@@ -6670,7 +6671,11 @@ | ||
6670 | 6671 | cbd->gtk_sel_atom, target, |
6671 | 6672 | (guint32)GDK_CURRENT_TIME); |
6672 | 6673 | |
6673 | - while (received_selection == RS_NONE) | |
6674 | + /* Hack: Wait up to three seconds for the selection. A hang was | |
6675 | + * noticed here when using the netrw plugin combined with ":gui" | |
6676 | + * during the FocusGained event. */ | |
6677 | + start = time(NULL); | |
6678 | + while (received_selection == RS_NONE && time(NULL) < start + 3) | |
6674 | 6679 | gtk_main(); /* wait for selection_received_cb */ |
6675 | 6680 | |
6676 | 6681 | if (received_selection != RS_FAIL) |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 209, | |
671 | +/**/ | |
670 | 672 | 208, |
671 | 673 | /**/ |
672 | 674 | 207, |