diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-10-28 18:02:21 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-10-28 18:02:21 +0200 |
| commit | 8c732f7274145805be817c481e313059bce9f037 (patch) | |
| tree | 6b16f4cbda3088746846570ea1f3b9be29b475e5 /src/nvim/screen.c | |
| parent | da13d9a30cf7a5428649a24f8761ae1d5dbc1f02 (diff) | |
| parent | bcf266de46b054b564727d5d31e4421ba09f5704 (diff) | |
| download | rneovim-8c732f7274145805be817c481e313059bce9f037.tar.gz rneovim-8c732f7274145805be817c481e313059bce9f037.tar.bz2 rneovim-8c732f7274145805be817c481e313059bce9f037.zip | |
Merge #7440 "terminal: adjust for 'number'"
closes #5310
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index f5730cf70a..38ecd88ec0 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -692,12 +692,18 @@ static void win_update(win_T *wp) if (wp->w_nrwidth != i) { type = NOT_VALID; wp->w_nrwidth = i; - } else if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) { - /* - * When there are both inserted/deleted lines and specific lines to be - * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw - * everything (only happens when redrawing is off for while). - */ + + if (buf->terminal) { + terminal_resize(buf->terminal, + (uint16_t)(MAX(0, curwin->w_width - win_col_off(curwin))), + (uint16_t)curwin->w_height); + } + } else if (buf->b_mod_set + && buf->b_mod_xlines != 0 + && wp->w_redraw_top != 0) { + // When there are both inserted/deleted lines and specific lines to be + // redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw + // everything (only happens when redrawing is off for while). type = NOT_VALID; } else { /* |