summaryrefslogtreecommitdiffstats
path: root/src/option.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/option.c')
-rw-r--r--src/option.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/option.c b/src/option.c
index c13412438f..8d5dcacb66 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3548,8 +3548,7 @@ set_init_2()
* 'window' is only for backwards compatibility with Vi.
* Default is Rows - 1.
*/
- idx = findoption((char_u *)"wi");
- if (idx >= 0 && !(options[idx].flags & P_WAS_SET))
+ if (!option_was_set((char_u *)"window"))
p_window = Rows - 1;
set_number_default("window", Rows - 1);
@@ -7904,7 +7903,7 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags)
if (cmdline_row > Rows - p_ch && Rows > p_ch)
cmdline_row = Rows - p_ch;
}
- if (p_window >= Rows)
+ if (p_window >= Rows || !option_was_set((char_u *)"window"))
p_window = Rows - 1;
}