aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.1-209

Browse Source
This commit is contained in:
Bram Moolenaar
2008-01-06 14:17:07 +00:00
parent afbdeb852f
commit 51b5ab9729
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui_gtk_x11.c
View File

@@ -6660,6 +6660,7 @@ clip_mch_request_selection(VimClipboard *cbd)
unsigned i; unsigned i;
int nbytes; int nbytes;
char_u *buffer; char_u *buffer;
time_t start;
for (i = 0; i < N_SELECTION_TARGETS; ++i) for (i = 0; i < N_SELECTION_TARGETS; ++i)
{ {
@@ -6670,7 +6671,11 @@ clip_mch_request_selection(VimClipboard *cbd)
cbd->gtk_sel_atom, target, cbd->gtk_sel_atom, target,
(guint32)GDK_CURRENT_TIME); (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 */ gtk_main(); /* wait for selection_received_cb */
if (received_selection != RS_FAIL) if (received_selection != RS_FAIL)

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
209,
/**/ /**/
208, 208,
/**/ /**/