0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

updated for version 7.4.666

Problem:    There is a chance that Vim may lock up.
Solution:   Handle timer events differently. (Aaron Burrow)
This commit is contained in:
Bram Moolenaar
2015-03-20 16:26:54 +01:00
parent 76feaf1bfe
commit b1fc2bf29c
2 changed files with 25 additions and 9 deletions

View File

@@ -7096,8 +7096,16 @@ xterm_update()
{ {
XEvent event; XEvent event;
while (XtAppPending(app_context) && !vim_is_input_buf_full()) for (;;)
{ {
XtInputMask mask = XtAppPending(app_context);
if (mask == 0 || vim_is_input_buf_full())
break;
if (mask & XtIMXEvent)
{
/* There is an event to process. */
XtAppNextEvent(app_context, &event); XtAppNextEvent(app_context, &event);
#ifdef FEAT_CLIENTSERVER #ifdef FEAT_CLIENTSERVER
{ {
@@ -7110,6 +7118,12 @@ xterm_update()
#endif #endif
XtDispatchEvent(&event); XtDispatchEvent(&event);
} }
else
{
/* There is something else than an event to process. */
XtAppProcessEvent(app_context, mask);
}
}
} }
int int

View File

@@ -741,6 +741,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 */
/**/
666,
/**/ /**/
665, 665,
/**/ /**/