From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 2 Nov 2013 23:20:52 +0000 (+0100)
Subject: updated for version 7.4.059
X-Git-Tag: v7.4.059
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9db1293317abd1aca101bf2d35caef0354f66e8b;p=thirdparty%2Fvim.git

updated for version 7.4.059
Problem:    set_last_cursor() may encounter w_buffer being NULL.  (Matt
            Mkaniaris)
Solution:   Check for NULL.
---

diff --git a/src/mark.c b/src/mark.c
index 1ac91d8b1b..9c17f7afb7 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -1374,7 +1374,8 @@ free_jumplist(wp)
 set_last_cursor(win)
     win_T	*win;
 {
-    win->w_buffer->b_last_cursor = win->w_cursor;
+    if (win->w_buffer != NULL)
+	win->w_buffer->b_last_cursor = win->w_cursor;
 }
 
 #if defined(EXITFREE) || defined(PROTO)
diff --git a/src/version.c b/src/version.c
index 1db6ae92d6..2d90185b71 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    59,
 /**/
     58,
 /**/