# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1458929705 -3600
# Node ID 29765df3a86691328c35efe3afc1d5c9990f386f
# Parent  36d95f21f34014a00e3e192f2535dbb03ec94a74
commit https://github.com/vim/vim/commit/1e7885abe8daa793fd9328d0fd6c456214cb467e
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Mar 25 19:03:03 2016 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1655,
+/**/
     1654,
 /**/
     1653,