# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1616764503 -3600
# Node ID 1e85e76f9e76900e0fb112209d0fae003ef12ee2
# Parent  dc3e9b290b7e571f5fe89ed47d87bb0f42dd8b56
patch 8.2.2655: The -w command line argument doesn't work

Commit: https://github.com/vim/vim/commit/0a1a6a1aa4004d0e4d64cc375540156b8bd92a87
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Mar 26 14:14:18 2021 +0100

    patch 8.2.2655: The -w command line argument doesn't work

    Problem:    The -w command line argument doesn't work.
    Solution:   Don't set 'window' when set with the -w argument. (closes https://github.com/vim/vim/issues/8011)

diff --git a/src/term.c b/src/term.c
--- a/src/term.c
+++ b/src/term.c
@@ -3365,8 +3365,9 @@ win_new_shellsize(void)
 	ui_new_shellsize();
     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;
 	shell_new_rows();	// update window sizes
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -1045,6 +1045,7 @@ endfunc
 func Test_w_arg()
   " Can't catch the output of gvim.
   CheckNotGui
+
   call writefile(["iVim Editor\<Esc>:q!\<CR>"], 'Xscriptin', 'b')
   if RunVim([], [], '-s Xscriptin -w Xscriptout')
     call assert_equal(["iVim Editor\e:q!\r"], readfile('Xscriptout'))
@@ -1060,6 +1061,14 @@ func Test_w_arg()
     call assert_equal("Cannot open for script output: \"Xdir\"\n", m)
     call delete("Xdir", 'rf')
   endif
+
+  " A number argument sets the 'window' option
+  call writefile(["iwindow \<C-R>=&window\<CR>\<Esc>:wq! Xresult\<CR>"], 'Xscriptin', 'b')
+  if RunVim([], [], '-s Xscriptin -w 17')
+    call assert_equal(["window 17"], readfile('Xresult'))
+    call delete('Xresult')
+  endif
+  call delete('Xscriptin')
 endfunc
 
 " Test for the "-s scriptin" argument
diff --git a/src/version.c b/src/version.c
--- 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 */
 /**/
+    2655,
+/**/
     2654,
 /**/
     2653,