summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-11-03 00:20:52 +0100
committerBram Moolenaar <Bram@vim.org>2013-11-03 00:20:52 +0100
commit9db1293317abd1aca101bf2d35caef0354f66e8b (patch)
tree5acc2a606193cfd6bf87c695881433666dc9900b
parent92c2db8be669b9e5038a5a9b8e02ca8856747d77 (diff)
updated for version 7.4.059v7.4.059
Problem: set_last_cursor() may encounter w_buffer being NULL. (Matt Mkaniaris) Solution: Check for NULL.
-rw-r--r--src/mark.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
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
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 59,
+/**/
58,
/**/
57,