Mercurial > vim

changeset 8200:ee84450e604e v7.4.1393

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/bd73ae1bc63a3b0187ffe7fc8f0caee5a4eb66fa Author: Bram Moolenaar <Bram@vim.org> Date: Mon Feb 22 22:19:22 2016 +0100 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)
author Christian Brabandt <cb@256bit.org>
date Mon, 22 Feb 2016 22:30:05 +0100
parents 3c2f0e5cb555
children 44e24e181cb6
files src/channel.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/channel.c
+++ b/src/channel.c
@@ -1706,9 +1706,9 @@ channel_read(channel_T *channel, int par
     }
 #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
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1393,
+/**/
     1392,
 /**/
     1391,