From ea492696cfbb5912b9b42112159a028e24f9e2fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Twupack?= <atwupack@mailbox.org>
Date: Fri, 19 Sep 2014 21:12:47 +0200
Subject: [PATCH] vim-patch:7.4.407

Problem:    Inserting text for Visual block mode, with cursor movement,
            repeats the wrong text. (Aleksandar Ivanov)
Solution:   Reset the update_Insstart_orig flag. (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=v7-4-407
---
 src/nvim/edit.c            |  10 ++++++++--
 src/nvim/testdir/test39.in |   8 ++++++++
 src/nvim/testdir/test39.ok | Bin 481 -> 514 bytes
 src/nvim/version.c         |   2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 3b450e5245..5131dc3b38 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -5610,12 +5610,18 @@ static void spell_back_to_badword(void)
 int stop_arrow(void)
 {
   if (arrow_used) {
+    Insstart = curwin->w_cursor;  //new insertion starts here
+    if (Insstart.col > Insstart_orig.col && !ins_need_undo) {
+      // Don't update the original insert position when moved to the
+      // right, except when nothing was inserted yet.
+      update_Insstart_orig = FALSE;
+    }
+    Insstart_textlen = (colnr_T)linetabsize(get_cursor_line_ptr());
+
     if (u_save_cursor() == OK) {
       arrow_used = FALSE;
       ins_need_undo = FALSE;
     }
-    Insstart = curwin->w_cursor;        /* new insertion starts here */
-    Insstart_textlen = (colnr_T)linetabsize(get_cursor_line_ptr());
     ai_col = 0;
     if (State & VREPLACE_FLAG) {
       orig_line_count = curbuf->b_ml.ml_line_count;
diff --git a/src/nvim/testdir/test39.in b/src/nvim/testdir/test39.in
index c1e1cc49a6..7d1c672522 100644
--- a/src/nvim/testdir/test39.in
+++ b/src/nvim/testdir/test39.in
@@ -23,6 +23,9 @@ G$khhhhhkkcmno
 /^aaaa/
 :exe ":norm! l\<C-V>jjjlllI\<Right>\<Right>  \<Esc>"
 :/^aa/,/^$/w >> test.out
+/xaaa$/
+:exe ":norm! \<C-V>jjjI<>\<Left>p\<Esc>"
+:/xaaa$/,/^$/w >> test.out
 :" Test for Visual block was created with the last <C-v>$
 /^A23$/
 :exe ":norm! l\<C-V>j$Aab\<Esc>"
@@ -77,6 +80,11 @@ bbbbbb
 cccccc
 dddddd
 
+xaaa
+bbbb
+cccc
+dddd
+
 A23
 4567
 
diff --git a/src/nvim/testdir/test39.ok b/src/nvim/testdir/test39.ok
index ef7a2c6442ca8ae973f2ca86e6105214a166180d..d8e901563af492e50b8f70c470fee5678644dc0c 100644
GIT binary patch
delta 39
lcmaFJ+{7|rqKr*}T}5JIA{UTO0s;`73<MxLWn)h$BLE9K4HN(X

delta 10
RcmZo-dB{9r;>Jw@i~tx91V8`)

diff --git a/src/nvim/version.c b/src/nvim/version.c
index f80b2f8a41..1f3e7a7e38 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -188,7 +188,7 @@ static int included_patches[] = {
   //410,
   //409 NA
   //408,
-  //407,
+  407,
   //406,
   //405,
   //404 NA