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(-)

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 


From 4ef289e761469f0b0bcfc447b4407dab78be473b Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Fri, 23 Jan 2015 13:14:52 +0100
Subject: vim-patch:7.4.517

Problem:    With a wrapping line the cursor may not end up in the right place.
            (Nazri Ramliy)
Solution:   Adjust n_extra for a Tab that wraps. (Christian Brabandt)

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

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 6e4c17f49e..61aa775384 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3444,6 +3444,10 @@ win_line (
               1);
           // TODO: is passing p for start of the line OK?
           n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, NULL) - 1;
+          if (c == TAB && n_extra + col > wp->w_width) {
+            n_extra = (int)wp->w_buffer->b_p_ts
+                      - vcol % (int)wp->w_buffer->b_p_ts - 1;
+          }
           c_extra = ' ';
           if (vim_iswhite(c)) {
             if (c == TAB)
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 230898bddd..b3ec87cd25 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -250,7 +250,7 @@ static int included_patches[] = {
   520,
   //519,
   518,
-  //517,
+  517,
   516,
   //515,
   514,
-- 
cgit 


From b994c5c515060757029e41621dedd9a5a9f7112a Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Fri, 23 Jan 2015 13:17:10 +0100
Subject: vim-patch: Mark 7.4.522, 7.4.591 as NA.

---
 src/nvim/version.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nvim/version.c b/src/nvim/version.c
index b3ec87cd25..3aa8ea911c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -178,6 +178,8 @@ static char *(features[]) = {
 };
 
 static int included_patches[] = {
+  //591 NA
+  //590,
   //589 NA
   //588,
   //587,
@@ -245,7 +247,7 @@ static int included_patches[] = {
   //525,
   //524,
   //523 NA
-  //522,
+  //522 NA
   521,
   520,
   //519,
-- 
cgit