From a240e3d686fc55798a2af3b93313a78e7c596b31 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Thu, 8 Jan 2015 08:26:00 +0100
Subject: vim-patch:7.4.466

Problem:    CTRL-W } does not open preview window. (Erik Falor)
Solution:   Don't set g_do_tagpreview for CTRL-W }.

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

(limited to 'src')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9b87cbe99a..0224ae82b5 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -272,6 +272,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 ed4a8d8e7a..0b862d2b0c 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.
-- 
cgit 


From bfd2a34570cf93e1b94dd7483a7f02ea12750992 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Thu, 8 Jan 2015 08:56:03 +0100
Subject: version.c: Add patch numbers until 7.4.567.

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

(limited to 'src')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 0224ae82b5..94565d61bd 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
-- 
cgit 


From 65c1e265dd521326649cd46738fcb3451c2820c3 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Thu, 8 Jan 2015 08:28:55 +0100
Subject: vim-patch:7.4.567

Problem:    Non-ascii vertical separater characters are always redrawn.
Solution:   Compare only the one byte that's stored. (Thiago Padilha)

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

(limited to 'src')

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/version.c b/src/nvim/version.c
index 94565d61bd..2810d9b0ee 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -178,7 +178,7 @@ static char *(features[]) = {
 };
 
 static int included_patches[] = {
-  //567,
+  567,
   //566,
   //565,
   //564,
-- 
cgit 


From 869d4c972eebb0b0c75425f005b2681dd9f8268b Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Thu, 8 Jan 2015 09:03:29 +0100
Subject: 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
---
 src/nvim/testdir/test48.in | 5 +++++
 src/nvim/testdir/test48.ok | 1 +
 src/nvim/version.c         | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

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
-- 
cgit