[vim] 135/139: patch 7.4.1817 Problem: The screen is not updated if a callback is invoked when closing a channel. Solution: Invoke redraw_after_callback().

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit cefe4f994853c2d4866e2aa4ea3e3f36ab2fea13
Author: Bram Moolenaar <Bram at vim.org>
Date:   Wed May 4 21:49:19 2016 +0200

    patch 7.4.1817
    Problem:    The screen is not updated if a callback is invoked when closing a
                channel.
    Solution:   Invoke redraw_after_callback().
---
 src/channel.c | 7 +++++++
 src/version.c | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/src/channel.c b/src/channel.c
index 4b7b6f7..444599c 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2494,6 +2494,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;
 
@@ -2503,6 +2504,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);
diff --git a/src/version.c b/src/version.c
index cf4e294..79ca5cd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1817,
+/**/
     1816,
 /**/
     1815,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git