commit 4e86150ec5b5158da92b28938ea55819dc890a14
author Bram Moolenaar <Bram@vim.org> Tue Oct 13 20:21:49 2015 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Oct 13 20:21:49 2015 +0200
tree b83b68ce4d21ccb04bec05bdddbd97c78bc679fc
parent b4f6a46b01ed00b642a2271e9d1559e51ab0f2c4

patch 7.4.897
Problem:    Freeze and crash when there is a sleep in a remote command.
            (Karl Yngve Lervåg)
Solution:   Remove a message from the queue before dealing with it. (James
            Kolb)

src/if_xcmdsrv.c

diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c
index cf6d9a7..b1fbdaa 100644
--- a/src/if_xcmdsrv.c
+++ b/src/if_xcmdsrv.c
@@ -1235,9 +1235,9 @@
     while (head.next != NULL && head.next != &head)
     {
 	node = head.next;
-	server_parse_message(X_DISPLAY, node->propInfo, node->len);
 	head.next = node->next;
 	node->next->prev = node->prev;
+	server_parse_message(X_DISPLAY, node->propInfo, node->len);
 	vim_free(node);
     }
 }

src/version.c

diff --git a/src/version.c b/src/version.c
index 83bfe2b..71e1a2a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    897,
+/**/
     896,
 /**/
     895,