summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-05-04 21:49:19 +0200
committerBram Moolenaar <Bram@vim.org>2016-05-04 21:49:19 +0200
commitcefe4f994853c2d4866e2aa4ea3e3f36ab2fea13 (patch)
tree4fe7bc39230987ca8b3cdb676d8c3dede3f313b3
parentd8585eded6359f1d7e1981e96ae775efd077c638 (diff)
patch 7.4.1817v7.4.1817
Problem: The screen is not updated if a callback is invoked when closing a channel. Solution: Invoke redraw_after_callback().
-rw-r--r--src/channel.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/channel.c b/src/channel.c
index 4b7b6f72c6..444599c7c2 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 cf4e2947fd..79ca5cdc73 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,