From 51aacc2dea9858228fd387c91d7261b86f0df652 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Fri, 23 Jan 2015 13:13:12 +0100
Subject: vim-patch:7.4.514

Problem:    Memory access error. (Dominique Pelle)
Solution:   Update tpos. (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=v7-4-514
---
 src/nvim/edit.c    | 2 ++
 src/nvim/version.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 03dceaf092..df45f57606 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -5752,6 +5752,8 @@ stop_insert (
       if (curwin->w_cursor.lnum != tpos.lnum)
         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/nvim/version.c b/src/nvim/version.c
index b0bd38b7de..230898bddd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -253,7 +253,7 @@ static int included_patches[] = {
   //517,
   516,
   //515,
-  //514,
+  514,
   513,
   //512 NA
   //511 NA
-- 
cgit