summaryrefslogtreecommitdiffstats
path: root/src/gui_x11.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-09-15 14:12:05 +0200
committerBram Moolenaar <Bram@vim.org>2015-09-15 14:12:05 +0200
commit93c88e0f6a4a8f7634ed84721daf4af46fc0d5db (patch)
treeb325606d26d69c3804a9007cf7d1fa4a8034f4aa /src/gui_x11.c
parented84b76021df763619cabaedddc44eb5ee849136 (diff)
patch 7.4.866v7.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)
Diffstat (limited to 'src/gui_x11.c')
-rw-r--r--src/gui_x11.c7
1 files changed, 3 insertions, 4 deletions
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