From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 12 Nov 2014 17:59:25 +0000 (+0100)
Subject: updated for version 7.4.514
X-Git-Tag: v7.4.514
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef6875be7a0b4dde9589e69b0a0229c4b976c45b;p=thirdparty%2Fvim.git

updated for version 7.4.514
Problem:    Memory access error. (Dominique Pelle)
Solution:   Update tpos. (Christian Brabandt)
---

diff --git a/src/edit.c b/src/edit.c
index ee63daa1c7..13faafeb78 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -6918,6 +6918,8 @@ stop_insert(end_insert_pos, esc, nomove)
 		curwin->w_cursor = tpos;
 	    else
 	    {
+		/* reset tpos, could have been invalidated in the loop above */
+		tpos = curwin->w_cursor;
 		tpos.col++;
 		if (cc != NUL && gchar_pos(&tpos) == NUL)
 		    ++curwin->w_cursor.col;	/* put cursor back on the NUL */
diff --git a/src/version.c b/src/version.c
index df18f5e962..5ca2f2723c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    514,
 /**/
     513,
 /**/