From 7231438f124eff0ce0b9a8998ac7838abc094a8b Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 12 Nov 2016 08:06:58 -0500
Subject: vim-patch:7.4.1640

Problem:    Crash when an autocommand changes a quickfix list. (Dominique)
Solution:   Check wether an entry is still valid. (Yegappan Lakshmanan,
            Hirohito Higashi)

https://github.com/vim/vim/commit/ffec3c53496d49668669deabc0724ec78e2274fd
---
 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 7721e9dc8c..69438c50d0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -804,7 +804,7 @@ static int included_patches[] = {
   1643,
   1642,
   1641,
-  // 1640,
+  1640,
   // 1639,
   // 1638,
   // 1637 NA
-- 
cgit 


From caa33aaaf8b044cf3a8311213d0841d2d9e591a5 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 12 Nov 2016 14:18:29 -0500
Subject: vim-patch:7.4.1647

Problem:    Using freed memory after setqflist() and ":caddbuffer".  (Dominique)
Solution:   Set qf_ptr when adding the first item to the quickfix list.

https://github.com/vim/vim/commit/8b20179c657b4266dff115486ca68c6a50324071
---
 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 69438c50d0..7e88672e69 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -797,7 +797,7 @@ static int included_patches[] = {
   // 1650,
   1649,
   1648,
-  // 1647,
+  1647,
   // 1646 NA
   // 1645,
   // 1644,
-- 
cgit 


From 830bf8665b6a98705b16d977ca7d11c2ca51dca8 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 12 Nov 2016 15:45:10 -0500
Subject: vim-patch:7.4.1650

Problem:    Quickfix test fails.
Solution:   Accept any number of matches.

https://github.com/vim/vim/commit/f68f1d70799631d38461c36cd59d08cf839b010d
---
 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 7e88672e69..b286f03301 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -794,7 +794,7 @@ static int included_patches[] = {
   // 1653 NA
   1652,
   // 1651 NA
-  // 1650,
+  1650,
   1649,
   1648,
   1647,
-- 
cgit 


From 2e5736e2cd4ef14ec23c1e0176fbcb17c9f55eba Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 12 Nov 2016 15:58:19 -0500
Subject: vim-patch:7.4.1664

Problem:    Crash in :cgetexpr.
Solution:   Check for NULL pointer. (Dominique) Add a test.

https://github.com/vim/vim/commit/89c64d557dbe0bacfdd7b2872411b00cc1523d85
---
 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 b286f03301..d0b802418d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -780,7 +780,7 @@ static int included_patches[] = {
   // 1667 NA
   // 1666 NA
   // 1665 NA
-  // 1664,
+  1664,
   1663,
   // 1662 NA
   // 1661 NA
-- 
cgit 


From 4e66bc99e4b08d518a9ad0692ee8409a90ffb0ff Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 12 Nov 2016 16:07:02 -0500
Subject: Mark 7.4.1697 as applied

The patch was merged in 9e1c6596 but version.c didn't get updated
accordingly.
---
 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 d0b802418d..01823ce96e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -747,7 +747,7 @@ static int included_patches[] = {
   1700,
   // 1699,
   // 1698 NA
-  // 1697,
+  1697,
   // 1696,
   1695,
   // 1694 NA
-- 
cgit