# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1444761004 -7200
# Node ID ad57f5b5bd6c2515e038aeed53296ffb105398f8
# Parent  cb6e9d77af1b4dd1b6eab747ce2ed943693c2934
commit https://github.com/vim/vim/commit/4e86150ec5b5158da92b28938ea55819dc890a14
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Oct 13 20:21:49 2015 +0200

    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)

diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    897,
+/**/
     896,
 /**/
     895,