From a3dc7ef44577dc4708ac7b4c329c1620770aadc3 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@bitscope.com>
Date: Wed, 13 Jul 2016 16:49:22 +1000
Subject: vim-patch:7.4.1546

Problem:    Sticky type checking is more annoying than useful.
Solution:   Remove the error for changing a variable type.

https://github.com/vim/vim/commit/f6f32c38bf3319144a84a01a154c8c91939e7acf

Note: There are a bunch of other changes to eval.txt that I believe are
N/A and not related to this patch.
---
 src/nvim/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/version.c')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 966e4f9b4f..e45d61014e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -153,7 +153,7 @@ static int included_patches[] = {
   // 1549,
   // 1548,
   // 1547,
-  // 1546,
+  1546,
   // 1545 NA
   // 1544 NA
   // 1543 NA
-- 
cgit 


From 98fb0f12c4c447b70bbef3004bb1657887537d5c Mon Sep 17 00:00:00 2001
From: Patrick <patrick@bitscope.com>
Date: Wed, 13 Jul 2016 17:56:58 +1000
Subject: vim-patch:7.4.1548

Problem:    Two tests fail.
Solution:   Adjust the expected error number. Remove check for type.

https://github.com/vim/vim/commit/5a2800fd141a8fc0c80cdf421dcb76001a22327f
---
 src/nvim/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/version.c')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index e45d61014e..5fdbb7db57 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -151,7 +151,7 @@ static int included_patches[] = {
   1551,
   1550,
   // 1549,
-  // 1548,
+  1548,
   // 1547,
   1546,
   // 1545 NA
-- 
cgit