From 4e86150ec5b5158da92b28938ea55819dc890a14 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 13 Oct 2015 20:21:49 +0200
Subject: [PATCH] =?UTF-8?q?patch=207.4.897=20Problem:=20=20=20=20Freeze=20?=
 =?UTF-8?q?and=20crash=20when=20there=20is=20a=20sleep=20in=20a=20remote?=
 =?UTF-8?q?=20command.=20=20=20=20=20=20=20=20=20=20=20=20=20(Karl=20Yngve?=
 =?UTF-8?q?=20Lerv=C3=A5g)=20Solution:=20=20=20Remove=20a=20message=20from?=
 =?UTF-8?q?=20the=20queue=20before=20dealing=20with=20it.=20(James=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20Kolb)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/if_xcmdsrv.c | 2 +-
 src/version.c    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c
index cf6d9a77ae..b1fbdaa35d 100644
--- a/src/if_xcmdsrv.c
+++ b/src/if_xcmdsrv.c
@@ -1235,9 +1235,9 @@ server_parse_messages()
     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);
     }
 }
diff --git a/src/version.c b/src/version.c
index 83bfe2b08e..71e1a2a8fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    897,
 /**/
     896,
 /**/