# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1449934204 -3600
# Node ID 8ab712f2c3b8c5eda019561d8e1205b7257299da
# Parent  f5a4e56976651a5828f04ff382da23081a77a3de
commit https://github.com/vim/vim/commit/9ec021a2b0dd35ba744a8e2a9430a643c85b922a
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Dec 12 16:23:29 2015 +0100

    patch 7.4.970
    Problem:    Rare crash in getvcol(). (Timo Mihaljov)
    Solution:   Check for the buffer being NULL in init_preedit_start_col.
                (Hirohito Higashi, Christian Brabandt)

diff --git a/src/mbyte.c b/src/mbyte.c
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4541,7 +4541,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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    970,
+/**/
     969,
 /**/
     968,