vim-patch:7.4.563

Problem:    No test for replacing on a tab in Virtual replace mode.
Solution:   Add a test. (Elias Diem)

https://code.google.com/p/vim/source/detail?r=v7-4-563

3 files changed, 7 insertions, 1 deletions

diff --git a/src/nvim/testdir/test48.in b/src/nvim/testdir/test48.in
index 25ea2fa154..998e1bba00 100644
--- a/src/nvim/testdir/test48.in
+++ b/src/nvim/testdir/test48.in
@@ -44,6 +44,10 @@ $4lDi<-- 'D' should be intact
 /^"r"
 $5lrxa<-- should be 'x'
 :"
+:" Test "r" on a tab
+:" Note that for this test, 'ts' must be 8 (the default).
+^5lrxA<-- should be '  x  '
+:"
 :"   Test to make sure 'x' can delete control characters
 :set display=uhex
 ^xxxxxxi[This line should contain only the text between the brackets.]
@@ -72,6 +76,7 @@ this is a test
 this is a test
 this is a test
 "r"
+"r"	
 ab
sd
 abcv6efi.him0kl
 
diff --git a/src/nvim/testdir/test48.ok b/src/nvim/testdir/test48.ok
index 334cb5a29c..14cd9b12ec 100644
--- a/src/nvim/testdir/test48.ok
+++ b/src/nvim/testdir/test48.ok
@@ -12,6 +12,7 @@ this is a test
 this is a test
 this is a test
 "r"    x<-- should be 'x'
+"r"  x  <-- should be '  x  '
 [This line should contain only the text between the brackets.]
    v   i   m   <-- should show the name of a noted text editor
     6   .   0   <-- and its version number
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 2810d9b0ee..3e214bfd30 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -182,7 +182,7 @@ static int included_patches[] = {
   //566,
   //565,
   //564,
-  //563,
+  563,
   //562,
   //561,
   //560 NA