5 files changed, 19 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 855c09619e..52ded0aa49 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -4548,7 +4548,7 @@ static void screen_line(int row, int coloff, int endcol, int clear_width, int rl
       int c;
 
       c = fillchar_vsep(&hl);
-      if (ScreenLines[off_to] != c
+      if (ScreenLines[off_to] != (schar_T)c
           || (enc_utf8 && (int)ScreenLinesUC[off_to]
               != (c >= 0x80 ? c : 0))
           || ScreenAttrs[off_to] != hl) {
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 9b87cbe99a..3e214bfd30 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -178,6 +178,13 @@ static char *(features[]) = {
 };
 
 static int included_patches[] = {
+  567,
+  //566,
+  //565,
+  //564,
+  563,
+  //562,
+  //561,
   //560 NA
   559,
   //558 NA
@@ -272,6 +279,7 @@ static int included_patches[] = {
   //469 NA
   468,
   467,
+  466,
   //465 NA
   //464 NA
   463,
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 0e336e8cbe..f9190e6915 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -371,7 +371,10 @@ newwindow:
       postponed_split = Prenum;
     else
       postponed_split = -1;
-    g_do_tagpreview = 0;
+
+    if (nchar != '}') {
+      g_do_tagpreview = 0;
+    }
 
     // Execute the command right here, required when
     // "wincmd ]" was used in a function.