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 0b9b1a81904ac3814b0c8ce1a175ca012350e802..a94e7cd35a9f78c89cf086d4a3cf03e550a54f5d 100644 (file)
--- 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 c1f6db6278c1a6398d59ca5711621567e94677ac..a3d6e1eeb33aee591f27acf478aea88d5d3bd50c 100644 (file)
--- 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,
 /**/