From 93c88e0f6a4a8f7634ed84721daf4af46fc0d5db Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 15 Sep 2015 14:12:05 +0200
Subject: patch 7.4.866 Problem:    Crash when changing the 'tags' option from
 a remote command.             (Benjamin Fritz) Solution:   Instead of
 executing messages immediately, use a queue, like for             netbeans.
 (James Kolb)

---
 src/gui_x11.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/gui_x11.c')

diff --git a/src/gui_x11.c b/src/gui_x11.c
index ed71b26ce8..276930728f 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -2895,9 +2895,8 @@ gui_mch_wait_for_chars(wtime)
 	    focus = gui.in_focus;
 	}
 
-#if defined(FEAT_NETBEANS_INTG)
-	/* Process any queued netbeans messages. */
-	netbeans_parse_messages();
+#ifdef MESSAGE_QUEUE
+	parse_queued_messages();
 #endif
 
 	/*
@@ -3199,7 +3198,7 @@ gui_x11_send_event_handler(w, client_data, event, dum)
     if (e->type == PropertyNotify && e->window == commWindow
 	    && e->atom == commProperty &&  e->state == PropertyNewValue)
     {
-	serverEventProc(gui.dpy, event);
+	serverEventProc(gui.dpy, event, 0);
     }
 }
 #endif
-- 
cgit v1.2.3