From 35ddcc5bb484d461e6381d9ddbdf0438446f1299 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 16 Aug 2016 21:47:54 -0400
Subject: vim-patch:7.4.1700

Problem:    Equivalence classes are not properly tested.
Solution:   Add tests for multi-byte and latin1. Fix an error. (Owen Leibman)

https://github.com/vim/vim/commit/22e421549d54147d003f6444de007cb1d73f1d27

src/regexp.c changes weren't applied because they're specific to EBCDIC
handling, which has been dropped from nvim.

The latin1-specific tests were also removed since neovim intends to
remove the ability to have 'encoding' set to anything other than utf8.
---
 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 1cb8d128aa..9e3cea069c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -577,7 +577,7 @@ static int included_patches[] = {
   1703,
   // 1702,
   // 1701,
-  // 1700,
+  1700,
   // 1699,
   // 1698 NA
   // 1697,
-- 
cgit 


From c7e6b58012cc5cad8f1cb02876883cad7fcbbdeb Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 16 Aug 2016 16:07:15 -0400
Subject: vim-patch:7.4.2219

Problem:    Recursive call to substitute gets stuck in sandbox. (Nikolai
            Pavlov)
Solution:   Handle the recursive call. (Christian Brabandt, closes vim/vim#950)
            Add a test.

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

Closes #5118
---
 src/nvim/version.c | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9e3cea069c..978bc2e228 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -75,6 +75,7 @@ static char *features[] = {
 
 // clang-format off
 static int included_patches[] = {
+  2219,
   // 2200,
   // 2199,
   // 2198,
-- 
cgit