patch 8.0.0047

brammool · brammool · commit 50e5376926dc · 2016-10-27T14:49:15.000+02:00
Problem:    Crash when using the preview window from an unnamed buffer.
            (lifepillar)
Solution:   Do not clear the wrong buffer. (closes #1200)
diff --git a/src/popupmnu.c b/src/popupmnu.c
@@ -582,7 +582,9 @@ pum_set_selected(int n, int repeat)
 
 	    if (curwin->w_p_pvw)
 	    {
-		if (curbuf->b_fname == NULL
+		if (!resized
+			&& curbuf->b_nwindows == 1
+			&& curbuf->b_fname == NULL
 			&& curbuf->b_p_bt[0] == 'n' && curbuf->b_p_bt[2] == 'f'
 			&& curbuf->b_p_bh[0] == 'w')
 		{
diff --git a/src/version.c b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    47,
 /**/
     46,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,9 @@ pum_set_selected(int n, int repeat)`
`582`	`582`
`583`	`583`	`if (curwin->w_p_pvw)`
`584`	`584`	`{`
`585`		`- if (curbuf->b_fname == NULL`
	`585`	`+ if (!resized`
	`586`	`+ && curbuf->b_nwindows == 1`
	`587`	`+ && curbuf->b_fname == NULL`
`586`	`588`	`&& curbuf->b_p_bt[0] == 'n' && curbuf->b_p_bt[2] == 'f'`
`587`	`589`	`&& curbuf->b_p_bh[0] == 'w')`
`588`	`590`	`{`