From bc306ab5aa0d2ee7a4653cb1d47615a3f04478a1 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 25 May 2016 16:59:52 -0400
Subject: vim-patch:7.4.1096

Problem:    Need several lines to verify a command produces an error.
Solution:   Add assert_fails(). (suggested by Nikolay Pavlov)
            Make the quickfix alloc test actually work.

https://github.com/vim/vim/commit/a260b87d9da17f605666630f18c1ed909c2b8bae
---
 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 d34df421f3..7400385d2d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -590,7 +590,7 @@ static int included_patches[] = {
   // 1099 NA
   // 1098 NA
   // 1097,
-  // 1096,
+  1096,
   // 1095 NA
   // 1094,
   1093,
-- 
cgit 


From ccef5c9c77543fb0cf1b31c82fcb566cca7eff4c Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 25 May 2016 17:13:23 -0400
Subject: vim-patch:7.4.1567

Problem:    Crash in assert_fails().
Solution:   Check for NULL. (Dominique Pelle)  Add a test.

https://github.com/vim/vim/commit/1abb502635c7f317e05a0cf3ea067101f9d684f5
---
 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 7400385d2d..e66bf44846 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -119,7 +119,7 @@ static int included_patches[] = {
   1570,
   1569,
   1568,
-  // 1567,
+  1567,
   // 1566 NA
   // 1565,
   // 1564,
-- 
cgit