Merge remote-tracking branch 'vim/master'

Author: splhack

src/channel.c

@@ -2513,6 +2513,7 @@ channel_close(channel_T *channel, int invoke_close_cb)
 			   &rettv, 1, argv, 0L, 0L, &dummy, TRUE,
 			   channel->ch_close_partial, NULL);
 	      clear_tv(&rettv);
+	      channel_need_redraw = TRUE;
 	  }
 	  --channel->ch_refcount;
 
@@ -2522,6 +2523,12 @@ channel_close(channel_T *channel, int invoke_close_cb)
 	  partial_unref(channel->ch_close_partial);
 	  channel->ch_close_partial = NULL;
 
+	  if (channel_need_redraw)
+	  {
+	      channel_need_redraw = FALSE;
+	      redraw_after_callback();
+	  }
+
 	  /* any remaining messages are useless now */
 	  for (part = PART_SOCK; part <= PART_ERR; ++part)
 	      drop_messages(channel, part);

src/version.c

@@ -768,6 +768,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1817,
 /**/
     1816,
 /**/