From 61665aa51248a1ed2c258f34dd02e919ad24b19d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 24 Dec 2008 11:20:53 +0000
Subject: updated for version 7.2-071

---
 src/gui_w48.c  | 5 +++++
 src/netbeans.c | 7 +++++--
 src/version.c  | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/gui_w48.c b/src/gui_w48.c
index 08dcb2d0a..4de0c7639 100644
--- 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 92ca89f21..67301767d 100644
--- 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 780493ef5..f038f1e8a 100644
--- 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,
 /**/
-- 
cgit v1.2.1