From fc3f23bedfc848cd77f97c62bf4f39a01d46994e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 17 Dec 2014 18:35:42 +0100
Subject: [PATCH] updated for version 7.4.559 Problem:    Appending a block in
 the middle of a tab does not work correctly             when virtualedit is
 set. Solution:   Decrement spaces and count, don't reset them. (James McCoy)

---
 src/ops.c             |  12 ++++++------
 src/testdir/test39.in |   9 ++++++---
 src/testdir/test39.ok | Bin 514 -> 584 bytes
 src/version.c         |   2 ++
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/ops.c b/src/ops.c
index edc84a07aa..0db8c2d25c 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -612,20 +612,20 @@ block_insert(oap, s, b_insert, bdp)
 #ifdef FEAT_MBYTE
 	if (has_mbyte && spaces > 0)
 	{
+	    int off;
+
 	    /* Avoid starting halfway a multi-byte character. */
 	    if (b_insert)
 	    {
-		int off = (*mb_head_off)(oldp, oldp + offset + spaces);
-		spaces -= off;
-		count -= off;
+		off = (*mb_head_off)(oldp, oldp + offset + spaces);
 	    }
 	    else
 	    {
-		int off = (*mb_off_next)(oldp, oldp + offset);
+		off = (*mb_off_next)(oldp, oldp + offset);
 		offset += off;
-		spaces = 0;
-		count = 0;
 	    }
+	    spaces -= off;
+	    count -= off;
 	}
 #endif
 
diff --git a/src/testdir/test39.in b/src/testdir/test39.in
index 410dea61ae..c4e46fff26 100644
--- a/src/testdir/test39.in
+++ b/src/testdir/test39.in
@@ -38,11 +38,14 @@ G$khhhhhkkcmno
 /^C23$/
 :exe ":norm! l\<C-V>j$hhAab\<Esc>"
 :.,/^$/w >> test.out
-:" Test for Visual block insert when virtualedit=all
-:set ve=all
+:" Test for Visual block insert when virtualedit=all and utf-8 encoding
+:set ve=all enc=utf-8
 :/\t\tline
 :exe ":norm! 07l\<C-V>jjIx\<Esc>"
-:set ve=
+:.,/^$/w >> test.out
+:" Test for Visual block append when virtualedit=all
+:exe ":norm! 012l\<C-v>jjAx\<Esc>"
+:set ve= enc=latin1
 :.,/^$/w >> test.out
 :" gUe must uppercase a whole word, also when ß changes to SS
 Gothe youtußeuu endYpk0wgUe
diff --git a/src/testdir/test39.ok b/src/testdir/test39.ok
index d8e901563af492e50b8f70c470fee5678644dc0c..5c517e2223d5c830ca8297b7c8ec71d180777d82 100644
GIT binary patch
delta 75
lcmZo-Il;1lkI`NM0xG~1h|I~%OEu)eDr|%)Jei&GHvnM#5FP*k

delta 11
ScmX@X(!{cXk8yGc;}-xH<OA*i

diff --git a/src/version.c b/src/version.c
index 4efee6ae8c..e2ac04052e 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 */
+/**/
+    559,
 /**/
     558,
 /**/