From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 22 Feb 2016 21:19:22 +0000 (+0100)
Subject: patch 7.4.1393
X-Git-Tag: v7.4.1393
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=bd73ae1bc63a3b0187ffe7fc8f0caee5a4eb66fa;p=thirdparty%2Fvim.git

patch 7.4.1393
Problem:    Starting a job hangs in the GUI. (Takuya Fujiwara)
Solution:   Don't check if ch_job is NULL when checking for an error.
            (Yasuhiro Matsumoto)
---

diff --git a/src/channel.c b/src/channel.c
index aa97088b40..f189ac043f 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1706,9 +1706,9 @@ channel_read(channel_T *channel, int part, char *func)
     }
 #endif
 
-    /* Reading a socket disconnection (readlen == 0), or a socket error.
+    /* Reading a disconnection (readlen == 0), or an error.
      * TODO: call error callback. */
-    if (readlen <= 0 && channel->ch_job == NULL)
+    if (readlen <= 0)
     {
 	/* Queue a "DETACH" netbeans message in the command queue in order to
 	 * terminate the netbeans session later. Do not end the session here
diff --git a/src/version.c b/src/version.c
index b545581842..15409a6b33 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1393,
 /**/
     1392,
 /**/