From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 25 Mar 2016 18:03:03 +0000 (+0100)
Subject: patch 7.4.1655
X-Git-Tag: v7.4.1655
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e7885abe8daa793fd9328d0fd6c456214cb467e;p=vim

patch 7.4.1655
Problem:    remote_expr() hangs. (Ramel)
Solution:   Check for messages in the waiting loop.
---

diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c
index 0b9b1a819..a94e7cd35 100644
--- a/src/if_xcmdsrv.c
+++ b/src/if_xcmdsrv.c
@@ -606,6 +606,7 @@ ServerWait(
     {
 	while (XCheckWindowEvent(dpy, commWindow, PropertyChangeMask, &event))
 	    serverEventProc(dpy, &event, 1);
+	server_parse_messages();
 
 	if (endCond(endData) != 0)
 	    break;
diff --git a/src/version.c b/src/version.c
index c1f6db627..a3d6e1eeb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1655,
 /**/
     1654,
 /**/