# HG changeset patch # User vimboss # Date 1230117653 0 # Node ID c22ded254d0591df640c3ee0ea3dd0a490fa2396 # Parent 42ac369bd824634488b569ec5516fc435b700be8 updated for version 7.2-071 diff --git a/src/gui_w48.c b/src/gui_w48.c --- a/src/gui_w48.c +++ b/src/gui_w48.c @@ -1937,6 +1937,11 @@ gui_mch_wait_for_chars(int wtime) s_need_activate = FALSE; } +#ifdef FEAT_NETBEANS_INTG + /* Process the queued netbeans messages. */ + netbeans_parse_messages(); +#endif + /* * Don't use gui_mch_update() because then we will spin-lock until a * char arrives, instead we use GetMessage() to hang until an diff --git a/src/netbeans.c b/src/netbeans.c --- a/src/netbeans.c +++ b/src/netbeans.c @@ -769,11 +769,14 @@ messageFromNetbeans(gpointer clientData, return; /* don't try to parse it */ } -#ifdef FEAT_GUI_GTK +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32) + /* Let the main loop handle messages. */ +# ifdef FEAT_GUI_GTK if (gtk_main_level() > 0) gtk_main_quit(); +# endif #else - /* Parse the messages, but avoid recursion. */ + /* Parse the messages now, but avoid recursion. */ if (level == 1) netbeans_parse_messages(); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 71, +/**/ 70, /**/ 69,