diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-25 19:03:03 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-25 19:03:03 +0100 |
| commit | 1e7885abe8daa793fd9328d0fd6c456214cb467e (patch) | |
| tree | f0b92dfa793099867200c6e6d6119259744c30db | |
| parent | 52c6eaffd43a8c8865f8d6ed7cde0a8b137479e2 (diff) | |
| download | vim-git-1e7885abe8daa793fd9328d0fd6c456214cb467e.tar.gz | |
patch 7.4.1655v7.4.1655
Problem: remote_expr() hangs. (Ramel)
Solution: Check for messages in the waiting loop.
| -rw-r--r-- | src/if_xcmdsrv.c | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
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 @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1655, +/**/ 1654, /**/ 1653, |