summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-03-07 13:31:15 +0000
committerBram Moolenaar <Bram@vim.org>2022-03-07 13:31:15 +0000
commit6ca883dd8a585a85acdf9303b434211ea91872a7 (patch)
tree175755e00edbdb06e5394558605cefdf6d209759
parent88dd6523fa86760a8f014ea16c3bb882db9bba07 (diff)
downloadvim-git-6ca883dd8a585a85acdf9303b434211ea91872a7.tar.gz
patch 8.2.4523: when gvim is started maximized the 'window' option isn't setv8.2.4523
Problem: When gvim is started maximized the 'window' option isn't set properly. (Christian J. Robinson) Solution: Check if 'windows' was already set or not. (Ken Takata, closes #9904)
-rw-r--r--src/term.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c
index f131ebff8..14a05de6d 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3380,7 +3380,8 @@ win_new_shellsize(void)
{
// 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))
+ if (p_window == old_Rows - 1
+ || (old_Rows == 0 && !option_was_set((char_u *)"window")))
p_window = Rows - 1;
old_Rows = Rows;
shell_new_rows(); // update window sizes
diff --git a/src/version.c b/src/version.c
index aa027a9dd..a2f9d297f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4523,
+/**/
4522,
/**/
4521,