diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-18 19:27:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-18 19:27:24 +0200 |
| commit | 7f7c3325d3f1baba32263a3457cfc4d90ecd5ff1 (patch) | |
| tree | be77fcae7026c245f0669bf93c65139c7b4c36b9 | |
| parent | 30e12d259ee78272359f9da2655d0593a4f6a626 (diff) | |
| download | vim-git-7.4.1750.tar.gz | |
patch 7.4.1750v7.4.1750
Problem: When a buffer gets updated while in command line mode, the screen
may be messed up.
Solution: Postpone the redraw when the screen is scrolled.
| -rw-r--r-- | src/channel.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/channel.c b/src/channel.c index 72484ecb0..892c09ab7 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1431,6 +1431,7 @@ channel_write_new_lines(buf_T *buf) /* * Invoke the "callback" on channel "channel". + * This does not redraw but sets channel_need_redraw; */ static void invoke_callback(channel_T *channel, char_u *callback, partial_T *partial, @@ -1445,8 +1446,7 @@ invoke_callback(channel_T *channel, char_u *callback, partial_T *partial, call_func(callback, (int)STRLEN(callback), &rettv, 2, argv, 0L, 0L, &dummy, TRUE, partial, NULL); clear_tv(&rettv); - - redraw_after_callback(); + channel_need_redraw = TRUE; } /* @@ -2009,6 +2009,10 @@ channel_exe_cmd(channel_T *channel, int part, typval_T *argv) } } +/* + * Invoke the callback at "cbhead". + * Does not redraw but sets channel_need_redraw. + */ static void invoke_one_time_callback( channel_T *channel, @@ -2099,6 +2103,7 @@ append_to_buffer(buf_T *buffer, char_u *msg, channel_T *channel) /* * Invoke a callback for "channel"/"part" if needed. + * This does not redraw but sets channel_need_redraw when redraw is needed. * Return TRUE when a message was handled, there might be another one. */ static int @@ -3468,13 +3473,10 @@ channel_parse_messages(void) } } - if (channel_need_redraw && must_redraw) + if (channel_need_redraw) { channel_need_redraw = FALSE; - update_screen(0); - setcursor(); - cursor_on(); - out_flush(); + redraw_after_callback(); } return ret; diff --git a/src/version.c b/src/version.c index fa0958548..695d0b731 100644 --- 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 */ /**/ + 1750, +/**/ 1749, /**/ 1748, |