thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.0g01

Browse Source
This commit is contained in:
Bram Moolenaar
2006-05-02 22:08:30 +00:00
parent c9b4b05b35
commit d68071d8da
45 changed files with 668 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/option.c
View File

@@ -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;
}