updated for version 7.2-071

diff --git a/src/gui_w48.c b/src/gui_w48.c
index 08dcb2d0a25c4f9b10a43310357576c25d26d120..4de0c763921a5bd1e9c2ccb6c7064a5b575bd287 100644 (file)
--- 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
index 92ca89f21cf0e4ce27f815188206fed6c21073e8..67301767da986d8568328f61ee84bd3c61f2eee5 100644 (file)
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -769,11 +769,14 @@ messageFromNetbeans(gpointer clientData, gint unused1,
        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
index 780493ef5bebb6dfc5a85d20c34034cc3a68a777..f038f1e8a8806e760ba92d528784fe1392d581c3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    71,
 /**/
     70,
 /**/