diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-01 11:38:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-01 11:38:07 -0400 |
| commit | cee19696b648ae8e60b0aadedf884cf17eb09df0 (patch) | |
| tree | 8f40b26754b19ac766387e2e22760ad2a99bbea7 /src/nvim/screen.c | |
| parent | 3d25a72a60323c9d6eab2daf9dbd4920b94b8a94 (diff) | |
| parent | 6e9e8eb38290925a03f75dc8f2b261045c3870e4 (diff) | |
| download | rneovim-cee19696b648ae8e60b0aadedf884cf17eb09df0.tar.gz rneovim-cee19696b648ae8e60b0aadedf884cf17eb09df0.tar.bz2 rneovim-cee19696b648ae8e60b0aadedf884cf17eb09df0.zip | |
Merge pull request #14222 from janlazo/v8.2.2655
vim-patch:8.2.{2655,2656}
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 1e20b77c5c..760a54a316 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -7609,8 +7609,9 @@ void win_new_shellsize(void) static long old_Columns = 0; if (old_Rows != Rows) { - // if 'window' uses the whole screen, keep it using that */ - if (p_window == old_Rows - 1 || old_Rows == 0) { + // If 'window' uses the whole screen, keep it using that. + // Don't change it when set with "-w size" on the command line. + if (p_window == old_Rows - 1 || (old_Rows == 0 && p_window == 0)) { p_window = Rows - 1; } old_Rows = Rows; |