summaryrefslogtreecommitdiff
path: root/src/screen.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-07-28 21:51:57 +0200
committerBram Moolenaar <Bram@vim.org>2017-07-28 21:51:57 +0200
commitd85f271bf8516dbd90be4d18f905f0abbfcd6db6 (patch)
tree733fbe602d4995c5d4757c8a6a93d2a3ddb4911c /src/screen.c
parentd973bcb483088b69eb1aed3788476662fe6b77ef (diff)
downloadvim-git-d85f271bf8516dbd90be4d18f905f0abbfcd6db6.tar.gz
patch 8.0.0797: finished job in terminal window is not handledv8.0.0797
Problem: Finished job in terminal window is not handled. Solution: Add the scrollback buffer. Use it to fill the buffer when the job has ended.
Diffstat (limited to 'src/screen.c')
-rw-r--r--src/screen.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/screen.c b/src/screen.c
index 447eb1e49..7d62042cb 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1200,11 +1200,10 @@ win_update(win_T *wp)
#endif
#ifdef FEAT_TERMINAL
- if (wp->w_buffer->b_term != NULL)
+ /* If this window contains a terminal, redraw works completely differently.
+ */
+ if (term_update_window(wp) == OK)
{
- /* This window contains a terminal, redraw works completely
- * differently. */
- term_update_window(wp);
wp->w_redr_type = 0;
return;
}
@@ -6849,14 +6848,14 @@ win_redr_status(win_T *wp)
p = NameBuff;
len = (int)STRLEN(p);
- if (wp->w_buffer->b_help
+ if (bt_help(wp->w_buffer)
#ifdef FEAT_QUICKFIX
|| wp->w_p_pvw
#endif
|| bufIsChanged(wp->w_buffer)
|| wp->w_buffer->b_p_ro)
*(p + len++) = ' ';
- if (wp->w_buffer->b_help)
+ if (bt_help(wp->w_buffer))
{
STRCPY(p + len, _("[Help]"));
len += (int)STRLEN(p + len);