diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-01-27 14:15:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 14:15:08 +0100 |
| commit | 8171e96b9640c54eb67a8e5d1082f1fd6e794f23 (patch) | |
| tree | 7ef2ee67b4328b7e5478a74bfccc6d5ec6eb8d38 /src/nvim/ex_cmds.c | |
| parent | f2398a766e094d74ab19f3037872abbc97c16728 (diff) | |
| parent | de16c0bf6445f92f2b6e92ba3253d581e5562178 (diff) | |
| download | rneovim-8171e96b9640c54eb67a8e5d1082f1fd6e794f23.tar.gz rneovim-8171e96b9640c54eb67a8e5d1082f1fd6e794f23.tar.bz2 rneovim-8171e96b9640c54eb67a8e5d1082f1fd6e794f23.zip | |
Merge pull request #9551 from bfredl/multiterm
Fix :terminal resizing, and some multigrid size cleanup
Diffstat (limited to 'src/nvim/ex_cmds.c')
| -rw-r--r-- | src/nvim/ex_cmds.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index c574ac10e9..abdf411fc3 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -257,7 +257,7 @@ void ex_align(exarg_T *eap) if (width <= 0) width = curbuf->b_p_tw; if (width == 0 && curbuf->b_p_wm > 0) { - width = curwin->w_grid.Columns - curbuf->b_p_wm; + width = curwin->w_width_inner - curbuf->b_p_wm; } if (width <= 0) { width = 80; @@ -2678,6 +2678,10 @@ int do_ecmd( theend: + if (bufref_valid(&old_curbuf) && old_curbuf.br_buf->terminal != NULL) { + terminal_check_size(old_curbuf.br_buf->terminal); + } + if (did_inc_redrawing_disabled) { RedrawingDisabled--; } @@ -2872,11 +2876,11 @@ void ex_z(exarg_T *eap) // Vi compatible: ":z!" uses display height, without a count uses // 'scroll' if (eap->forceit) { - bigness = curwin->w_grid.Rows; + bigness = curwin->w_height_inner; } else if (ONE_WINDOW) { bigness = curwin->w_p_scr * 2; } else { - bigness = curwin->w_grid.Rows - 3; + bigness = curwin->w_height_inner - 3; } if (bigness < 1) { bigness = 1; |