Merge remote-tracking branch 'vim/master'

splhack · splhack · commit 01672932c65b · 2015-12-12T20:57:10.000-08:00
diff --git a/src/mbyte.c b/src/mbyte.c
@@ -4552,7 +4552,7 @@ init_preedit_start_col(void)
 {
     if (State & CMDLINE)
 	preedit_start_col = cmdline_getvcol_cursor();
-    else if (curwin != NULL)
+    else if (curwin != NULL && curwin->w_buffer != NULL)
 	getvcol(curwin, &curwin->w_cursor, &preedit_start_col, NULL, NULL);
     /* Prevent that preediting marks the buffer as changed. */
     xim_changed_while_preediting = curbuf->b_changed;
diff --git a/src/version.c b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    970,
 /**/
     969,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -4552,7 +4552,7 @@ init_preedit_start_col(void)`
`4552`	`4552`	`{`
`4553`	`4553`	`if (State & CMDLINE)`
`4554`	`4554`	`preedit_start_col = cmdline_getvcol_cursor();`
`4555`		`- else if (curwin != NULL)`
	`4555`	`+ else if (curwin != NULL && curwin->w_buffer != NULL)`
`4556`	`4556`	`getvcol(curwin, &curwin->w_cursor, &preedit_start_col, NULL, NULL);`
`4557`	`4557`	`/* Prevent that preediting marks the buffer as changed. */`
`4558`	`4558`	`xim_changed_while_preediting = curbuf->b_changed;`