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 aa97088b403f54bdadf71073e9ac56f4025711bf..f189ac043ff79b7644eaec1f51a15fa7133b66c1 100644 (file)
--- 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 b545581842a2dd867eee1888c8da1b3e3262e89d..15409a6b3387c19f6c735add14032a5dbc2cf437 100644 (file)
--- 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,
 /**/