From e902a172ef1a58e93eeae0919bddb3578a2142a2 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 25 Apr 2016 23:07:51 -0400
Subject: vim-patch:7.4.1384

Problem:    It is not easy to use a set of plugins and their dependencies.
Solution:   Add packages, ":loadopt", 'packpath'.

https://github.com/vim/vim/commit/f6fee0e2d4341c0c2f5339c1268e5877fafd07cf
---
 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 278255c904..95f924d6a1 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -311,7 +311,7 @@ static int included_patches[] = {
   // 1387 NA
   // 1386 NA
   // 1385 NA
-  // 1384,
+  1384,
   // 1383 NA
   // 1382 NA
   // 1381 NA
-- 
cgit 


From bca53fdca0cbcbfc28f3d016494b65925e8081bd Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 26 Apr 2016 00:18:32 -0400
Subject: vim-patch:7.4.1388

Problem:    Compiler warning. (Cesar Romani)
Solution:   Initialize variable.

https://github.com/vim/vim/commit/bdcd75275002c3b74015bb9bc0a01b13bb6107d4
---
 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 95f924d6a1..9b8dac43bc 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -307,7 +307,7 @@ static int included_patches[] = {
   // 1391 NA
   // 1390 NA
   // 1389 NA
-  // 1388,
+  1388,
   // 1387 NA
   // 1386 NA
   // 1385 NA
-- 
cgit 


From 562b17260fb1eafe5e49412997bc81de29d24ccb Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 26 Apr 2016 00:21:39 -0400
Subject: vim-patch:7.4.1396

Problem:    Compiler warnings for conversions.
Solution:   Add type cast.

https://github.com/vim/vim/commit/1daae446e58fd90f98c51ff3af8f54bfa5197751
---
 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 9b8dac43bc..c546bc0d19 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -299,7 +299,7 @@ static int included_patches[] = {
   // 1399 NA
   // 1398 NA
   1397,
-  // 1396,
+  1396,
   // 1395 NA
   1394,
   // 1393 NA
-- 
cgit 


From 9dc621e77deded9d7fe8ca478a17443da50b88ef Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 26 Apr 2016 00:24:25 -0400
Subject: vim-patch:7.4.1478

Problem:    ":loadplugin" doesn't take care of ftdetect files.
Solution:   Also load ftdetect scripts when appropriate.

https://github.com/vim/vim/commit/1bdd42627d619258d0e847f217cfc1c2795f1ac5
---
 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 c546bc0d19..896bf47a53 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -217,7 +217,7 @@ static int included_patches[] = {
   // 1481 NA
   // 1480,
   // 1479,
-  // 1478,
+  1478,
   // 1477,
   // 1476 NA
   // 1475 NA
-- 
cgit 


From d43ac790f2454e2173eb645bdcd97c7a7c7e4846 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 28 Apr 2016 19:23:15 -0400
Subject: vim-patch:7.4.1479

Problem:    No testfor ":loadplugin".
Solution:   Add a test.  Fix how option is being set.

https://github.com/vim/vim/commit/863c1a9079fa340d663ccafb011729a29186d73e
---
 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 896bf47a53..da717b9319 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -216,7 +216,7 @@ static int included_patches[] = {
   // 1482 NA
   // 1481 NA
   // 1480,
-  // 1479,
+  1479,
   1478,
   // 1477,
   // 1476 NA
-- 
cgit 


From 67d8e586318a3f2f13df22f9a3b25c6d8a109e6c Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 28 Apr 2016 20:47:27 -0400
Subject: vim-patch:7.4.1480

Problem:    Cannot add a pack direcory without loading a plugin.
Solution:   Add the :packadd command.

https://github.com/vim/vim/commit/91715873d19a1859c08eeded7848113596e2f2bd
---
 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 da717b9319..4320190592 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -215,7 +215,7 @@ static int included_patches[] = {
   // 1483 NA
   // 1482 NA
   // 1481 NA
-  // 1480,
+  1480,
   1479,
   1478,
   // 1477,
-- 
cgit 


From 2f72f34f0407dcdf189bb4f3a4b79b51e96744bf Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 28 Apr 2016 22:58:24 -0400
Subject: vim-patch:7.4.1486

Problem:    ":loadplugin" is not optimal, some people find it confusing.
Solution:   Only use ":packadd" with an optional "!".

https://github.com/vim/vim/commit/f3654827368e6204608036353a0360e9e7c21e02
---
 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 4320190592..569a755429 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -209,7 +209,7 @@ static int included_patches[] = {
   // 1489 NA
   // 1488 NA
   // 1487 NA
-  // 1486,
+  1486,
   // 1485 NA
   // 1484 NA
   // 1483 NA
-- 
cgit 


From 85e539c99609cec0b5a0eab3aded394d0bbab555 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 2 May 2016 21:15:57 -0400
Subject: vim-patch:7.4.1492

Problem:    No command line completion for ":packadd".
Solution:   Implement completion. (Hirohito Higashi)

https://github.com/vim/vim/commit/35ca0e7a1cb6e6daef8e0052a8437801226cef19
---
 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 569a755429..36f9fecf64 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -203,7 +203,7 @@ static int included_patches[] = {
   // 1495 NA
   // 1494,
   // 1493 NA
-  // 1492,
+  1492,
   // 1491,
   // 1490 NA
   // 1489 NA
-- 
cgit 


From 8ecdc571b0cf679c5195088d140f2988bcbe87e1 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 20 Jun 2016 10:12:07 -0400
Subject: vim-patch:7.4.1499

Problem:    No error message when :packadd does not find anything.
Solution:   Add an error message. (Hirohito Higashi)

https://github.com/vim/vim/commit/be82c254862e475a582c0717455e1db6bf96b0d0
---
 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 36f9fecf64..6f5ebb751d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -196,7 +196,7 @@ static int included_patches[] = {
   // 1502 NA
   // 1501 NA
   1500,
-  // 1499,
+  1499,
   // 1498 NA
   // 1497 NA
   // 1496 NA
-- 
cgit 


From 1f54d253e169fbc483cc485f9b3092a8da1f62db Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 20 Jun 2016 10:35:38 -0400
Subject: vim-patch:7.4.1528

Problem:    Using "ever" for packages is confusing.
Solution:   Use "start", as it's related to startup.

https://github.com/vim/vim/commit/af1a0e371e739f8dff337fd31da0ff8ffb347b43
---
 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 6f5ebb751d..9fcc811f7a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -167,7 +167,7 @@ static int included_patches[] = {
   // 1531 NA
   // 1530 NA
   // 1529 NA
-  // 1528,
+  1528,
   // 1527 NA
   // 1526 NA
   // 1525 NA
-- 
cgit 


From 26f74fdf61827f5afc6fe4e90b9e9497264cb039 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 20 Jun 2016 20:24:13 -0400
Subject: vim-patch:7.4.1550

Problem:    Cannot load packages early.
Solution:   Add the ":packloadall" command.

https://github.com/vim/vim/commit/2d8f56acb32428d0f965d42dd13b27100b46fa15
---
 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 9fcc811f7a..97cd65700f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -145,7 +145,7 @@ static int included_patches[] = {
   // 1553,
   // 1552,
   // 1551,
-  // 1550,
+  1550,
   // 1549,
   // 1548,
   // 1547,
-- 
cgit 


From 55dcf0918c364dd58e700cde5f2efbf7da4b3051 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 20 Jun 2016 21:04:08 -0400
Subject: vim-patch:7.4.1551

Problem:    Cannot generate help tags in all doc directories.
Solution:   Make ":helptags ALL" work.

https://github.com/vim/vim/commit/6bef5306e4f2cacb3a93667992c2312d4b293c9d
---
 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 97cd65700f..e44b4441d0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -144,7 +144,7 @@ static int included_patches[] = {
   // 1554,
   // 1553,
   // 1552,
-  // 1551,
+  1551,
   1550,
   // 1549,
   // 1548,
-- 
cgit 


From 080476882be32768a97e26af22133435ccb8fc2a Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 20 Jun 2016 20:34:24 -0400
Subject: vim-patch:7.4.1552

Problem:    ":colorscheme" does not use 'packpath'.
Solution:   Also use in "start" and "opt" directories in 'packpath'.

https://github.com/vim/vim/commit/7f8989dd8a627af2185df381195351a913f3777f
---
 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 e44b4441d0..9b4221863c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -143,7 +143,7 @@ static int included_patches[] = {
   // 1555 NA
   // 1554,
   // 1553,
-  // 1552,
+  1552,
   1551,
   1550,
   // 1549,
-- 
cgit 


From 53613e7fcd27feda32844904f4ef88bf82841015 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 21 Jun 2016 23:13:46 -0400
Subject: vim-patch:7.4.1553

Problem:    ":runtime" does not use 'packpath'.
Solution:   Add "what" argument.

https://github.com/vim/vim/commit/8dcf259d904cfb965d31841dc74a5cfaf5a351d9
---
 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 9b4221863c..2fdb443ca6 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -142,7 +142,7 @@ static int included_patches[] = {
   // 1556 NA
   // 1555 NA
   // 1554,
-  // 1553,
+  1553,
   1552,
   1551,
   1550,
-- 
cgit 


From 443d335ce31929f0e1c3b2ad6e403f98067c9526 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 22 Jun 2016 11:04:46 -0400
Subject: vim-patch:7.4.1554

Problem:    Completion for :colorscheme does not use 'packpath'.
Solution:   Make it work, add a test. (Hirohito Higashi)

https://github.com/vim/vim/commit/52f9c19015df5ee1ee8592b6f3f15b8a57c8f5be
---
 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 2fdb443ca6..aa27d8279d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -141,7 +141,7 @@ static int included_patches[] = {
   // 1557,
   // 1556 NA
   // 1555 NA
-  // 1554,
+  1554,
   1553,
   1552,
   1551,
-- 
cgit 


From 4bd14e921b7ac56560f53d54aba1380bc7bc0689 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 22 Jun 2016 20:10:37 -0400
Subject: vim-patch:7.4.1596

Problem:    Memory leak. (Coverity)
Solution:   Free the pattern.

https://github.com/vim/vim/commit/ba8cd122ef60a7c71a7723be0d635f0c2d4556ab
---
 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 aa27d8279d..61d2972caa 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -98,7 +98,7 @@ static int included_patches[] = {
   // 1599 NA
   // 1598 NA
   // 1597 NA
-  // 1596,
+  1596,
   // 1595 NA
   // 1594 NA
   // 1593 NA
-- 
cgit 


From 99e51b81e6ef4c62232429159e893bf748fc5fad Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 22 Jun 2016 22:39:30 -0400
Subject: vim-patch:7.4.1649

Problem:    The matchit plugin needs to be copied to be used.
Solution:   Put the matchit plugin in an optional package.

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

Ignore changes to
* Filelist, src/Makefile: Irrelevant to NeoVim
* runtime/vimrc_example.vim, runtime/macros/*, runtime/pack/*: matchit
  is enabled by default in Neovim.
---
 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 61d2972caa..25a5c9d730 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -90,6 +90,7 @@ static int included_patches[] = {
   1695,
   1654,
   1652,
+  1649,
   1643,
   1641,
   // 1624 NA
-- 
cgit 


From 23b2ee077130182c60d6639d99b45546902c8f80 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 7 Jul 2016 23:12:33 -0400
Subject: vim-patch:7.4.1712

Problem:    For plugins in packages, plugin authors need to take care of all
            dependencies.
Solution:   When loading "start" packages and for :packloadall, first add all
            directories to 'runtimepath' before sourcing plugins.

https://github.com/vim/vim/commit/49b27326447d0827c59c6cd201d58f65c1163086
---
 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 25a5c9d730..b9543cb0b7 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -87,6 +87,7 @@ static int included_patches[] = {
   1753,
   1728,
   1716,
+  1712,
   1695,
   1654,
   1652,
-- 
cgit 


From 520a4f06e20c3917e75e3a413a290d9141cb0a0c Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Fri, 8 Jul 2016 00:05:35 -0400
Subject: vim-patch:7.4.1840

Problem:    When using packages an "after" directory cannot be used.
Solution:   Add the "after" directory of the package to 'runtimepath' if it
            exists.

https://github.com/vim/vim/commit/a57024453115592b8847af40ddd965a33898e390
---
 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 b9543cb0b7..358b2cc2f0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -76,6 +76,7 @@ static char *features[] = {
 // clang-format off
 static int included_patches[] = {
   1960,
+  1840,
   1832,
   1831,
   1809,
-- 
cgit 


From c147766389a11df0bc6cf86bb1a6bd0e22a6026b Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Fri, 8 Jul 2016 00:27:05 -0400
Subject: vim-patch:7.4.1973

Problem:    On MS-Windows the package directory may be added at the end
            because of forward/backward slash differences. (Matthew
            Desjardins)
Solution:   Ignore slash differences.

https://github.com/vim/vim/commit/4c5717ed8a81f5ae9dfe4f38b17a61fc8421054b
---
 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 358b2cc2f0..8aa3071395 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[] = {
+  1973,
   1960,
   1840,
   1832,
-- 
cgit