From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 20 Feb 2016 17:26:48 +0000 (+0100)
Subject: patch 7.4.1370
X-Git-Tag: v7.4.1370
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddbe7d26b10c4374f406b807ae161826cf2096e1;p=thirdparty%2Fvim.git

patch 7.4.1370
Problem:    The Python test script may keep on running.
Solution:   Join the threads. (Yasuhiro Matsumoto)
---

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index ec231e8c89..66fd48f43a 100644
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -192,3 +192,8 @@ if __name__ == "__main__":
 
     # Main thread terminates, but the server continues running
     # until server.shutdown() is called.
+    try:
+        while server_thread.isAlive(): 
+            server_thread.join(1)
+    except (KeyboardInterrupt, SystemExit):
+        server.shutdown()
diff --git a/src/version.c b/src/version.c
index d857ed2d51..598d430bcd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1370,
 /**/
     1369,
 /**/