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/window.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/window.c')
-rw-r--r-- | src/nvim/window.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index c2d0a9b3b1..2d64409a1c 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -3747,7 +3747,9 @@ static void win_enter_ext(win_T *wp, bool undo_sync, int curwin_invalid, do_autochdir(); if (curbuf->terminal) { - terminal_resize(curbuf->terminal, curwin->w_width, curwin->w_height); + terminal_resize(curbuf->terminal, + (uint16_t)(MAX(0, curwin->w_width - win_col_off(curwin))), + (uint16_t)curwin->w_height); } } @@ -4946,7 +4948,9 @@ void win_new_width(win_T *wp, int width) if (wp->w_buffer->terminal) { if (wp->w_height != 0) { - terminal_resize(wp->w_buffer->terminal, wp->w_width, 0); + terminal_resize(wp->w_buffer->terminal, + (uint16_t)(MAX(0, curwin->w_width - win_col_off(curwin))), + 0); } } } |