Merge remote-tracking branch 'vim/master'

splhack · splhack · commit 974cffa89e09 · 2017-06-21T19:32:09.000-07:00
diff --git a/src/buffer.c b/src/buffer.c
@@ -372,7 +372,7 @@ open_buffer(
 set_bufref(bufref_T *bufref, buf_T *buf)
 {
     bufref->br_buf = buf;
-    bufref->br_fnum = buf->b_fnum;
+    bufref->br_fnum = buf == NULL ? 0 : buf->b_fnum;
     bufref->br_buf_free_count = buf_free_count;
 }
 
diff --git a/src/version.c b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    648,
 /**/
     647,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ open_buffer(`
`372`	`372`	`set_bufref(bufref_T bufref, buf_T buf)`
`373`	`373`	`{`
`374`	`374`	`bufref->br_buf = buf;`
`375`		`- bufref->br_fnum = buf->b_fnum;`
	`375`	`+ bufref->br_fnum = buf == NULL ? 0 : buf->b_fnum;`
`376`	`376`	`bufref->br_buf_free_count = buf_free_count;`
`377`	`377`	`}`
`378`	`378`