From 521e45f2a8c0619335288accdda0f0aaa1fc6513 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Mon, 24 Oct 2016 23:53:07 -0700
Subject: vim-patch:7.4.1559

Problem:    Passing cookie to a callback is clumsy.
Solution:   Change function() to take arguments and return a partial.

https://github.com/vim/vim/commit/1735bc988c546cc962c5f94792815b4d7cb79710
---
 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 348bf3c014..aac3ba44a2 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -883,7 +883,7 @@ static int included_patches[] = {
   // 1562 NA
   // 1561 NA
   // 1560 NA
-  // 1559,
+  1559,
   1558,
   1557,
   // 1556 NA
-- 
cgit 


From 66922d89cce6ee381244d37f7c0c324cae815b45 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Tue, 25 Oct 2016 22:48:08 -0700
Subject: vim-patch:7.4.1563

Problem:    Partial test fails on windows.
Solution:   Return 1 or -1 from compare function.

https://github.com/vim/vim/commit/790500a8e65bee295ef51a59dfa67ecbaab8ea17
---
 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 aac3ba44a2..feb83e495a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -879,7 +879,7 @@ static int included_patches[] = {
   // 1566 NA
   1565,
   // 1564,
-  // 1563,
+  1563,
   // 1562 NA
   // 1561 NA
   // 1560 NA
-- 
cgit 


From f90551b0e67c1389cb91dfedbe9a111c677e67e2 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Tue, 25 Oct 2016 23:03:04 -0700
Subject: vim-patch:7.4.1564

Problem:    An empty list in function() causes an error.
Solution:   Handle an empty list like there is no list of arguments.

https://github.com/vim/vim/commit/346418c624f1bc7c04c98907134a2b284e6452dd
---
 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 feb83e495a..66adaaff1e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -878,7 +878,7 @@ static int included_patches[] = {
   1567,
   // 1566 NA
   1565,
-  // 1564,
+  1564,
   1563,
   // 1562 NA
   // 1561 NA
-- 
cgit 


From 529482d6844474f6eab9feed5162008b652fd931 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Wed, 26 Oct 2016 12:23:49 -0700
Subject: vim-patch:7.4.1577

Problem:    Cannot pass "dict.Myfunc" around as a partial.
Solution:   Create a partial when expected.

https://github.com/vim/vim/commit/ab1fa3955f25dfdb7e329c3bd76e175c93c8cb5e
---
 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 66adaaff1e..4de8296ccd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -865,7 +865,7 @@ static int included_patches[] = {
   // 1580,
   // 1579 NA
   1578,
-  // 1577,
+  1577,
   1576,
   // 1575 NA
   1574,
-- 
cgit 


From 2c1b4c7f3c13b61dab70d6ad3507b90c7a60e4aa Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Wed, 26 Oct 2016 12:26:06 -0700
Subject: vim-patch:7.4.1580

Problem:    Crash when using function reference. (Luchr)
Solution:   Set initial refcount. (Ken Takata)

https://github.com/vim/vim/commit/7a5c46a9df7ef01a4f6a620861c35400d5ad28d9
---
 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 4de8296ccd..9964f92132 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -862,7 +862,7 @@ static int included_patches[] = {
   // 1583 NA
   // 1582,
   // 1581,
-  // 1580,
+  1580,
   // 1579 NA
   1578,
   1577,
-- 
cgit 


From 5cf0c99755581f789973a4fa4bb3d95a61a01341 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Wed, 26 Oct 2016 12:42:15 -0700
Subject: vim-patch:7.4.1581

Problem:    Using ":call dict.func()" where the function is a partial does
            not work.  Using "dict.func()" where the function does not take a
            Dictionary does not work.
Solution:   Handle partial properly in ":call". (Yasuhiro Matsumoto)

https://github.com/vim/vim/commit/65639032bb7b17996cd255d1508a1df4ad528a1f
---
 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 9964f92132..5d35c0fa76 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -861,7 +861,7 @@ static int included_patches[] = {
   // 1584 NA
   // 1583 NA
   // 1582,
-  // 1581,
+  1581,
   1580,
   // 1579 NA
   1578,
-- 
cgit 


From e2258598cacebf3c90bbb8e13789194c417d8dad Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Wed, 26 Oct 2016 21:40:40 -0700
Subject: vim-patch:7.4.1582

Problem:    Get E923 when using function(dict.func, [], dict). (Kent Sibilev)
            Storing a function with a dict in a variable drops the dict if the
            function is script-local.
Solution:   Translate the function name.  Use dict arg if present.

https://github.com/vim/vim/commit/6f2e4b36c9d9908e1cace2b1b96e2c154a837bc2
---
 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 5d35c0fa76..9f3bf74a99 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -860,7 +860,7 @@ static int included_patches[] = {
   // 1585,
   // 1584 NA
   // 1583 NA
-  // 1582,
+  1582,
   1581,
   1580,
   // 1579 NA
-- 
cgit 


From 27b2fb944a4b9bce0f06e7c1f2267949c8edab06 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Wed, 26 Oct 2016 21:44:57 -0700
Subject: vim-patch:7.4.1585

Problem:    Partial is not recognized everywhere.
Solution:   Check for partial in trans_function_name(). (Yasuhiro Matsumoto)
            Add a test.

https://github.com/vim/vim/commit/d22a18928ebcb465393da1418bb88204b97badb1
---
 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 9f3bf74a99..e6be91e2fd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -857,7 +857,7 @@ static int included_patches[] = {
   1588,
   // 1587 NA
   // 1586,
-  // 1585,
+  1585,
   // 1584 NA
   // 1583 NA
   1582,
-- 
cgit 


From cf2701b269a0fd1490da4296774b9fe426100640 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Wed, 26 Oct 2016 21:56:02 -0700
Subject: vim-patch:7.4.1586

Problem:    Nesting partials doesn't work.
Solution:   Append arguments. (Ken Takata)

https://github.com/vim/vim/commit/8a1bb046378f4bc68d6a04af2eab80fb3ce04da6
---
 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 e6be91e2fd..da9387c14d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -856,7 +856,7 @@ static int included_patches[] = {
   // 1589,
   1588,
   // 1587 NA
-  // 1586,
+  1586,
   1585,
   // 1584 NA
   // 1583 NA
-- 
cgit 


From 531249a4acdef36ed44e8bbf1355f2a80a5792a5 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Thu, 27 Oct 2016 13:48:32 -0700
Subject: vim-patch:7.4.1589

Problem:    Combining dict and args with partial doesn't always work.
Solution:   Use the arguments from the partial.

https://github.com/vim/vim/commit/9e63f61cb01c70fd71652f54b2d01ee27b2a3534
---
 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 da9387c14d..24fe2ecd9e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -853,7 +853,7 @@ static int included_patches[] = {
   1592,
   1591,
   // 1590,
-  // 1589,
+  1589,
   1588,
   // 1587 NA
   1586,
-- 
cgit 


From 86706011a67efb3e248691bf2391355d0e0e7d50 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Thu, 27 Oct 2016 13:51:04 -0700
Subject: vim-patch:7.4.1590

Problem:    Warning for shadowed variable. (Christian Brabandt)
Solution:   Move the variable into a local block.

https://github.com/vim/vim/commit/3f242a844e83a5a04943869f6e3bcbf8650dc465
---
 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 24fe2ecd9e..fe03b6915b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -852,7 +852,7 @@ static int included_patches[] = {
   // 1593 NA
   1592,
   1591,
-  // 1590,
+  1590,
   1589,
   1588,
   // 1587 NA
-- 
cgit 


From 34a7814219b835e8d552cac890ccdf67aad65b2a Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Wed, 26 Oct 2016 22:50:07 -0700
Subject: vim-patch:7.4.1605

Problem:    Catching exception that won't be thrown.
Solution:   Remove try/catch.

https://github.com/vim/vim/commit/3905e291fe4375ca5c59efa9ffcb01a39c7be3a9
---
 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 fe03b6915b..2e711797f4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -837,7 +837,7 @@ static int included_patches[] = {
   // 1608,
   // 1607,
   // 1606,
-  // 1605,
+  1605,
   1604,
   1603,
   // 1602 NA
-- 
cgit 


From 5241ca7d7a8c3a08af8bbfbf7cca3381241a915b Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Thu, 27 Oct 2016 13:53:53 -0700
Subject: vim-patch:7.4.1606

Problem:    Having type() handle a Funcref that is or isn't a partial
            differently causes problems for existing scripts.
Solution:   Make type() return the same value. (Thinca)

https://github.com/vim/vim/commit/953cc7fb139dc2ba8590f8b03a095b63f4e1208f
---
 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 2e711797f4..a3df79d0c3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -836,7 +836,7 @@ static int included_patches[] = {
   // 1609 NA
   // 1608,
   // 1607,
-  // 1606,
+  1606,
   1605,
   1604,
   1603,
-- 
cgit 


From 3213b28c01313c7f0e7e0e01f72a0fbfef85fa3e Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Thu, 27 Oct 2016 14:05:27 -0700
Subject: vim-patch:7.4.1607

Problem:    Comparing a function that exists on two dicts is not backwards
            compatible. (Thinca)
Solution:   Only compare the function, not what the partial adds.

https://github.com/vim/vim/commit/f0e86a0dbddc18568910e9e4aaae0cd88ca8087a
---
 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 a3df79d0c3..442598c643 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -835,7 +835,7 @@ static int included_patches[] = {
   // 1610 NA
   // 1609 NA
   // 1608,
-  // 1607,
+  1607,
   1606,
   1605,
   1604,
-- 
cgit 


From bae31b764a5607fad5d914f271e93e10c2d0bfbe Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Fri, 28 Oct 2016 22:44:42 -0700
Subject: vim-patch:7.4.1608

Problem:    string() doesn't handle a partial.
Solution:   Make a string from a partial.

https://github.com/vim/vim/commit/5c29154b521e9948190be653cfda666ecbb63b5b
---
 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 442598c643..6bf99ca410 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -834,7 +834,7 @@ static int included_patches[] = {
   // 1611 NA
   // 1610 NA
   // 1609 NA
-  // 1608,
+  1608,
   1607,
   1606,
   1605,
-- 
cgit 


From 1945013eb7d6c37aa58486ceb74e04c79bb4a7b9 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Thu, 27 Oct 2016 15:19:26 -0700
Subject: vim-patch:7.4.1638

Problem:    When binding a function to a dict the reference count is wrong.
Solution:   Decrement dict reference count, only reference the function when
            actually making a copy. (Ken Takata)

https://github.com/vim/vim/commit/e4eb6ff089e79e659acf33c17dd0fda7177de526
---
 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 6bf99ca410..14042a8d38 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -804,7 +804,7 @@ static int included_patches[] = {
   1641,
   1640,
   // 1639,
-  // 1638,
+  1638,
   // 1637 NA
   // 1636 NA
   // 1635 NA
-- 
cgit 


From 9d91218213b4a4a8cdb64a35e19a3a7c68dc99d0 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Thu, 27 Oct 2016 15:30:23 -0700
Subject: vim-patch:7.4.1639

Problem:    Invoking garbage collection may cause a double free.
Solution:   Don't free the dict in a partial when recursive is FALSE.

https://github.com/vim/vim/commit/5f436fcf9960c95702820d5ac1b8b612995f6c04
---
 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 14042a8d38..9efb8848cc 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -803,7 +803,7 @@ static int included_patches[] = {
   1642,
   1641,
   1640,
-  // 1639,
+  1639,
   1638,
   // 1637 NA
   // 1636 NA
-- 
cgit 


From 04f328f1ae7151e559b3c39cb2fce6575f2a3ebb Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Tue, 6 Dec 2016 22:44:21 -0700
Subject: vim-patch:7.4.1644 Mark as NA

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

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9efb8848cc..197c12367c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -797,8 +797,8 @@ static int included_patches[] = {
   1648,
   1647,
   // 1646 NA
-  // 1645,
-  // 1644,
+  1645,
+  // 1644 NA
   1643,
   1642,
   1641,
-- 
cgit 


From 0645787741252ba7ad980a47af8db5d37685beae Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Fri, 28 Oct 2016 12:24:03 -0700
Subject: vim-patch:7.4.1715

Problem:    Double free when a partial is in a cycle with a list or dict.
            (Nikolai Pavlov)
Solution:   Do not free a nested list or dict used by the partial.

https://github.com/vim/vim/commit/ddecc25947dbdd689d5bcaed32f298a08abdd497
---
 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 197c12367c..ac45e2caad 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -727,7 +727,7 @@ static int included_patches[] = {
   // 1718,
   // 1717 NA
   1716,
-  // 1715,
+  1715,
   1714,
   // 1713 NA
   1712,
-- 
cgit 


From e97e24c77e70ec8bdaca51b0b477ca0c38ea35e0 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Sat, 26 Nov 2016 16:00:24 -0700
Subject: vim-patch:7.4.1718

Problem:    Coverity: not using return value of set_ref_in_item().
Solution:   Use the return value.

https://github.com/vim/vim/commit/d56374e25df0b317b01423a01f158157faa647fa
---
 src/nvim/version.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index ac45e2caad..00e2bfac91 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -723,8 +723,8 @@ static int included_patches[] = {
   // 1722 NA
   // 1721 NA
   // 1720,
-  // 1719,
-  // 1718,
+  1719,
+  1718,
   // 1717 NA
   1716,
   1715,
-- 
cgit 


From eb337c9949d679eeb9f0995963c639fdf7772fd4 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Sat, 26 Nov 2016 16:09:40 -0700
Subject: vim-patch:7.4.1720 Mark as NA

---
 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 00e2bfac91..f091b12810 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -722,7 +722,7 @@ static int included_patches[] = {
   1723,
   // 1722 NA
   // 1721 NA
-  // 1720,
+  // 1720 NA
   1719,
   1718,
   // 1717 NA
-- 
cgit 


From c82dc7a6fd4987fee72320133579b008815b28d1 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Fri, 28 Oct 2016 12:38:36 -0700
Subject: vim-patch:7.4.1836

Problem:    When using a partial on a dictionary it always gets bound to that
            dictionary.
Solution:   Make a difference between binding a function to a dictionary
            explicitly or automatically.

https://github.com/vim/vim/commit/1d429610bf9e99a6252be8abbc910d6667e4d1da
---
 src/nvim/version.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index f091b12810..88c0185f57 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -604,9 +604,8 @@ static int included_patches[] = {
   // 1839,
   // 1838,
   // 1837,
-  // 1836,
+  1836,
   1835,
-  // 1834,
   1833,
   1832,
   1831,
-- 
cgit 


From c52856af2c5f3b12b89671d91c35689fb2f84a70 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Fri, 28 Oct 2016 22:58:11 -0700
Subject: vim-patch:7.4.1842

Problem:    get() works for Partial but not for Funcref.
Solution:   Accept Funcref.  Also return the function itself. (Nikolai Pavlov)

https://github.com/vim/vim/commit/03e19a04ac2ca55643663b97b6ab94043233dcbd
---
 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 88c0185f57..e391c61c23 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -598,7 +598,7 @@ static int included_patches[] = {
   // 1845 NA
   // 1844,
   // 1843 NA
-  // 1842,
+  1842,
   // 1841,
   1840,
   // 1839,
-- 
cgit 


From 537cee4883a00bc3dd8ac3524c8f704a372bdcc8 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Wed, 2 Nov 2016 22:11:25 -0700
Subject: vim-patch:7.4.1860

Problem:    Using a partial for timer_start() may cause a crash.
Solution:   Set the copyID in timer objects. (Ozaki Kiichi)

https://github.com/vim/vim/commit/e3188e261569ae512fb1ae2653b57fdd9e259ca3
---
 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 e391c61c23..296952e45c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -580,7 +580,7 @@ static int included_patches[] = {
   // 1863 NA
   // 1862,
   // 1861,
-  // 1860 NA
+  1860,
   // 1859 NA
   // 1858 NA
   // 1857 NA
-- 
cgit 


From b42347da45933a2d1ed54e9ca65db37f50d3e8be Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Tue, 6 Dec 2016 22:47:40 -0700
Subject: vim-patch:7.4.1862 Mark as NA

---
 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 296952e45c..f42000c6c0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -578,7 +578,7 @@ static int included_patches[] = {
   // 1865 NA
   // 1864 NA
   // 1863 NA
-  // 1862,
+  // 1862 NA
   // 1861,
   1860,
   // 1859 NA
-- 
cgit 


From 6c5dd6827f5d1347cdf90f8a2f76d6a732e93931 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Sat, 29 Oct 2016 12:02:58 -0700
Subject: vim-patch:7.4.1875

Problem:    Comparing functions and partials doesn't work well.
Solution:   Add tests. (Nikolai Pavlov)  Compare the dict and arguments in the
            partial.

https://github.com/vim/vim/commit/8e759ba8651428995b338b66c615367259f79766
---
 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 f42000c6c0..4d17832638 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -565,7 +565,7 @@ static int included_patches[] = {
   // 1878 NA
   // 1877 NA
   // 1876,
-  // 1875,
+  1875,
   // 1874 NA
   // 1873 NA
   // 1872 NA
-- 
cgit 


From 2c4e92abea2244e033be0c7534685485cfb5ddc9 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Thu, 3 Nov 2016 12:09:22 -0700
Subject: vim-patch:7.4.1731 Mark as NA

Leave a note in vim_diff.txt about it.
---
 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 4d17832638..7de0b508a3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -710,7 +710,7 @@ static int included_patches[] = {
   1734,
   // 1733 NA
   1732,
-  // 1731,
+  // 1731 NA
   1730,
   // 1729 NA
   1728,
-- 
cgit