patch 8.2.1902: default option values changed with :badd for existing buffer

brammool · brammool · commit e974fa7b2b98 · 2020-10-25T15:02:51.000+01:00
Problem:    Default option values are changed when using :badd for an existing
            buffer.
Solution:   When calling buflist_new() pass a zero line number. (closes #7195)
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
@@ -2630,7 +2630,9 @@ do_ecmd(
 	{
 	    if (flags & ECMD_ADDBUF)
 	    {
-		linenr_T	tlnum = 1L;
+		// Default the line number to zero to avoid that a wininfo item
+		// is added for the current window.
+		linenr_T	tlnum = 0;
 
 		if (command != NULL)
 		{
diff --git a/src/testdir/test_buffer.vim b/src/testdir/test_buffer.vim
@@ -362,4 +362,16 @@ func Test_sball_with_count()
   %bw!
 endfunc
 
+func Test_badd_options()
+  new SomeNewBuffer
+  setlocal cole=3
+  wincmd p
+  badd SomeNewBuffer
+  new SomeNewBuffer
+  call assert_equal(3, &cole)
+  close
+  close
+  bwipe! SomeNewBuffer
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1902,
 /**/
     1901,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -2630,7 +2630,9 @@ do_ecmd(`
`2630`	`2630`	`{`
`2631`	`2631`	`if (flags & ECMD_ADDBUF)`
`2632`	`2632`	`{`
`2633`		`- linenr_T tlnum = 1L;`
	`2633`	`+ // Default the line number to zero to avoid that a wininfo item`
	`2634`	`+ // is added for the current window.`
	`2635`	`+ linenr_T tlnum = 0;`
`2634`	`2636`
`2635`	`2637`	`if (command != NULL)`
`2636`	`2638`	`{`