From a5481957c65985fc1f885464ae9b43f92d0dc519 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Fri, 17 Mar 2017 22:48:42 +0800
Subject: vim-patch:7.4.2255

Problem:    The script that checks translations can't handle plurals.
Solution:   Check for plural msgid and msgstr entries.  Leave the cursor on
            the first error.

https://github.com/vim/vim/commit/ec42059b78c1932a44f2bf36ac982109884dc7c7
---
 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 5b3a7398d5..b9286c2a4e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -186,7 +186,7 @@ static int included_patches[] = {
   // 2258 NA
   // 2257 NA
   // 2256,
-  // 2255,
+  2255,
   // 2254 NA
   // 2253 NA
   // 2252 NA
-- 
cgit 


From b87cb77570a53b3c0507d5acded0d103e9ab52f9 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Sat, 11 Mar 2017 09:56:55 +0100
Subject: vim-patch:7.4.2315

Problem:    Insufficient testing for Normal mode commands.
Solution:   Add a big test. (Christian Brabandt, closes vim/vim#1029)

https://github.com/vim/vim/commit/87bc3f74598ae8c648957e5755000cc6cdbc89ce
---
 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 ab3ccdab3d..bef92d40dd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -126,7 +126,7 @@ static int included_patches[] = {
   // 2318,
   // 2317,
   // 2316 NA
-  // 2315,
+  2315,
   2314,
   2313,
   2312,
-- 
cgit 


From afd8eacb4e0268d6ce4dbcca9f188fc8f660cb3c Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Sat, 11 Mar 2017 10:21:14 +0100
Subject: vim-patch:7.4.2317

Problem:    Normal mode tests fail on MS-Windows.
Solution:   Do some tests only on Unix.  Set 'fileformat' to "unix".

https://github.com/vim/vim/commit/0913a1089a07ac7b17abc3a1343dfa7cd25613f4
---
 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 bef92d40dd..207b561cc3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -124,7 +124,7 @@ static int included_patches[] = {
   // 2320,
   // 2319 NA
   // 2318,
-  // 2317,
+  2317,
   // 2316 NA
   2315,
   2314,
-- 
cgit 


From 42caeccce6e50fa3b8b25fe3076ac2fbd555b152 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Sat, 11 Mar 2017 10:27:15 +0100
Subject: vim-patch:7.4.2322

Problem:    Access memory beyond the end of the line. (Dominique Pelle)
Solution:   Adjust the cursor column.

https://github.com/vim/vim/commit/bc54f3f3fed4dc3556df8c46cee6739d211b0eb2
---
 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 207b561cc3..7f07e5a287 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -119,7 +119,7 @@ static int included_patches[] = {
   // 2325 NA
   // 2324,
   // 2323,
-  // 2322,
+  2322,
   2321,
   // 2320,
   // 2319 NA
-- 
cgit 


From e888864c28033546b827c07d9dd095348fff23bd Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Sat, 11 Mar 2017 11:33:15 +0100
Subject: vim-patch:7.4.2326

Problem:    Illegal memory access when Visual selection starts in invalid
            position. (Dominique Pelle)
Solution:   Correct position when needed.

https://github.com/vim/vim/commit/d5824ce1b5491df7d2eb0b66189d366fa67b4585
---
 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 7f07e5a287..09fe1d029b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -115,7 +115,7 @@ static int included_patches[] = {
   // 2329,
   // 2328,
   // 2327 NA
-  // 2326,
+  2326,
   // 2325 NA
   // 2324,
   // 2323,
-- 
cgit 


From 1e33c886856abcdac13c3eb368c127bda40e1e84 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Sat, 11 Mar 2017 10:42:07 +0100
Subject: vim-patch:7.4.2333

Problem:    Outdated comments in test.
Solution:   Cleanup normal mode test. (Christian Brabandt)

https://github.com/vim/vim/commit/31845093b7f1b33e0c7e9e592bef65528674a1f2
---
 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 09fe1d029b..dd7318b697 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -108,7 +108,7 @@ static int included_patches[] = {
   // 2336,
   2335,
   // 2334,
-  // 2333,
+  2333,
   // 2332 NA
   2331,
   // 2330,
@@ -118,7 +118,7 @@ static int included_patches[] = {
   2326,
   // 2325 NA
   // 2324,
-  // 2323,
+  2323,
   2322,
   2321,
   // 2320,
-- 
cgit 


From 4500b16f15510f6091ca98b78aa4ee13e1acf2c7 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Sat, 11 Mar 2017 10:44:35 +0100
Subject: vim-patch:7.4.2336

Problem:    Running normal mode tests leave a couple of files behind.
            (Yegappan Lakshmanan)
Solution:   Delete the files. (Christian Brabandt)

https://github.com/vim/vim/commit/df0db16cf74281a83a9ea3388a2ef9aedccd013c
---
 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 dd7318b697..487685ea2e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -105,7 +105,7 @@ static int included_patches[] = {
   // 2339,
   // 2338 NA
   2337,
-  // 2336,
+  2336,
   2335,
   // 2334,
   2333,
-- 
cgit 


From ae828982ceb9dc4c5bde58a276e6e10df6f35051 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Sat, 11 Mar 2017 10:46:50 +0100
Subject: vim-patch:7.4.2347

Problem:    Crash when closing a buffer while Visual mode is active.
            (Dominique Pelle)
Solution:   Adjust the position before computing the number of lines.
            When closing the current buffer stop Visual mode.

https://github.com/vim/vim/commit/c4a908e83690844b0d3a46124ba6af7d23485d69
---
 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 487685ea2e..b652f5fee5 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -94,7 +94,7 @@ static int included_patches[] = {
   // 2350,
   // 2349,
   // 2348,
-  // 2347,
+  2347,
   // 2346,
   // 2345 NA
   // 2344 NA
-- 
cgit 


From 707aea86bbae6ff819deb64ca977cc701d39d569 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Sat, 11 Mar 2017 11:45:44 +0100
Subject: vim-patch:7.4.2353

Problem:    Not enough test coverage for Normal mode commands.
Solution:   Add more tests. (Christian Brabandt)

https://github.com/vim/vim/commit/2931f2a5df0d962032d41060af84d9fd2cb35c9f
---
 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 b652f5fee5..e79d7a0faa 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -88,7 +88,7 @@ static int included_patches[] = {
   // 2356,
   // 2355,
   // 2354,
-  // 2353,
+  2353,
   // 2352 NA
   // 2351 NA
   // 2350,
-- 
cgit 


From 86b1e7f5834d58eebc87735c9a531040fea1a0f7 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Sat, 11 Mar 2017 13:42:06 +0100
Subject: vim-patch:7.4.2362

Problem:    Illegal memory access with ":1@". (Dominique Pelle)
Solution:   Correct cursor column after setting the line number.  Also avoid
            calling end_visual_mode() when not in Visual mode.

https://github.com/vim/vim/commit/4930a76a0357f76a829eafe4985d04cf3ce0e9e0
---
 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 e79d7a0faa..7d44efb401 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -79,7 +79,7 @@ static int included_patches[] = {
   // 2365 NA
   // 2364,
   // 2363 NA
-  // 2362,
+  2362,
   // 2361 NA
   // 2360,
   // 2359 NA
-- 
cgit 


From db128974fcbd5702ca724610590a5dafa2e87712 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Thu, 16 Mar 2017 07:40:31 +0100
Subject: vim-patch:7.4.2348

Problem:    Crash on exit when EXITFREE is defined. (Dominique Pelle)
Solution:   Don't access curwin when exiting.

https://github.com/vim/vim/commit/9a27c7fde6d453d9892b6f6baa756bce4d6d419d
---
 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 7d44efb401..8fd0fce329 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -93,7 +93,7 @@ static int included_patches[] = {
   // 2351 NA
   // 2350,
   // 2349,
-  // 2348,
+  2348,
   2347,
   // 2346,
   // 2345 NA
-- 
cgit 


From 8924e75f3477b20f0ef4e3df64b56bf496b197ae Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jurica.bradaric@avl.com>
Date: Thu, 2 Mar 2017 23:04:57 +0100
Subject: vim-patch:7.4.2170

Problem:    Cannot get information about timers.
Solution:   Add timer_info().

https://github.com/vim/vim/commit/8e97bd74b5377753597e3d98e7123d8985c7fffd
---
 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 8fd0fce329..b283059c7a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -271,7 +271,7 @@ static int included_patches[] = {
   // 2173,
   // 2172,
   // 2171,
-  // 2170,
+  2170,
   // 2169,
   // 2168 NA
   // 2167 NA
-- 
cgit 


From 5b8ce2feed6b528bae4bceba6f234be000949971 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jurica.bradaric@avl.com>
Date: Sun, 5 Mar 2017 16:25:40 +0100
Subject: vim-patch:7.4.2180

Problem:    There is no easy way to stop all timers.  There is no way to
            temporary pause a timer.
Solution:   Add timer_stopall() and timer_pause().

https://github.com/vim/vim/commit/b73598e2f022a22fec512ea681c70d2775e8fd87
---
 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 b283059c7a..4da970d43b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -261,7 +261,7 @@ static int included_patches[] = {
   2183,
   // 2182 NA
   // 2181,
-  // 2180,
+  2180,
   // 2179,
   // 2178,
   // 2177,
-- 
cgit 


From 420a9955fa969ee0460f41798c60c1374476fd08 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jurica.bradaric@avl.com>
Date: Mon, 6 Mar 2017 07:15:19 +0100
Subject: version.c: Mark 7.4.2171 and 7.4.2181 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 4da970d43b..0bf0f10b56 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -260,7 +260,7 @@ static int included_patches[] = {
   // 2184,
   2183,
   // 2182 NA
-  // 2181,
+  // 2181 NA
   2180,
   // 2179,
   // 2178,
@@ -270,7 +270,7 @@ static int included_patches[] = {
   2174,
   // 2173,
   // 2172,
-  // 2171,
+  // 2171 NA
   2170,
   // 2169,
   // 2168 NA
-- 
cgit 


From 5c2f1e29e3dfdfab8c2a9b31962d9cc12c171e46 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Mon, 20 Mar 2017 20:52:54 +0100
Subject: vim-patch:7.4.2240

Problem:    Tests using the sleep time can be flaky.
Solution:   Use reltime() if available. (Partly by Shane Harper)

https://github.com/vim/vim/commit/f267f8bdf777073e392ada5b31d837c7b6090eb4
---
 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 0bf0f10b56..ef6c9d1454 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -201,7 +201,7 @@ static int included_patches[] = {
   // 2243 NA
   // 2242,
   // 2241,
-  // 2240,
+  2240,
   // 2239,
   // 2238 NA
   2237,
-- 
cgit 


From 3558f89d22faad613e0049592d2187ad35f5bec8 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Mon, 20 Mar 2017 21:11:24 +0100
Subject: vim-patch:7.4.2241

Problem:    Timer test sometimes fails.
Solution:   Increase the maximum time for repeating timer.

https://github.com/vim/vim/commit/973365dcc40a41e6b72ece56f15cebfee69b1329
---
 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 ef6c9d1454..b7516e443a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -200,7 +200,7 @@ static int included_patches[] = {
   // 2244,
   // 2243 NA
   // 2242,
-  // 2241,
+  2241,
   2240,
   // 2239,
   // 2238 NA
-- 
cgit 


From 4f69a8fb8854698adb2de8956ad0d86ff35a6f68 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Mon, 20 Mar 2017 21:12:31 +0100
Subject: vim-patch:7.4.2242

Problem:    Timer test sometimes fails.
Solution:   Increase the maximum time for callback timer test.

https://github.com/vim/vim/commit/17f1347b867cbcc0ce380bf9a2466b4c31896f04
---
 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 b7516e443a..91c37658aa 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -199,7 +199,7 @@ static int included_patches[] = {
   // 2245,
   // 2244,
   // 2243 NA
-  // 2242,
+  2242,
   2241,
   2240,
   // 2239,
-- 
cgit 


From b4cb5fa610903492f89a70d0ae2d4565ddcd1228 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jurica.bradaric@avl.com>
Date: Tue, 7 Mar 2017 19:20:07 +0100
Subject: vim-patch:7.4.2266

Problem:    printf() test fails on Windows. "-inf" is not used.
Solution:   Check for Windows-specific values for "nan".  Add sign to "inf"
            when appropriate.

https://github.com/vim/vim/commit/9992237a3e791fbc0c1ebf743ece1b75e1488410
---
 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 8fd0fce329..5479e9f91f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -175,7 +175,7 @@ static int included_patches[] = {
   // 2269,
   // 2268,
   // 2267 NA
-  // 2266,
+  2266,
   2265,
   2264,
   // 2263,
-- 
cgit 


From 6ca580be9bffcccc513bfce383a6e1f9f026614c Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jurica.bradaric@avl.com>
Date: Tue, 7 Mar 2017 08:47:31 +0100
Subject: vim-patch:7.4.2280

Problem:    printf() doesn't handle infinity float values correctly.
Solution:   Add a table with possible infinity values. (Dominique Pelle)

https://github.com/vim/vim/commit/e999782e369999539a1783a7ebe4eadcc6da28a8
---
 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 5479e9f91f..09e27d210b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -161,7 +161,7 @@ static int included_patches[] = {
   // 2283,
   // 2282 NA
   // 2281 NA
-  // 2280,
+  2280,
   2279,
   // 2278 NA
   2277,
-- 
cgit 


From cad9a76be28f2ee3bd2c48ae959243aa7cfdb02a Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jurica.bradaric@avl.com>
Date: Tue, 7 Mar 2017 21:05:02 +0100
Subject: vim-patch:7.4.2291

Problem:    printf() handles floats wrong when there is a sign.
Solution:   Fix placing the sign.  Add tests. (Dominique Pelle)

https://github.com/vim/vim/commit/04186095346daa60e82e981dad114de2b641d672
---
 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 09e27d210b..dd4adae213 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -150,7 +150,7 @@ static int included_patches[] = {
   2294,
   // 2293,
   2292,
-  // 2291,
+  2291,
   // 2290 NA
   // 2289 NA
   // 2288 NA
-- 
cgit 


From c6c8e1e8cc4ea6fc98187c0bce8875cf82278ba5 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Tue, 21 Mar 2017 07:34:08 +0100
Subject: version: Mark patch 2221 as applied.

It was implemented as a part of #3916.
---
 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 dd4adae213..4bc108dd2d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -220,7 +220,7 @@ static int included_patches[] = {
   // 2224,
   2223,
   2222,
-  // 2221,
+  2221,
   2220,
   2219,
   // 2218 NA
-- 
cgit 


From 66259e4c498dd3b5278aeea16cc3a71ed83f1b76 Mon Sep 17 00:00:00 2001
From: Jack Bracewell <FriedSock@users.noreply.github.com>
Date: Tue, 21 Mar 2017 10:11:32 +0000
Subject: vim-patch:7.4.2293 (#6307)

The original patch makes all the modeline comments consistent, but these
have been removed in the neovim source. However there as a correction of
a comment included in the patch that we can use.

https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
---
 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 8fd0fce329..bf13e52be4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -148,7 +148,7 @@ static int included_patches[] = {
   // 2296,
   2295,
   2294,
-  // 2293,
+  2293,
   2292,
   // 2291,
   // 2290 NA
-- 
cgit 


From 26d7757ccbc57125a3dfe3b2cad0f07a2e567df1 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Fri, 17 Mar 2017 23:09:15 +0800
Subject: vim-patch:7.4.2256

Problem:    Coverity complains about null pointer check.
Solution:   Remove wrong and superfluous error check.

https://github.com/vim/vim/commit/db249f26edf7a5f88d1f4468d08ec5b84f5ab7ad
---
 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 b9286c2a4e..5cdd0d96fe 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -185,7 +185,7 @@ static int included_patches[] = {
   // 2259,
   // 2258 NA
   // 2257 NA
-  // 2256,
+  2256,
   2255,
   // 2254 NA
   // 2253 NA
-- 
cgit 


From 6baa669c10518b8751904a31899feb897fb7c995 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 21 Mar 2017 17:07:00 +0100
Subject: vim-patch:7.4.2164 (#6326)

Problem:    It is not possible to use plugins in an "after" directory to tune
            the behavior of a package.
Solution:   First load plugins from non-after directories, then packages and
            finally plugins in after directories.
            Reset 'loadplugins' before executing --cmd arguments.

https://github.com/vim/vim/commit/66459b7c98c67f8a9d39de8f08e8e8f1fca0e359

vim-patch:7.4.2172
vim-patch:7.4.2169
vim-patch:7.4.2177
vim-patch:7.4.2178
vim-patch:7.4.2184
vim-patch:8.0.0050
vim-patch:8.0.0105
vim-patch:8.0.0400
vim-patch:8.0.0405

Closes #6034
---
 src/nvim/version.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index bf13e52be4..1d4239b215 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -257,27 +257,27 @@ static int included_patches[] = {
   2187,
   // 2186 NA
   2185,
-  // 2184,
+  2184,
   2183,
   // 2182 NA
   // 2181,
   // 2180,
   // 2179,
-  // 2178,
-  // 2177,
+  2178,
+  2177,
   // 2176 NA
   2175,
   2174,
   // 2173,
-  // 2172,
+  2172,
   // 2171,
   // 2170,
-  // 2169,
+  2169,
   // 2168 NA
   // 2167 NA
   // 2166 NA
   // 2165,
-  // 2164,
+  2164,
   2163,
   2162,
   // 2161,
-- 
cgit 


From ab16c07584ab4a5bc48784dde3b9b46d30e5e4a0 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 22 Mar 2017 08:28:03 +0800
Subject: vim-patch:7.4.2283

Problem:    Part of ":oldfiles" command isn't cleared. (Lifepillar)
Solution:   Clear the rest of the line. (closes 1018)

https://github.com/vim/vim/commit/885c00eabe6d1fd757d4f0eb531ad3a15a35ec04
---
 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 39886aa9d9..e060724d81 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -158,7 +158,7 @@ static int included_patches[] = {
   // 2286 NA
   // 2285 NA
   2284,
-  // 2283,
+  2283,
   // 2282 NA
   // 2281 NA
   2280,
-- 
cgit 


From c554b53040e9fea2dce343eb11178a3352d5e8da Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 22 Mar 2017 08:34:04 +0800
Subject: vim-patch:7.4.2296

Problem:    No tests for :undolist and "U" command.
Solution:   Add tests. (Dominique Pelle)

https://github.com/vim/vim/commit/c628fdcd46e93c308f742efdf54248695960e290
---
 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 e060724d81..1f2c8d12f5 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -145,7 +145,7 @@ static int included_patches[] = {
   2299,
   // 2298 NA
   // 2297 NA
-  // 2296,
+  2296,
   2295,
   2294,
   2293,
-- 
cgit 


From 114a18b93588c7d5238fe66a77dc0f94a2ba5500 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 22 Mar 2017 08:37:02 +0800
Subject: vim-patch:7.4.2303

Problem:    When using "is" the mode isn't always updated.
Solution:   Redraw the command line. (Christian Brabandt)

https://github.com/vim/vim/commit/779f2fc3a7468e273897d2fd0672315812a2e3da
---
 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 1f2c8d12f5..ccd7fd21d9 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -138,7 +138,7 @@ static int included_patches[] = {
   // 2306,
   2305,
   // 2304 NA
-  // 2303,
+  2303,
   // 2302 NA
   // 2301 NA
   2300,
-- 
cgit 


From 44e75eba30682007dd17f9a80805a9925a921976 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Wed, 22 Mar 2017 21:57:20 +0100
Subject: vim-patch:7.4.2161 (#6340)

Problem:    Expression test fails without conceal feature.
Solution:   Only check "conceal" with the conceal feature.

https://github.com/vim/vim/commit/7ab6defcafe017a3ad58580a3e56dab705b1ed8b
---
 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 398a3e6542..cbb7902985 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -280,7 +280,7 @@ static int included_patches[] = {
   2164,
   2163,
   2162,
-  // 2161,
+  2161,
   2160,
   2159,
   2158,
-- 
cgit 


From 06ed7a189b2c1dca88f307538b9739b989776068 Mon Sep 17 00:00:00 2001
From: Jurica Bradarić <jbradaric@users.noreply.github.com>
Date: Thu, 23 Mar 2017 08:54:01 +0100
Subject: vim-patch:7.4.2329 (#6341)

Problem:    Error for min() and max() contains %s. (Nikolay Pavlov)
Solution:   Pass the function name. (closes vim/vim#1040)

https://github.com/vim/vim/commit/26b84339fd8766898bcf6a259cbc2e0c38689726
---
 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 cbb7902985..32ef2c2fdb 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -112,7 +112,7 @@ static int included_patches[] = {
   // 2332 NA
   2331,
   // 2330,
-  // 2329,
+  2329,
   // 2328,
   // 2327 NA
   2326,
-- 
cgit 


From 165ba3e636769c38d67285e1b8ea2966ccb00b30 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 20 Mar 2017 14:01:22 +0100
Subject: vim-patch:7.4.2324

Problem:    Crash when editing a new buffer and BufUnload autocommand wipes
            out the new buffer. (Norio Takagi)
Solution:   Don't allow wiping out this buffer. (partly by Hirohito Higashi)
            Move old style test13 into test_autocmd. Avoid ml_get error when
            editing a file.

https://github.com/vim/vim/commit/e0ab94e7123ca7855f45919114d948ef2bc1e8c3
---
 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 32ef2c2fdb..8ae5e4057e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -117,7 +117,7 @@ static int included_patches[] = {
   // 2327 NA
   2326,
   // 2325 NA
-  // 2324,
+  2324,
   2323,
   2322,
   2321,
-- 
cgit 


From 4c18670e91e22ab4fe566aa181aa6f28166e8aad Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 21 Mar 2017 10:19:01 +0100
Subject: vim-patch:7.4.2346

Problem:    Autocommand test fails when run directly, passes when run as
            part of test_alot.
Solution:   Add command to make the cursor move.  Close a tab page.
---
 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 8ae5e4057e..21f3a493c3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -95,7 +95,7 @@ static int included_patches[] = {
   // 2349,
   2348,
   2347,
-  // 2346,
+  2346,
   // 2345 NA
   // 2344 NA
   // 2343,
-- 
cgit 


From 4a2e6f460d02762d211c0f92af305ef5290a667b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 21 Mar 2017 10:24:40 +0100
Subject: vim-patch:7.4.2341

Problem:    Tiny things.  Test doesn't clean up properly.
Solution:   Adjust comment and white space. Restore option value.
---
 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 21f3a493c3..84cb8fea9b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -100,7 +100,7 @@ static int included_patches[] = {
   // 2344 NA
   // 2343,
   // 2342 NA
-  // 2341,
+  2341,
   // 2340 NA
   // 2339,
   // 2338 NA
-- 
cgit 


From 10f6624f65edbc8af84c9775e6712484be9c81a5 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 21 Mar 2017 10:39:24 +0100
Subject: vim-patch:7.4.2328

Problem:    Crash when BufWinLeave autocmd goes to another tab page.
            (Hirohito Higashi)
Solution:   Make close_buffer() go back to the right window.
---
 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 84cb8fea9b..d1d3e5a3c9 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -113,7 +113,7 @@ static int included_patches[] = {
   2331,
   // 2330,
   2329,
-  // 2328,
+  2328,
   // 2327 NA
   2326,
   // 2325 NA
-- 
cgit 


From 929859ed8156a45f5acb491d82f8c06ef5f57902 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 21 Mar 2017 13:11:10 +0100
Subject: vim-patch:7.4.2355

Problem:    Regexp fails to match when using "\>\)\?". (Ramel)
Solution:   When a state is already in the list, but addstate_here() is used
            and the existing state comes later, add the new state anyway.

https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
---
 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 d1d3e5a3c9..1b6e513c49 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -86,7 +86,7 @@ static int included_patches[] = {
   // 2358 NA
   // 2357,
   // 2356,
-  // 2355,
+  2355,
   // 2354,
   2353,
   // 2352 NA
-- 
cgit 


From 78a4c73cf06aaf8cd496d39bbbeaef821906fc25 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 21 Mar 2017 14:11:27 +0100
Subject: vim-patch:7.4.2339

Problem:    Tab page test fails when run as fake root.
Solution:   Check 'buftype' instead of 'filetype'. (James McCoy, closes vim/vim#1042)

https://github.com/vim/vim/commit/100f5c90f4d4fb40bc3aeabc35192db371f5988f
---
 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 1b6e513c49..db3b9b51b2 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -102,7 +102,7 @@ static int included_patches[] = {
   // 2342 NA
   2341,
   // 2340 NA
-  // 2339,
+  2339,
   // 2338 NA
   2337,
   2336,
-- 
cgit 


From f9a31e98505c0f5e83dd3ba957fbd0f4b150d30c Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Mon, 27 Mar 2017 01:04:57 +0800
Subject: vim-patch:7.4.2349 (#6368)

Problem:    Valgrind reports using uninitialzed memory. (Dominique Pelle)
Solution:   Check the length before checking for a NUL.

https://github.com/vim/vim/commit/2321ca2a78286bc026fa7f407281ddbeb04114bb
---
 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 db3b9b51b2..a354634218 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -92,7 +92,7 @@ static int included_patches[] = {
   // 2352 NA
   // 2351 NA
   // 2350,
-  // 2349,
+  2349,
   2348,
   2347,
   2346,
-- 
cgit 


From edc80f6b46f51ea1137289301914c0f90db19295 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Sun, 26 Mar 2017 23:15:53 +0200
Subject: vim-patch:7.4.2357 (#6354)

Problem:    Attempt to read history entry while not initialized.
Solution:   Skip when the index is negative.

https://github.com/vim/vim/commit/46643713dc6bb04b4e84986b1763ef309e960161
---
 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 a354634218..a911e8ebc3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -84,7 +84,7 @@ static int included_patches[] = {
   // 2360,
   // 2359 NA
   // 2358 NA
-  // 2357,
+  2357,
   // 2356,
   2355,
   // 2354,
-- 
cgit 


From 20e7652b6980e0efed5db65e0f80c0d72ef8c68d Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Thu, 23 Mar 2017 22:42:26 +0800
Subject: vim-patch:7.4.2307

Problem:    Several tests are old style.
Solution:   Turn them into new style tests. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/cd055da370114f66c960be9c8b1eb0f33a9e0a85
---
 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 a911e8ebc3..ee66b00b4e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -134,7 +134,7 @@ static int included_patches[] = {
   // 2310 NA
   2309,
   // 2308 NA
-  // 2307,
+  2307,
   // 2306,
   2305,
   // 2304 NA
-- 
cgit 


From 85ba14af6ad19fa3c4ba1ade3819014254635b2f Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Thu, 23 Mar 2017 22:54:30 +0800
Subject: vim-patch:7.4.2330

Problem:    Coverity complains about not checking curwin to be NULL.
Solution:   Use firstwin to avoid the warning.

https://github.com/vim/vim/commit/030cddc7ec0c3d2fe3969140cd1b92b2f18633c0
---
 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 ee66b00b4e..c18439c279 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -111,7 +111,7 @@ static int included_patches[] = {
   2333,
   // 2332 NA
   2331,
-  // 2330,
+  2330,
   2329,
   2328,
   // 2327 NA
-- 
cgit 


From 9cd7e199048161c5224aca885af8b7945236392d Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Fri, 24 Mar 2017 12:24:25 +0800
Subject: vim-patch:7.4.2334

Problem:    On MS-Windows test_getcwd leaves Xtopdir behind.
Solution:   Set 'noswapfile'. (Michael Soyka)

https://github.com/vim/vim/commit/1b0c2fcf6e85c9b85c24757ba970061e1f3e4e80
---
 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 c18439c279..500e8984c0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -107,7 +107,7 @@ static int included_patches[] = {
   2337,
   2336,
   2335,
-  // 2334,
+  2334,
   2333,
   // 2332 NA
   2331,
-- 
cgit 


From e86042ae178736d657b5da12adce4479633aa8d5 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 29 Mar 2017 07:30:54 +0800
Subject: vim-patch:7.4.2343 and mark NA patches (#6384)

vim-patch:7.4.2343

Problem:    Too many old file tests.
Solution:   Turn several into new style tests. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/53f1673cd909eb1c809c6a9086e3d104a0df9bed
---
 src/nvim/version.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 500e8984c0..dd583f6ffd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -74,10 +74,10 @@ static char *features[] = {
 
 // clang-format off
 static int included_patches[] = {
-  // 2367,
+  // 2367,NA
   // 2366 NA
   // 2365 NA
-  // 2364,
+  // 2364,NA
   // 2363 NA
   2362,
   // 2361 NA
@@ -98,7 +98,7 @@ static int included_patches[] = {
   2346,
   // 2345 NA
   // 2344 NA
-  // 2343,
+  2343,
   // 2342 NA
   2341,
   // 2340 NA
-- 
cgit 


From 28dafe3ff0b0dc082fb62b2251fd64a167ce7188 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 21 Aug 2016 08:16:47 +0300
Subject: eval,*: Move get_tv_string to typval.c

Function was renamed and changed to return `const char *`.
---
 src/nvim/version.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index dd583f6ffd..f1d39b8492 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -73,7 +73,7 @@ static char *features[] = {
 };
 
 // clang-format off
-static int included_patches[] = {
+static const int included_patches[] = {
   // 2367,NA
   // 2366 NA
   // 2365 NA
@@ -2461,10 +2461,10 @@ static char *(extra_patches[]) = {
 /// @param version Version string like "1.3.42"
 ///
 /// @return true if Nvim is at or above the version.
-bool has_nvim_version(char *version_str)
-  FUNC_ATTR_NONNULL_ALL
+bool has_nvim_version(const char *const version_str)
+  FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
 {
-  char *p   = version_str;
+  const char *p = version_str;
   int major = 0;
   int minor = 0;
   int patch = 0;
@@ -2473,7 +2473,7 @@ bool has_nvim_version(char *version_str)
     return false;
   }
   major = atoi(p);
-  p     = strchr(p, '.');  // Find the next dot.
+  p = strchr(p, '.');  // Find the next dot.
 
   if (p) {
     p++;  // Advance past the dot.
@@ -2481,7 +2481,7 @@ bool has_nvim_version(char *version_str)
       return false;
     }
     minor = atoi(p);
-    p     = strchr(p, '.');
+    p = strchr(p, '.');
     if (p) {
       p++;
       if (!ascii_isdigit(*p)) {
-- 
cgit 


From 2846d508b24eb9f8ab59d21a060fd8130906392f Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 29 Mar 2017 22:48:50 +0800
Subject: vim-patch:7.4.2276 (#6393)

* vim-patch:7.4.2276

Problem:    Command line test fails on Windows when run twice.
Solution:   Wipe the buffer so that the directory can be deleted.

https://github.com/vim/vim/commit/1773ddfdcd106fa3bbf479c9b62ccde03c2a86ba

* version.c: mark vim-patch 7.4.2269 as included (#5659)
---
 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 dd583f6ffd..020737ac8c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -165,14 +165,14 @@ static int included_patches[] = {
   2279,
   // 2278 NA
   2277,
-  // 2276,
+  2276,
   2275,
   2274,
   2273,
   2272,
   // 2271 NA
   // 2270 NA
-  // 2269,
+  2269,
   // 2268,
   // 2267 NA
   2266,
-- 
cgit 


From 831eb2a9bf9fdffc1b6942e4c43bc2458f4af794 Mon Sep 17 00:00:00 2001
From: Michael Ennen <brcolow@users.noreply.github.com>
Date: Thu, 30 Mar 2017 16:07:39 -0700
Subject: vim-patch:7.4.2104 (#6332)

Problem:    Code duplication when unreferencing a function.
Solution:   De-duplicate.

https://github.com/vim/vim/commit/97baee80f0906ee2f651ee1215ec033e84f866ad
---
 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 9275a2e5bd..fdf5436a98 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -337,7 +337,7 @@ static const int included_patches[] = {
   2107,
   2106,
   // 2105 NA
-  // 2104,
+  2104,
   2103,
   // 2102 NA
   2101,
-- 
cgit 


From 53da57d27a8ee47fe42604ad07bb7c956d9012f5 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 22 Mar 2017 12:24:07 +0800
Subject: vim-patch:7.4.2236

Problem:    The 'langnoremap' option leads to double negatives.  And it does
            not work for the last character of a mapping.
Solution:   Add 'langremap' with the opposite value.  Keep 'langnoremap' for
            backwards compatibility.  Make it work for the last character of a
            mapping.  Make the test work.

https://github.com/vim/vim/commit/920694c1b60fac8017b8909efcc24f189804a9bb
---
 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 fdf5436a98..ba1ebc8f2c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -205,7 +205,7 @@ static const int included_patches[] = {
   // 2239,
   // 2238 NA
   2237,
-  // 2236,
+  2236,
   2235,
   // 2234 NA
   2233,
-- 
cgit 


From 45a13c4bbc4a7c4f62a299c832ecc192d8f3cd0a Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 22 Mar 2017 12:52:15 +0800
Subject: vim-patch:7.4.2306
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:    Default value for 'langremap' is wrong.
Solution:   Set the right value. (Jürgen Krämer)  Add a test.

https://github.com/vim/vim/commit/da9ce2cde11ddd0e16cdfbab6d4ac4e8110218e1
---
 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 ba1ebc8f2c..0ee0419849 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -135,7 +135,7 @@ static const int included_patches[] = {
   2309,
   // 2308 NA
   2307,
-  // 2306,
+  2306,
   2305,
   // 2304 NA
   2303,
-- 
cgit 


From 6a6bbbc6d8fa79a0c14fb913baa3ba2d7046419c Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 6 Apr 2017 08:54:30 -0400
Subject: vim-patch:7.4.2281

Problem:    Timer test fails sometimes.
Solution:   Reduce minimum time by 1 msec.

https://github.com/vim/vim/commit/0426bae2abede764d0dd366a28663d1c6e6ab0fe
---
 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 ca520c7af5..3944551cb4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -160,7 +160,7 @@ static const int included_patches[] = {
   2284,
   2283,
   // 2282 NA
-  // 2281 NA
+  2281,
   2280,
   2279,
   // 2278 NA
-- 
cgit 


From 0f99645b8faf3e5970e46c185c0cbbd7a9cfe318 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 6 Apr 2017 08:55:51 -0400
Subject: vim-patch:7.4.2304

Problem:    In a timer callback the timer itself can't be found or stopped.
            (Thinca)
Solution:   Do not remove the timer from the list, remember whether it was
            freed.

https://github.com/vim/vim/commit/417ccd7138d4d230d328de8b0d3892dd82ff1bee
---
 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 3944551cb4..beb23090ec 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -137,7 +137,7 @@ static const int included_patches[] = {
   2307,
   2306,
   2305,
-  // 2304 NA
+  2304,
   2303,
   // 2302 NA
   // 2301 NA
-- 
cgit 


From 9edbeec07716cff5607202dbd20b81917416030f Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 6 Apr 2017 08:56:53 -0400
Subject: vim-patch:7.4.2332

Problem:    Crash when stop_timer() is called in a callback of a callback.
            Vim hangs when the timer callback uses too much time.
Solution:   Set tr_id to -1 when a timer is to be deleted. Don't keep calling
            callbacks forever. (Ozaki Kiichi)

https://github.com/vim/vim/commit/75537a93e985ef32e6c267b06ce93629855dd983
---
 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 beb23090ec..d16eab7201 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -109,7 +109,7 @@ static const int included_patches[] = {
   2335,
   2334,
   2333,
-  // 2332 NA
+  2332,
   2331,
   2330,
   2329,
-- 
cgit 


From 071f2da66bacfd5a2d4ab87bda275d3848ddcc0e Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 6 Apr 2017 08:58:18 -0400
Subject: vim-patch:7.4.2359

Problem:    Memory leak in timer_start().
Solution:   Check the right field to be NULL.

https://github.com/vim/vim/commit/26fe0d56912e42c2b16a61b2480e19ba569aee98
---
 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 d16eab7201..9a5d7ce169 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -82,7 +82,7 @@ static const int included_patches[] = {
   2362,
   // 2361 NA
   // 2360,
-  // 2359 NA
+  2359,
   // 2358 NA
   2357,
   // 2356,
-- 
cgit 


From c2f3e361c52ec4e7149ea1d8c6a1202e0873da8e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Wed, 19 Apr 2017 19:11:50 +0300
Subject: *: Add comment to all C files

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

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9a5d7ce169..29ce741ba0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file version.c
 ///
 /// Nvim was forked from Vim 7.4.160.
-- 
cgit 


From c5d7eaf66468d5f71049a602e820c19d8ad8c772 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 15 Apr 2017 13:21:38 -0400
Subject: vim-patch:7.4.2152

Problem:    No proper translation of messages with a count.
Solution:   Use ngettext(). (Sergey Alyoshin)

https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
---
 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 9a5d7ce169..cd904da573 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -289,7 +289,7 @@ static const int included_patches[] = {
   // 2155 NA
   // 2154 NA
   // 2153 NA
-  // 2152,
+  2152,
   2151,
   // 2150 NA
   2149,
-- 
cgit 


From cb02137dfac7357650a2e9cc32acb66326e59058 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 15 Apr 2017 13:54:40 -0400
Subject: vim-patch:7.4.2209

Problem:    Cannot map <M-">. (Stephen Riehm)
Solution:   Solve the memory access problem in another way. (Dominique Pelle)
            Allow for using <M-\"> in a string.

https://github.com/vim/vim/commit/35a4cfa200917dd171b1fff3cd5b6cee9add673d
---
 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 cd904da573..f7a78a15f9 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -232,7 +232,7 @@ static const int included_patches[] = {
   2212,
   // 2211 NA
   // 2210 NA
-  // 2209,
+  2209,
   2208,
   // 2207 NA
   // 2206 NA
-- 
cgit 


From a6f50c1120f4427d1b4f531ac564d83b770fd62f Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 19 Apr 2017 23:22:27 -0400
Subject: version.c: Mark 7.4.{2165,2173,2179} applied

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

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index f7a78a15f9..4edfe88e18 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -262,13 +262,13 @@ static const int included_patches[] = {
   // 2182 NA
   // 2181 NA
   2180,
-  // 2179,
+  2179,
   2178,
   2177,
   // 2176 NA
   2175,
   2174,
-  // 2173,
+  2173,
   2172,
   // 2171 NA
   2170,
@@ -276,7 +276,7 @@ static const int included_patches[] = {
   // 2168 NA
   // 2167 NA
   // 2166 NA
-  // 2165,
+  2165,
   2164,
   2163,
   2162,
-- 
cgit 


From dbdc2d40bb7a950e294c6e50906f546707ccf390 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Fri, 28 Apr 2017 21:04:17 -0400
Subject: vim-patch:7.4.2231

Problem:    ":oldfiles" output is a very long list.
Solution:   Add a pattern argument. (Coot, closes vim/vim#575)

https://github.com/vim/vim/commit/e11d61a3b1cdedf3144de697a2b38af62c3a78d8
---
 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 b1aa8e2a4b..b3ab5d0d2c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -213,7 +213,7 @@ static const int included_patches[] = {
   // 2234 NA
   2233,
   // 2232 NA
-  // 2231,
+  2231,
   2230,
   // 2229,
   2228,
-- 
cgit 


From 059c3fc2f952b42824ca37610c040c938a75de5c Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 07:55:15 -0400
Subject: vim-patch:7.4.2239

Problem:    Warning for missing declaration of skip_vimgrep_pat(). (John
            Marriott)
Solution:   Move it to another file.

https://github.com/vim/vim/commit/9baf297c99cc35adb921bee04369499d76438889
---
 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 b3ab5d0d2c..cdd617e68c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -205,7 +205,7 @@ static const int included_patches[] = {
   2242,
   2241,
   2240,
-  // 2239,
+  2239,
   // 2238 NA
   2237,
   2236,
-- 
cgit 


From 7bd97127b4e45dcef1159603834b04ef0dcadfd7 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 07:58:49 -0400
Subject: vim-patch:7.4.2244

Problem:    Adding pattern to ":oldfiles" is not a generic solution.
Solution:   Add the ":filter /pat/ cmd" command modifier.  Only works for some
            commands right now.

https://github.com/vim/vim/commit/7b668e83d0635d082b7ec90d7d2aa30a9d7d8928
---
 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 cdd617e68c..a4125f9eac 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -200,7 +200,7 @@ static const int included_patches[] = {
   // 2247 NA
   // 2246,
   // 2245,
-  // 2244,
+  2244,
   // 2243 NA
   2242,
   2241,
-- 
cgit 


From f477c23c6282bffb8908f53592923e81443bac24 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 21:22:22 -0400
Subject: vim-patch:7.4.2245

Problem:    Filter test fails.
Solution:   Include missing changes.

https://github.com/vim/vim/commit/77401add71853d7a3da7ccc489f2a1bca58551ec
---
 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 a4125f9eac..c94e2b9f96 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -199,7 +199,7 @@ static const int included_patches[] = {
   2248,
   // 2247 NA
   // 2246,
-  // 2245,
+  2245,
   2244,
   // 2243 NA
   2242,
-- 
cgit 


From ab50c1fdb73aa58f620491d50c6fcd222d37cb9d Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 21:24:42 -0400
Subject: vim-patch:7.4.2246

Problem:    Oldfiles test fails.
Solution:   Include missing changes.

https://github.com/vim/vim/commit/d6f2ee32dcfa18c781ef157918b524318a2215a2
---
 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 c94e2b9f96..f2a97cf360 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -198,7 +198,7 @@ static const int included_patches[] = {
   2249,
   2248,
   // 2247 NA
-  // 2246,
+  2246,
   2245,
   2244,
   // 2243 NA
-- 
cgit 


From f219657453271f19519148d76536879bec044534 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 21:29:44 -0400
Subject: vim-patch:7.4.2263

Problem:    :filter does not work for many commands.  Can only get matching
            messages.
Solution:   Make :filter work for :command, :map, :list, :number and :print.
            Make ":filter!" show non-matching lines.

https://github.com/vim/vim/commit/d29459baa61819e59961804ed258efac5733ec70
---
 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 f2a97cf360..b579cdef12 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -181,7 +181,7 @@ static const int included_patches[] = {
   2266,
   2265,
   2264,
-  // 2263,
+  2263,
   // 2262 NA
   // 2261 NA
   // 2260 NA
-- 
cgit 


From 953f26bace041f481e79b67b64401aa07259055c Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 16 Nov 2016 09:24:10 -0500
Subject: vim-patch:7.4.1975

Problem:    On MS-Windows large files (> 2Gbyte) cause problems.
Solution:   Use "off_T" instead of "off_t".  Use "stat_T" instead of "struct
            stat".  Use 64 bit system functions if available.  (Ken Takata)

https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe

Only the off_T changes are relevant, since all the "struct stat" usage
is abstracted by libuv.
---
 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 b579cdef12..f48cd9f2a7 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -469,7 +469,7 @@ static const int included_patches[] = {
   // 1978,
   // 1977,
   // 1976,
-  // 1975,
+  1975,
   // 1974 NA
   1973,
   // 1972 NA
-- 
cgit 


From 81be7358be00d3d75453659bcdc7efc69207ca8e Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 16 Nov 2016 11:09:04 -0500
Subject: vim-patch:7.4.1976

Problem:    Number variables are not 64 bits while they could be.
Solution:   Add the num64 feature. (Ken Takata)

https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
---
 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 f48cd9f2a7..174ae2836c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -468,7 +468,7 @@ static const int included_patches[] = {
   // 1979,
   // 1978,
   // 1977,
-  // 1976,
+  1976,
   1975,
   // 1974 NA
   1973,
-- 
cgit 


From 481654a88bd184ed90b87607d6798865bcc375a3 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 16 Nov 2016 14:08:53 -0500
Subject: vim-patch:7.4.1977

Problem:    With 64 bit changes don't need three calls to sprintf().
Solution:   Simplify the code, use vim_snprintf(). (Ken Takata)

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

nvim already had the equivalent code, so only the patch number was
needed.
---
 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 174ae2836c..2e43670edb 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -467,7 +467,7 @@ static const int included_patches[] = {
   1980,
   // 1979,
   // 1978,
-  // 1977,
+  1977,
   1976,
   1975,
   // 1974 NA
-- 
cgit 


From 0164a5fea3a240efc631bc10ebf1b547c2149971 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 16 Nov 2016 14:11:15 -0500
Subject: vim-patch:7.4.1978

Problem:    Large file test does not delete its output.
Solution:   Delete the output. Check size properly when possible. (Ken Takata)

https://github.com/vim/vim/commit/c5af40ae646ceda817eff93b4f9ba274f031bea6
---
 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 2e43670edb..6838c476c1 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -466,7 +466,7 @@ static const int included_patches[] = {
   1981,
   1980,
   // 1979,
-  // 1978,
+  1978,
   1977,
   1976,
   1975,
-- 
cgit 


From 03f5f78792c578520139a785c0d3d34e284c372d Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 16 Nov 2016 14:12:13 -0500
Subject: vim-patch:7.4.1979

Problem:    Getting value of binary option is wrong. (Kent Sibilev)
Solution:   Fix type cast.  Add a test.

https://github.com/vim/vim/commit/2acfbed9dbea990f129535de7ff3df360365130b
---
 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 6838c476c1..fe8dd69fca 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -465,7 +465,7 @@ static const int included_patches[] = {
   // 1982 NA
   1981,
   1980,
-  // 1979,
+  1979,
   1978,
   1977,
   1976,
-- 
cgit 


From 9c01efd6fb7cc01b779ffb6d435f84e0a8e5f22d Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 16 Nov 2016 14:27:30 -0500
Subject: vim-patch:7.4.1986

Problem:    Compiler warns for loss of data.
Solution:   Use size_t instead of int. (Christian Brabandt)

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

Equivalent change had already been made when merging earlier pack
patches.
---
 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 fe8dd69fca..40cea51c58 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -458,7 +458,7 @@ static const int included_patches[] = {
   1989,
   // 1988 NA
   // 1987 NA
-  // 1986,
+  1986,
   // 1985 NA
   1984,
   // 1983 NA
-- 
cgit 


From c3efb2804a6bcf3b61695cd2b0c60bb16f1ec0a9 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 16 Nov 2016 14:30:20 -0500
Subject: vim-patch:7.4.2029

Problem:    printf() does not work with 64 bit numbers.
Solution:   use the "L" length modifier. (Ken Takata)

https://github.com/vim/vim/commit/38ee6b041e73ad31c3b6b99d56d20833b59b2b57
---
 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 40cea51c58..242b2c4b69 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -415,7 +415,7 @@ static const int included_patches[] = {
   // 2032 NA
   2031,
   // 2030 NA
-  // 2029,
+  2029,
   2028,
   // 2027 NA
   // 2026 NA
-- 
cgit 


From 55c93ea16438d6bacd287460e370a49c559af514 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 19 Apr 2017 23:32:47 -0400
Subject: vim-patch:7.4.2224

Problem:    Compiler warnings with older compiler and 64 bit numbers.
Solution:   Add "LL" to large values. (Mike Williams)

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

Equivalent change was made in ZyX's typval refactoring.
---
 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 242b2c4b69..804968af3d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -220,7 +220,7 @@ static const int included_patches[] = {
   2227,
   2226,
   2225,
-  // 2224,
+  2224,
   2223,
   2222,
   2221,
-- 
cgit 


From edced212db84a3b0348fe40e41b59492a9504132 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Thu, 23 Mar 2017 01:58:05 -0700
Subject: vim-patch:7.4.2360

Problem:    Invalid memory access when formatting. (Dominique Pelle)
Solution:   Make sure cursor line and column are associated.

https://github.com/vim/vim/commit/80c3fd7c559c7d329d57afe10db9bfb0adf10e46
---
 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 804968af3d..70fbf3a9e6 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -84,7 +84,7 @@ static const int included_patches[] = {
   // 2363 NA
   2362,
   // 2361 NA
-  // 2360,
+  2360,
   2359,
   // 2358 NA
   2357,
-- 
cgit 


From 6650588c4a89616249e964631dad17a66e1c6592 Mon Sep 17 00:00:00 2001
From: Shougo <Shougo.Matsu@gmail.com>
Date: Mon, 12 Jun 2017 07:44:21 +0900
Subject: vim-patch:7.4.2190 (#6882)

Problem:    When startup test fails it's not easy to find out why.
            GUI test fails with Gnome.
Solution:   Add the help entry matches to a list an assert that.
            Set $HOME for Gnome to create .gnome2 directory.

https://github.com/vim/vim/commit/50fa8dd00c241fa0786fe92ecc02fee4e5d28e06
---
 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 70fbf3a9e6..c8300e786e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -254,7 +254,7 @@ static const int included_patches[] = {
   // 2193 NA
   // 2192 NA
   // 2191 NA
-  // 2190,
+  2190,
   // 2189,
   2188,
   2187,
-- 
cgit 


From 694eb18e03a6a73321aafc19aa2f28104bdf3b8b Mon Sep 17 00:00:00 2001
From: Shougo <Shougo.Matsu@gmail.com>
Date: Mon, 19 Jun 2017 08:13:32 +0900
Subject: vim-patch:7.4.2356 (#6880)

Problem:    Reading past end of line when using previous substitute pattern.
            (Dominique Pelle)
Solution:   Don't set "pat" only set "searchstr".

https://github.com/vim/vim/commit/ea683da58cf9ecf3afab9d650d3d2da76e5298d3
---
 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 c8300e786e..a28dbcf061 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -88,7 +88,7 @@ static const int included_patches[] = {
   2359,
   // 2358 NA
   2357,
-  // 2356,
+  2356,
   2355,
   // 2354,
   2353,
-- 
cgit 


From 7955cf35158f56a207ece32127adece23fd0fba1 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Sat, 25 Mar 2017 14:09:31 +0100
Subject: vim-patch:7.4.2259

Problem:    With 'incsearch' can only see the next match.
Solution:   Make CTRL-N/CTRL-P move to the previous/next match. (Christian
            Brabandt)

https://github.com/vim/vim/commit/4d6f32cbfbaf324ac4a25c0206a5db0e9f7a48f7
---
 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 a28dbcf061..dceceb46ad 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -185,7 +185,7 @@ static const int included_patches[] = {
   // 2262 NA
   // 2261 NA
   // 2260 NA
-  // 2259,
+  2259,
   // 2258 NA
   // 2257 NA
   2256,
-- 
cgit 


From 0dd64556590633b2cab7cd846b28bbf5f7ef35d4 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sun, 25 Jun 2017 11:01:16 -0400
Subject: vim-patch:7.4.2268

Problem:    Using CTRL-N and CTRL-P for incsearch shadows completion keys.
Solution:   Use CTRL-T and CTRL-G instead.

https://github.com/vim/vim/commit/1195669f9e434fa9ab8b57ee9470bf951e4990b8
---
 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 dceceb46ad..23c2fac28a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -176,7 +176,7 @@ static const int included_patches[] = {
   // 2271 NA
   // 2270 NA
   2269,
-  // 2268,
+  2268,
   // 2267 NA
   2266,
   2265,
-- 
cgit 


From 3679752dbd9191f4067a43143da637478cc389f1 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sun, 25 Jun 2017 12:11:22 -0400
Subject: vim-patch:7.4.2318

Problem:    When 'incsearch' is not set CTRL-T and CTRL-G are not inserted as
            before.
Solution:   Move vim/vim#ifdef and don't use goto.

https://github.com/vim/vim/commit/349e7d94e6bbb253bb87adad9039f095128ab543
---
 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 23c2fac28a..5a107f0023 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -126,7 +126,7 @@ static const int included_patches[] = {
   2321,
   // 2320,
   // 2319 NA
-  // 2318,
+  2318,
   2317,
   // 2316 NA
   2315,
-- 
cgit 


From 54d5e90a2b87736a3248300ed423374e88ce8e79 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sun, 25 Jun 2017 12:15:58 -0400
Subject: vim-patch:7.4.2320

Problem:    Redraw problem when using 'incsearch'.
Solution:   Save the current view when deleting characters. (Christian
            Brabandt) Fix that the '" mark is set in the wrong position. Don't
            change the search start when using BS.

https://github.com/vim/vim/commit/dda933d06c06c2792bd686d059f6ad19191ad30b
---
 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 5a107f0023..094ca29b01 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -124,7 +124,7 @@ static const int included_patches[] = {
   2323,
   2322,
   2321,
-  // 2320,
+  2320,
   // 2319 NA
   2318,
   2317,
-- 
cgit 


From b4ccf5c20a41ea4d4bfeb636259553c8e55cb911 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Sun, 11 Jun 2017 18:35:16 +0900
Subject: vim-patch:7.4.2354

Problem:    The example that explains nested backreferences does not work
            properly with the new regexp engine. (Harm te Hennepe)
Solution:   Also save the end position when adding a state. (closes vim/vim#990)

https://github.com/vim/vim/commit/d563883a1fb5ec6cf4a2758c5e36ac1ff4e9bb3d
---
 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 094ca29b01..0713684303 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -90,7 +90,7 @@ static const int included_patches[] = {
   2357,
   2356,
   2355,
-  // 2354,
+  2354,
   2353,
   // 2352 NA
   // 2351 NA
-- 
cgit 


From 04de6a64e2f7b3b235acd4ab779bfed30e59451f Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Fri, 7 Jul 2017 14:57:50 +0800
Subject: vim-patch:7.4.2189

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

Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Aug 9 22:14:05 2016 +0200

    patch 7.4.2189
    Problem:    Cannot detect encoding in a fifo.
    Solution:   Extend the stdin way of detecting encoding to fifo.  Add a test
                for detecting encoding on stdin and fifo. (Ken Takata)
---
 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 0713684303..ec4a804f2e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -255,7 +255,7 @@ static const int included_patches[] = {
   // 2192 NA
   // 2191 NA
   2190,
-  // 2189,
+  2189,
   2188,
   2187,
   // 2186 NA
-- 
cgit 


From 2999d7c0e89087f76711e914eb65af55578a6691 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Mon, 10 Jul 2017 07:58:40 +0800
Subject: vim-patch:7.4.2229

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

Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Aug 20 15:05:39 2016 +0200

    patch 7.4.2229
    Problem:    Startup test fails on Solaris.
    Solution:   Recognize a character device. (Danek Duvall)
---
 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 ec4a804f2e..09ee23e58f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -215,7 +215,7 @@ static const int included_patches[] = {
   // 2232 NA
   2231,
   2230,
-  // 2229,
+  2229,
   2228,
   2227,
   2226,
-- 
cgit 


From c805f2cf54aa4ab066bb9e7f3d5b7cc40d04004e Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Mon, 10 Jul 2017 08:55:54 +0800
Subject: vim-patch:7.4.2250

Problem:    Some error message cannot be translated.
Solution:   Enclose them in _() and N_(). (Dominique Pelle)

https://github.com/vim/vim/commit/5b30291785e6b9be1a607504c14bd03c601b59a6
---
 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 0713684303..a1a06f0e7c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -194,7 +194,7 @@ static const int included_patches[] = {
   // 2253 NA
   // 2252 NA
   2251,
-  // 2250,
+  2250,
   2249,
   2248,
   // 2247 NA
-- 
cgit 


From 06ec15121a4da439684cfa1909d920c3f22f2894 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 8 Apr 2017 22:50:50 -0400
Subject: Bump Vim version to 8.0 and applied patches

---
 src/nvim/version.c | 2860 +++++++++++-----------------------------------------
 1 file changed, 572 insertions(+), 2288 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 5f83dd1fd0..75b09bcee7 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -77,2372 +77,656 @@ static char *features[] = {
 
 // clang-format off
 static const int included_patches[] = {
-  // 2367,NA
-  // 2366 NA
-  // 2365 NA
-  // 2364,NA
-  // 2363 NA
-  2362,
-  // 2361 NA
-  2360,
-  2359,
-  // 2358 NA
-  2357,
-  2356,
-  2355,
-  2354,
-  2353,
-  // 2352 NA
-  // 2351 NA
-  // 2350,
-  2349,
-  2348,
-  2347,
-  2346,
-  // 2345 NA
-  // 2344 NA
-  2343,
-  // 2342 NA
-  2341,
-  // 2340 NA
-  2339,
-  // 2338 NA
-  2337,
-  2336,
-  2335,
-  2334,
-  2333,
-  2332,
-  2331,
-  2330,
-  2329,
-  2328,
-  // 2327 NA
-  2326,
-  // 2325 NA
-  2324,
-  2323,
-  2322,
-  2321,
-  2320,
-  // 2319 NA
-  2318,
-  2317,
-  // 2316 NA
-  2315,
-  2314,
-  2313,
-  2312,
-  // 2311 NA
-  // 2310 NA
-  2309,
-  // 2308 NA
-  2307,
-  2306,
-  2305,
-  2304,
-  2303,
-  // 2302 NA
-  // 2301 NA
-  2300,
-  2299,
-  // 2298 NA
-  // 2297 NA
-  2296,
-  2295,
-  2294,
-  2293,
-  2292,
-  2291,
-  // 2290 NA
-  // 2289 NA
-  // 2288 NA
-  // 2287 NA
-  // 2286 NA
-  // 2285 NA
-  2284,
-  2283,
-  // 2282 NA
-  2281,
-  2280,
-  2279,
-  // 2278 NA
-  2277,
-  2276,
-  2275,
-  2274,
-  2273,
-  2272,
-  // 2271 NA
-  // 2270 NA
-  2269,
-  2268,
-  // 2267 NA
-  2266,
-  2265,
-  2264,
-  2263,
-  // 2262 NA
-  // 2261 NA
-  // 2260 NA
-  2259,
-  // 2258 NA
-  // 2257 NA
-  2256,
-  2255,
-  // 2254 NA
-  // 2253 NA
-  // 2252 NA
-  2251,
-  2250,
-  2249,
-  2248,
-  // 2247 NA
-  2246,
-  2245,
-  2244,
-  // 2243 NA
-  2242,
-  2241,
-  2240,
-  2239,
-  // 2238 NA
-  2237,
-  2236,
-  2235,
-  // 2234 NA
-  2233,
-  // 2232 NA
-  2231,
-  2230,
-  2229,
-  2228,
-  2227,
-  2226,
-  2225,
-  2224,
-  2223,
-  2222,
-  2221,
-  2220,
-  2219,
-  // 2218 NA
-  2217,
-  // 2216 NA
-  2215,
-  // 2214 NA
-  2213,
-  2212,
-  // 2211 NA
-  // 2210 NA
-  2209,
-  2208,
-  // 2207 NA
-  // 2206 NA
-  2205,
-  2204,
-  // 2203 NA
-  // 2202 NA
-  2201,
-  2200,
-  // 2199 NA
-  // 2198 NA
-  2197,
-  2196,
-  // 2195 NA
-  2194,
-  // 2193 NA
-  // 2192 NA
-  // 2191 NA
-  2190,
-  2189,
-  2188,
-  2187,
-  // 2186 NA
-  2185,
-  2184,
-  2183,
-  // 2182 NA
-  // 2181 NA
-  2180,
-  2179,
-  2178,
-  2177,
-  // 2176 NA
-  2175,
-  2174,
-  2173,
-  2172,
-  // 2171 NA
-  2170,
-  2169,
-  // 2168 NA
-  // 2167 NA
-  // 2166 NA
-  2165,
-  2164,
-  2163,
-  2162,
-  2161,
-  2160,
-  2159,
-  2158,
-  // 2157 NA
-  // 2156 NA
-  // 2155 NA
-  // 2154 NA
-  // 2153 NA
-  2152,
-  2151,
-  // 2150 NA
-  2149,
-  2148,
-  2147,
-  2146,
-  // 2145 NA
-  2144,
-  2143,
-  2142,
-  2141,
-  // 2140 NA
-  2139,
-  // 2138 NA
-  2137,
-  2136,
-  2135,
-  2134,
-  // 2133 NA
-  // 2132 NA
-  // 2131 NA
-  // 2130 NA
-  // 2129 NA
-  2128,
-  2127,
-  2126,
-  // 2125 NA
-  2124,
-  2123,
-  // 2122 NA
-  2121,
-  2120,
-  2119,
-  // 2118 NA
-  2117,
-  // 2116 NA
-  // 2115 NA
-  // 2114 NA
-  2113,
-  2112,
-  // 2111 NA
-  2110,
-  2109,
-  // 2108 NA
-  2107,
-  2106,
-  // 2105 NA
-  2104,
-  2103,
-  // 2102 NA
-  2101,
-  2100,
-  2099,
-  2098,
-  2097,
-  2096,
-  2095,
-  // 2094 NA
-  // 2093 NA
-  // 2092 NA
-  // 2091 NA
-  2090,
-  // 2089 NA
-  2088,
-  2087,
-  2086,
-  2085,
-  2084,
-  // 2083 NA
-  2082,
-  2081,
-  // 2080 NA
-  // 2079 NA
-  // 2078 NA
-  2077,
-  2076,
-  2075,
-  2074,
-  // 2073 NA
-  2072,
-  2071,
-  // 2070 NA
-  2069,
-  2068,
-  2067,
-  2066,
-  2065,
-  2064,
-  // 2063 NA
-  2062,
-  2061,
-  // 2060 NA
-  // 2059 NA
-  // 2058 NA
-  // 2057 NA
-  // 2056 NA
-  // 2055 NA
-  // 2054 NA
-  // 2053 NA
-  // 2052 NA
-  2051,
-  2050,
-  2049,
-  // 2048 NA
-  2047,
-  2046,
-  // 2045 NA
-  2044,
-  2043,
-  // 2042 NA
-  // 2041 NA
-  // 2040 NA
-  // 2039 NA
-  // 2038 NA
-  // 2037 NA
-  2036,
-  // 2035 NA
-  // 2034 NA
-  2033,
-  // 2032 NA
-  2031,
-  // 2030 NA
-  2029,
-  2028,
-  // 2027 NA
-  // 2026 NA
-  // 2025 NA
-  2024,
-  2023,
-  2022,
-  2021,
-  // 2020 NA
-  2019,
-  2018,
-  2017,
-  // 2016 NA
-  2015,
-  2014,
-  2013,
-  2012,
-  2011,
-  2010,
-  2009,
-  2008,
-  2007,
-  2006,
-  2005,
-  // 2004 NA
-  // 2003 NA
-  2002,
-  // 2001 NA
-  2000,
-  1999,
-  // 1998 NA
-  1997,
-  1996,
-  // 1995 NA
-  1994,
-  1993,
-  1992,
-  1991,
-  1990,
-  1989,
-  // 1988 NA
-  // 1987 NA
-  1986,
-  // 1985 NA
-  1984,
-  // 1983 NA
-  // 1982 NA
-  1981,
-  1980,
-  1979,
-  1978,
-  1977,
-  1976,
-  1975,
-  // 1974 NA
-  1973,
-  // 1972 NA
-  1971,
-  1970,
-  // 1969 NA
-  1968,
-  1967,
-  1966,
-  // 1965 NA
-  1964,
-  // 1963 NA
-  1962,
-  1961,
-  1960,
-  // 1959 NA
-  // 1958 NA
-  // 1957 NA
-  1956,
-  // 1955 NA
-  1954,
-  1953,
-  1952,
-  // 1951 NA
-  1950,
-  1949,
-  1948,
-  // 1947 NA
-  // 1946 NA
-  // 1945 NA
-  // 1944 NA
-  // 1943 NA
-  // 1942 NA
-  1941,
-  1940,
-  // 1939 NA
-  // 1938 NA
-  1937,
-  // 1936 NA
-  // 1935 NA
-  // 1934 NA
-  // 1933 NA
-  // 1932 NA
-  // 1931 NA
-  // 1930 NA
-  // 1929 NA
-  1928,
-  // 1927 NA
-  // 1926 NA
-  1925,
-  // 1924 NA
-  1923,
-  // 1922 NA
-  // 1921 NA
-  // 1920 NA
-  // 1919 NA
-  // 1918 NA
-  // 1917 NA
-  // 1916 NA
-  // 1915 NA
-  // 1914 NA
-  1913,
-  1912,
-  // 1911 NA
-  1910,
-  1909,
-  // 1908 NA
-  // 1907 NA
-  // 1906 NA
-  // 1905 NA
-  // 1904 NA
-  // 1903 NA
-  // 1902 NA
-  // 1901 NA
-  1900,
-  // 1899 NA
-  1898,
-  1897,
-  1896,
-  1895,
-  1894,
-  1893,
-  1892,
-  // 1891 NA
-  // 1890 NA
-  1889,
-  // 1888 NA
-  // 1887 NA
-  // 1886 NA
-  // 1885 NA
-  1884,
-  // 1883 NA
-  1882,
-  1881,
-  // 1880 NA
-  // 1879 NA
-  // 1878 NA
-  // 1877 NA
-  1876,
-  1875,
-  // 1874 NA
-  // 1873 NA
-  // 1872 NA
-  1871,
-  // 1870 NA
-  // 1869 NA
-  1868,
-  1867,
-  1866,
-  // 1865 NA
-  // 1864 NA
-  // 1863 NA
-  // 1862 NA
-  1861,
-  1860,
-  // 1859 NA
-  // 1858 NA
-  // 1857 NA
-  // 1856 NA
-  // 1855 NA
-  // 1854 NA
-  // 1853 NA
-  // 1852 NA
-  1851,
-  // 1850 NA
-  // 1849 NA
-  // 1848 NA
-  1847,
-  // 1846 NA
-  // 1845 NA
-  // 1844 NA
-  // 1843 NA
-  1842,
-  1841,
-  1840,
-  1839,
-  1838,
-  1837,
-  1836,
-  1835,
-  1834,
-  1833,
-  1832,
-  1831,
-  // 1830 NA
-  // 1829 NA
-  // 1828 NA
-  // 1827 NA
-  // 1826 NA
-  // 1825 NA
-  // 1824 NA
-  1823,
-  // 1822 NA
-  1821,
-  1820,
-  // 1819 NA
-  1818,
-  // 1817 NA
-  1816,
-  1815,
-  // 1814 NA
-  1813,
-  // 1812 NA
-  // 1811 NA
-  // 1810 NA
-  1809,
-  1808,
-  // 1807 NA
-  1806,
-  // 1805 NA
-  // 1804 NA
-  // 1803 NA
-  1802,
-  // 1801 NA
-  // 1800 NA
-  1799,
-  // 1798 NA
-  // 1797 NA
-  // 1796 NA
-  // 1795 NA
-  // 1794 NA
-  1793,
-  // 1792 NA
-  // 1791 NA
-  // 1790 NA
-  // 1789 NA
-  // 1789 NA
-  // 1788 NA
-  // 1787 NA
-  // 1786 NA
-  1785,
-  // 1784 NA
-  1783,
-  1782,
-  1781,
-  1780,
-  1779,
-  // 1778 NA
-  // 1777 NA
-  // 1776 NA
-  // 1775 NA
-  // 1774 NA
-  // 1773 NA
-  // 1772 NA
-  // 1771 NA
-  // 1770 NA
-  // 1769 NA
-  1768,
-  // 1767 NA
-  // 1766 NA
-  1765,
-  // 1764 NA
-  1763,
-  // 1762 NA
-  // 1761 NA
-  // 1760 NA
-  1759,
-  1758,
-  1757,
-  // 1756 NA
-  1755,
-  1754,
-  1753,
-  1752,
-  1751,
-  // 1750 NA
-  // 1749 NA
-  1748,
-  // 1747 NA
-  // 1746 NA
-  // 1745 NA
-  // 1744 NA
-  // 1743 NA
-  1742,
-  1741,
-  1740,
-  1739,
-  1738,
-  // 1737 NA
-  // 1736 NA
-  1735,
-  1734,
-  // 1733 NA
-  1732,
-  // 1731 NA
-  1730,
-  // 1729 NA
-  1728,
-  1727,
-  // 1726 NA
-  // 1725 NA
-  // 1724 NA
-  1723,
-  // 1722 NA
-  // 1721 NA
-  // 1720 NA
-  1719,
-  1718,
-  // 1717 NA
-  1716,
-  1715,
-  1714,
-  // 1713 NA
-  1712,
-  1711,
-  // 1710 NA
-  // 1709 NA
-  1708,
-  1707,
-  // 1706 NA
-  // 1705 NA
-  1704,
-  1703,
-  1702,
-  1701,
-  1700,
-  1699,
-  // 1698 NA
-  1697,
-  1696,
-  1695,
-  // 1694 NA
-  // 1693 NA
-  1692,
-  1691,
-  // 1690 NA
-  // 1689 NA
-  // 1688 NA
-  // 1687 NA
-  1686,
-  1685,
-  // 1684 NA
-  // 1683 NA
-  1682,
-  1681,
-  // 1680 NA
-  1679,
-  // 1678 NA
-  // 1677 NA
-  1676,
-  1675,
-  // 1674 NA
-  1673,
-  // 1672 NA
-  1671,
-  1670,
-  // 1669 NA
-  // 1668 NA
-  // 1667 NA
-  // 1666 NA
-  // 1665 NA
-  1664,
-  1663,
-  // 1662 NA
-  // 1661 NA
-  1660,
-  // 1659 NA
-  1658,
-  // 1657 NA
-  1656,
-  // 1655 NA
-  1654,
-  // 1653 NA
-  1652,
-  // 1651 NA
-  1650,
-  1649,
-  1648,
-  1647,
-  // 1646 NA
-  1645,
-  // 1644 NA
-  1643,
-  1642,
-  1641,
-  1640,
-  1639,
-  1638,
-  // 1637 NA
-  // 1636 NA
-  // 1635 NA
-  1634,
-  // 1633 NA
-  // 1632 NA
-  // 1631 NA
-  1630,
-  1629,
-  // 1628 NA
-  // 1627 NA
-  // 1626 NA
-  // 1625 NA
-  // 1624 NA
-  // 1623 NA
-  // 1622 NA
-  // 1621 NA
-  1620,
-  1619,
-  // 1618 NA
-  // 1617 NA
-  // 1616 NA
-  // 1615 NA
-  1614,
-  // 1613 NA
-  // 1612 NA
-  // 1611 NA
-  // 1610 NA
-  // 1609 NA
-  1608,
-  1607,
-  1606,
-  1605,
-  1604,
-  1603,
-  // 1602 NA
-  // 1601 NA
-  // 1600 NA
-  // 1599 NA
-  // 1598 NA
-  // 1597 NA
-  1596,
-  // 1595 NA
-  // 1594 NA
-  // 1593 NA
-  1592,
-  1591,
-  1590,
-  1589,
-  1588,
-  // 1587 NA
-  1586,
-  1585,
-  // 1584 NA
-  // 1583 NA
-  1582,
-  1581,
-  1580,
-  // 1579 NA
-  1578,
-  1577,
-  1576,
-  // 1575 NA
-  1574,
-  // 1573 NA
-  // 1572 NA
-  1571,
-  1570,
-  1569,
-  1568,
-  1567,
-  // 1566 NA
-  1565,
-  1564,
-  1563,
-  // 1562 NA
-  // 1561 NA
-  // 1560 NA
-  1559,
-  1558,
-  1557,
-  // 1556 NA
-  // 1555 NA
-  1554,
-  1553,
-  1552,
-  1551,
-  1550,
-  1549,
-  1548,
-  1547,
-  1546,
-  // 1545 NA
-  // 1544 NA
-  // 1543 NA
-  // 1542 NA
-  // 1541 NA
-  // 1540 NA
-  // 1539 NA
-  // 1538 NA
-  // 1537 NA
-  // 1536 NA
-  1535,
-  // 1534 NA
-  1533,
-  // 1532 NA
-  // 1531 NA
-  // 1530 NA
-  // 1529 NA
-  1528,
-  // 1527 NA
-  // 1526 NA
-  // 1525 NA
-  // 1524 NA
-  // 1523 NA
-  // 1522 NA
-  1521,
-  // 1520 NA
-  // 1519 NA
-  // 1518 NA
-  // 1517 NA
-  1516,
-  // 1515 NA
-  // 1514 NA
-  1513,
-  // 1512 NA
-  1511,
-  // 1510 NA
-  // 1509 NA
-  // 1508 NA
-  // 1507 NA
-  // 1506 NA
-  // 1505 NA
-  // 1504 NA
-  // 1503 NA
-  // 1502 NA
-  // 1501 NA
-  1500,
-  1499,
-  // 1498 NA
-  // 1497 NA
-  // 1496 NA
-  // 1495 NA
-  1494,
-  // 1493 NA
-  1492,
-  1491,
-  // 1490 NA
-  // 1489 NA
-  // 1488 NA
-  // 1487 NA
-  1486,
-  // 1485 NA
-  // 1484 NA
-  // 1483 NA
-  // 1482 NA
-  // 1481 NA
-  1480,
-  1479,
-  1478,
-  1477,
-  // 1476 NA
-  // 1475 NA
-  // 1474 NA
-  // 1473 NA
-  // 1472 NA
-  // 1471 NA
-  // 1470 NA
-  // 1469 NA
-  1468,
-  // 1467 NA
-  // 1466 NA
-  // 1465 NA
-  1464,
-  // 1463 NA
-  // 1462 NA
-  // 1461 NA
-  // 1460 NA
-  // 1459 NA
-  // 1458 NA
-  // 1457 NA
-  // 1456 NA
-  // 1455 NA
-  // 1454 NA
-  // 1453 NA
-  // 1452 NA
-  // 1451 NA
-  // 1450 NA
-  // 1449 NA
-  // 1448 NA
-  // 1447 NA
-  // 1446 NA
-  // 1445 NA
-  // 1444 NA
-  // 1443 NA
-  // 1442 NA
-  // 1441 NA
-  // 1440 NA
-  // 1439 NA
-  // 1438 NA
-  // 1437 NA
-  // 1436 NA
-  // 1435 NA
-  // 1434 NA
-  // 1433 NA
-  // 1432 NA
-  // 1431 NA
-  // 1430 NA
-  // 1429 NA
-  // 1428 NA
-  // 1427 NA
-  // 1426 NA
-  1425,
-  // 1424 NA
-  // 1423 NA
-  // 1422 NA
-  // 1421 NA
-  // 1420 NA
-  // 1419 NA
-  // 1418 NA
-  // 1417 NA
-  // 1416 NA
-  // 1415 NA
-  // 1414 NA
-  // 1413 NA
-  // 1412 NA
-  // 1411 NA
-  1410,
-  // 1409 NA
-  // 1408 NA
-  // 1407 NA
-  1406,
-  1405,
-  // 1404 NA
-  // 1403 NA
-  // 1402 NA
-  1401,
-  // 1400 NA
-  // 1399 NA
-  // 1398 NA
-  1397,
-  1396,
-  // 1395 NA
-  1394,
-  // 1393 NA
-  // 1392 NA
-  // 1391 NA
-  // 1390 NA
-  // 1389 NA
-  1388,
-  // 1387 NA
-  // 1386 NA
-  // 1385 NA
-  1384,
-  // 1383 NA
-  // 1382 NA
-  // 1381 NA
-  // 1380 NA
-  // 1379 NA
-  // 1378 NA
-  // 1377 NA
-  // 1376 NA
-  // 1375 NA
-  // 1374 NA
-  // 1373 NA
-  // 1372 NA
-  // 1371 NA
-  // 1370 NA
-  // 1369 NA
-  // 1368 NA
-  // 1367 NA
-  1366,
-  1365,
-  // 1364 NA
-  // 1363 NA
-  // 1362 NA
-  // 1361 NA
-  // 1360 NA
-  // 1359 NA
-  // 1358 NA
-  // 1357 NA
-  // 1356 NA
-  // 1355 NA
-  // 1354 NA
-  // 1353 NA
-  1352,
-  // 1351 NA
-  // 1350 NA
-  // 1349 NA
-  // 1348 NA
-  1347,
-  1346,
-  // 1345 NA
-  // 1344 NA
-  // 1343 NA
-  // 1342 NA
-  // 1341 NA
-  // 1340 NA
-  // 1339 NA
-  // 1338 NA
-  // 1337 NA
-  // 1336 NA
-  // 1335 NA
-  // 1334 NA
-  // 1333 NA
-  // 1332 NA
-  // 1331 NA
-  // 1330 NA
-  // 1329 NA
-  // 1328 NA
-  // 1327 NA
-  // 1326 NA
-  // 1325 NA
-  // 1324 NA
-  // 1323 NA
-  // 1322 NA
-  // 1321 NA
-  // 1320 NA
-  // 1319 NA
-  // 1318 NA
-  // 1317 NA
-  // 1316 NA
-  // 1315 NA
-  // 1314 NA
-  // 1313 NA
-  // 1312 NA
-  // 1311 NA
-  // 1310 NA
-  1309,
-  // 1308 NA
-  // 1307 NA
-  // 1306 NA
-  1305,
-  1304,
-  // 1303 NA
-  // 1302 NA
-  // 1301 NA
-  // 1300 NA
-  // 1299 NA
-  // 1298 NA
-  // 1297 NA
-  1296,
-  // 1295 NA
-  // 1294 NA
-  // 1293 NA
-  1292,
-  // 1291 NA
-  // 1290 NA
-  // 1289 NA
-  // 1288 NA
-  // 1287 NA
-  // 1286 NA
-  1285,
-  1284,
-  // 1283 NA
-  1282,
-  1281,
-  // 1280 NA
-  // 1279 NA
-  // 1278 NA
-  // 1277 NA
-  1276,
-  // 1275 NA
-  // 1274 NA
-  // 1273 NA
-  // 1272 NA
-  1271,
-  // 1270 NA
-  1269,
-  // 1268 NA
-  1267,
-  1266,
-  // 1265 NA
-  // 1264 NA
-  // 1263 NA
-  // 1262 NA
-  // 1261 NA
-  // 1260 NA
-  1259,
-  // 1258 NA
-  // 1257 NA
-  // 1256 NA
-  // 1255 NA
-  // 1254 NA
-  // 1253 NA
-  // 1252 NA
-  // 1251 NA
-  // 1250 NA
-  // 1249 NA
-  // 1248 NA
-  // 1247 NA
-  // 1246 NA
-  // 1245 NA
-  // 1244 NA
-  // 1243 NA
-  // 1242 NA
-  // 1241 NA
-  // 1240 NA
-  // 1239 NA
-  // 1238 NA
-  1237,
-  1236,
-  // 1235 NA
-  // 1234 NA
-  // 1233 NA
-  // 1232 NA
-  // 1231 NA
-  // 1230 NA
-  // 1229 NA
-  1228,
-  // 1227 NA
-  // 1226 NA
-  // 1225 NA
-  // 1224 NA
-  1223,
-  // 1222 NA
-  // 1221 NA
-  // 1220 NA
-  // 1219 NA
-  // 1218 NA
-  // 1217 NA
-  // 1216 NA
-  // 1215 NA
-  // 1214 NA
-  // 1213 NA
-  // 1212 NA
-  // 1211 NA
-  // 1210 NA
-  // 1209 NA
-  // 1208 NA
-  // 1207 NA
-  // 1206 NA
-  // 1205 NA
-  // 1204 NA
-  // 1203 NA
-  // 1202 NA
-  // 1201 NA
-  // 1200 NA
-  // 1199 NA
-  // 1198 NA
-  // 1197 NA
-  // 1196 NA
-  // 1195 NA
-  // 1194 NA
-  // 1193 NA
-  // 1192 NA
-  // 1191 NA
-  // 1190 NA
-  // 1189 NA
-  // 1188 NA
-  // 1187 NA
-  // 1186 NA
-  // 1185 NA
-  // 1184 NA
-  // 1183 NA
-  // 1182 NA
-  1181,
-  1180,
-  1179,
-  1178,
-  // 1177 NA
-  // 1176 NA
-  // 1175 NA
-  // 1174 NA
-  1173,
-  // 1172 NA
-  // 1171 NA
-  // 1170 NA
-  // 1169 NA
-  1168,
-  1167,
-  1166,
-  // 1165 NA
-  1164,
-  1163,
-  // 1162 NA
-  1161,
-  1160,
-  // 1159 NA
-  // 1158 NA
-  1157,
-  // 1156 NA
-  // 1155 NA
-  // 1154 NA
-  1153,
-  // 1152 NA
-  1151,
-  1150,
-  1149,
-  // 1148 NA
-  1147,
-  // 1146 NA
-  // 1145 NA
-  1144,
-  1143,
-  1142,
-  1141,
-  1140,
-  // 1139 NA
-  // 1138 NA
-  1137,
-  1136,
-  // 1135 NA
-  // 1134 NA
-  // 1133 NA
-  1132,
-  // 1131 NA
-  // 1130 NA
-  // 1129 NA
-  // 1128 NA
-  // 1127 NA
-  1126,
-  // 1125 NA
-  // 1124 NA
-  1123,
-  // 1122 NA
-  1121,
-  1120,
-  1119,
-  1118,
-  1117,
-  1116,
-  // 1115 NA
-  1114,
-  1113,
-  1112,
-  1111,
-  1110,
-  // 1109 NA
-  1108,
-  1107,
-  // 1106 NA
-  1105,
-  // 1104 NA
-  // 1103 NA
-  1102,
-  1101,
-  // 1100 NA
-  // 1099 NA
-  // 1098 NA
-  // 1097 NA
-  1096,
-  // 1095 NA
-  1094,
-  1093,
-  1092,
-  1091,
-  1090,
-  1089,
-  1088,
-  1087,
-  1086,
-  1085,
-  1084,
-  // 1083 NA
-  // 1082 NA
-  1081,
-  // 1080 NA
-  // 1079 NA
-  // 1078 NA
-  // 1077 NA
-  1076,
-  1075,
-  // 1074 NA
-  // 1073 NA
-  1072,
-  1071,
-  // 1070 NA
-  // 1069 NA
-  1068,
-  // 1067 NA
-  // 1066 NA
-  1065,
-  1064,
-  // 1063 NA
-  // 1062 NA
-  1061,
-  // 1060 NA
-  1059,
-  // 1058 NA
-  1057,
-  1056,
-  1055,
-  1054,
-  1053,
-  1052,
-  1051,
-  1050,
-  1049,
-  1048,
-  1047,
-  1046,
-  // 1045 NA
-  // 1044 NA
-  // 1043 NA
-  1042,
-  1041,
-  // 1040 NA
-  // 1039 NA
-  // 1038 NA
-  1037,
-  1036,
-  1035,
-  1034,
-  // 1033 NA
-  1032,
-  // 1031 NA
-  1030,
-  1029,
-  // 1028 NA
-  1027,
-  // 1026 NA
-  // 1025 NA
-  // 1024 NA
-  // 1023 NA
-  // 1022 NA
-  // 1021 NA
-  // 1020 NA
-  // 1019 NA
-  1018,
-  1017,
-  // 1016 NA
-  1015,
-  // 1014 NA
-  1013,
-  // 1012 NA
-  // 1011 NA
-  // 1010 NA
-  // 1009 NA
-  // 1008 NA
-  1007,
-  1006,
-  // 1005 NA
-  // 1004 NA
-  // 1003 NA
-  // 1002 NA
-  1001,
-  1000,
-  // 999 NA
-  998,
-  // 997 NA
-  // 996 NA
-  // 995 NA
-  // 994 NA
-  // 993 NA
-  // 992 NA
-  991,
-  // 990 NA
-  989,
-  // 988 NA
-  // 987 NA
-  // 986 NA
-  // 985 NA
-  984,
-  // 983 NA
-  // 982 NA
-  981,
-  980,
-  // 979 NA
-  978,
-  977,
-  // 976 NA
-  975,
-  974,
-  973,
-  972,
-  // 971 NA
-  // 970 NA
-  // 969 NA
-  // 968 NA
-  // 967 NA
-  // 966 NA
-  // 965 NA
-  // 964 NA
-  963,
-  // 962 NA
-  961,
-  // 960 NA
-  // 959 NA
-  958,
-  957,
-  // 956 NA
-  955,
-  // 954 NA
-  953,
-  952,
-  951,
-  950,
-  949,
-  // 948 NA
-  // 947 NA
-  946,
-  945,
-  944,
-  // 943 NA
-  942,
-  941,
-  // 940 NA
-  939,
-  // 938 NA
-  937,
-  936,
-  // 935 NA
-  // 934 NA
-  933,
-  932,
-  // 931 NA
-  // 930 NA
-  929,
-  // 928 NA
-  // 927 NA
-  926,
-  925,
-  // 924 NA
-  // 923 NA
-  922,
-  // 921 NA
-  // 920 NA
-  // 919 NA
-  // 918 NA
-  // 917 NA
-  916,
-  915,
-  // 914 NA
-  // 913 NA
-  912,
-  // 911 NA
-  // 910 NA
-  // 909 NA
-  // 908 NA
-  // 907 NA
-  // 906 NA
-  // 905 NA
-  904,
-  903,
-  // 902 NA
-  901,
-  // 900 NA
-  // 899 NA
-  898,
-  // 897 NA
-  896,
-  895,
-  // 894 NA
-  893,
-  // 892 NA
-  891,
-  // 890 NA
-  889,
-  888,
-  887,
-  // 886 NA
-  885,
-  // 884 NA
-  883,
-  882,
-  881,
-  // 880 NA
-  879,
-  878,
-  877,
-  // 876 NA
-  // 875 NA
-  // 874 NA
-  // 873 NA
-  // 872 NA
-  871,
-  870,
-  // 869 NA
-  868,
-  // 867 NA
-  // 866 NA
-  // 865 NA
-  // 864 NA
-  // 863 NA
-  // 862 NA
-  // 861 NA
-  // 860 NA
-  859,
-  858,
-  857,
-  856,
-  // 855 NA
-  // 854 NA
-  853,
-  // 852 NA
-  // 851 NA
-  // 850 NA
-  849,
-  848,
-  847,
-  // 846 NA
-  845,
-  844,
-  843,
-  // 842 NA
-  // 841 NA
-  // 840 NA
-  // 839 NA
-  // 838 NA
-  // 837 NA
-  836,
-  835,
-  834,
-  833,
-  832,
-  831,
-  830,
-  // 829 NA
-  828,
-  // 827 NA
-  826,
-  825,
-  // 824 NA
-  823,
-  822,
-  // 821 NA
-  820,
-  819,
-  818,
-  817,
-  816,
-  815,
-  814,
-  813,
-  // 812 NA
-  811,
-  810,
-  809,
-  // 808 NA
-  807,
-  806,
-  805,
-  // 804 NA
-  803,
-  802,
-  801,
-  800,
-  799,
-  798,
-  // 797 NA
-  // 796 NA
-  795,
-  // 794 NA
-  793,
-  792,
-  791,
-  790,
-  789,
-  // 788 NA
-  787,
-  786,
-  785,
-  784,
-  // 783 NA
-  782,
-  781,
-  780,
-  779,
-  778,
-  // 777 NA
-  776,
-  775,
-  774,
-  773,
-  // 772 NA
-  771,
-  // 770 NA
-  769,
-  768,
-  // 767 NA
-  // 766 NA
-  765,
-  764,
-  // 763 NA
-  // 762 NA
-  // 761 NA
-  760,
-  // 759 NA
-  758,
-  // 757 NA
-  // 756 NA
-  755,
-  754,
-  753,
-  // 752 NA
-  // 751 NA
-  // 750 NA
-  749,
-  748,
-  747,
-  746,
-  745,
-  // 744 NA
-  743,
-  742,
-  741,
-  740,
-  739,
-  // 738 NA
-  737,
-  736,
-  // 735 NA
-  734,
-  // 733 NA
-  732,
-  // 731 NA
-  // 730 NA
-  729,
-  // 728 NA
-  // 727 NA
-  // 726 NA
-  // 725 NA
-  // 724 NA
-  723,
-  722,
-  721,
-  // 720 NA
-  719,
-  718,
-  717,
-  716,
-  715,
-  714,
-  713,
-  712,
-  711,
-  710,
-  709,
-  708,
-  707,
-  706,
-  // 705 NA
-  704,
-  // 703 NA
-  702,
-  // 701 NA
-  700,
-  699,
-  698,
-  697,
-  696,
-  695,
-  694,
-  693,
-  // 692 NA
-  // 691 NA
-  690,
-  689,
-  688,
-  // 687 NA
-  686,
-  685,
-  // 684 NA
-  // 683 NA
-  682,
-  // 681 NA
-  680,
-  // 679 NA
-  // 678 NA
-  // 677 NA
-  // 676 NA
-  675,
-  // 674 NA
-  673,
-  672,
-  671,
-  670,
-  // 669 NA
-  668,
-  667,
-  // 666 NA
-  665,
-  // 664 NA
-  // 663 NA
-  662,
-  // 661 NA
-  660,
-  659,
-  658,
-  // 657 NA
-  656,
-  655,
-  654,
-  653,
-  // 652 NA
-  651,
-  // 650 NA
-  649,
-  // 648 NA
-  // 647 NA
-  646,
-  645,
-  // 644 NA
-  643,
-  642,
-  // 641 NA
-  640,
-  639,
-  // 638 NA
-  637,
-  636,
-  635,
-  634,
-  633,
-  // 632 NA
-  631,
-  630,
-  629,
-  // 628 NA
-  // 627 NA
-  // 626 NA
-  // 625 NA
-  // 624 NA
-  623,
-  // 622 NA
-  // 621 NA
-  // 620 NA
-  // 619 NA
-  // 618 NA
-  617,
-  616,
-  615,
+  652,
+  // 651,
+  // 650,
+  // 649,
+  // 648,
+  // 647,
+  // 646,
+  // 645,
+  // 644,
+  // 643,
+  // 642,
+  // 641,
+  // 640,
+  // 639,
+  // 638,
+  // 637,
+  // 636,
+  // 635,
+  // 634,
+  // 633,
+  // 632,
+  // 631,
+  // 630,
+  // 629,
+  // 628,
+  // 627,
+  // 626,
+  // 625,
+  // 624,
+  // 623,
+  // 622,
+  // 621,
+  // 620,
+  // 619,
+  618,
+  // 617,
+  // 616,
+  // 615,
   614,
-  613,
-  612,
-  // 611 NA
-  // 610 NA
-  609,
-  608,
-  // 607 NA
-  606,
+  // 613,
+  // 612,
+  // 611,
+  // 610,
+  // 609,
+  // 608,
+  607,
+  // 606,
   605,
-  604,
-  603,
-  602,
-  601,
-  600,
-  599,
-  598,
-  597,
-  // 596 NA
-  595,
-  594,
-  593,
-  // 592 NA
-  // 591 NA
-  590,
-  // 589 NA
-  588,
-  587,
-  // 586 NA
-  585,
-  // 584 NA
-  // 583 NA
-  582,
-  // 581 NA
-  580,
-  579,
-  578,
-  577,
-  576,
-  575,
-  574,
-  573,
-  572,
-  // 571 NA
-  // 570 NA
-  569,
-  568,
-  567,
-  566,
-  565,
-  // 564 NA
-  563,
-  562,
+  // 604,
+  // 603,
+  // 602,
+  // 601,
+  // 600,
+  // 599,
+  // 598,
+  // 597,
+  // 596,
+  // 595,
+  // 594,
+  // 593,
+  // 592,
+  // 591,
+  // 590,
+  // 589,
+  // 588,
+  // 587,
+  // 586,
+  // 585,
+  // 584,
+  // 583,
+  // 582,
+  // 581,
+  // 580,
+  // 579,
+  // 578,
+  // 577,
+  // 576,
+  // 575,
+  // 574,
+  // 573,
+  // 572,
+  571,
+  // 570,
+  // 569,
+  // 568,
+  // 567,
+  // 566,
+  // 565,
+  // 564,
+  // 563,
+  // 562,
   561,
-  // 560 NA
-  559,
-  // 558 NA
-  // 557 NA
-  // 556 NA
-  // 555 NA
+  // 560,
+  // 559,
+  // 558,
+  // 557,
+  // 556,
+  555,
   554,
   553,
   552,
-  551,
+  // 551,
   550,
-  549,
-  // 548 NA
-  547,
-  546,
-  545,
-  // 544 NA
-  543,
-  542,
-  541,
-  // 540 NA
-  539,
-  538,
-  537,
-  536,
-  535,
-  // 534 NA
-  533,
-  532,
-  531,
-  530,
-  529,
-  528,
-  527,
-  526,
-  525,
-  524,
-  // 523 NA
-  // 522 NA
-  521,
-  520,
-  519,
-  518,
-  517,
-  516,
-  515,
-  514,
-  513,
-  // 512 NA
-  // 511 NA
-  // 510 NA
-  // 509 NA
-  508,
-  // 507 NA
-  // 506 NA
-  // 505 NA
-  // 504 NA
-  503,
+  // 549,
+  // 548,
+  // 547,
+  // 546,
+  // 545,
+  // 544,
+  // 543,
+  // 542,
+  // 541,
+  // 540,
+  // 539,
+  // 538,
+  // 537,
+  // 536,
+  // 535,
+  // 534,
+  // 533,
+  // 532,
+  // 531,
+  // 530,
+  // 529,
+  // 528,
+  // 527,
+  // 526,
+  // 525,
+  // 524,
+  // 523,
+  // 522,
+  // 521,
+  // 520,
+  // 519,
+  // 518,
+  // 517,
+  // 516,
+  // 515,
+  // 514,
+  // 513,
+  // 512,
+  // 511,
+  // 510,
+  // 509,
+  // 508,
+  // 507,
+  // 506,
+  // 505,
+  // 504,
+  // 503,
   502,
-  // 501 NA
-  500,
+  // 501,
+  // 500,
   499,
-  // 498 NA
-  497,
-  // 496 NA
-  // 495 NA
-  494,
-  493,
-  492,
-  491,
-  490,
-  489,
-  488,
+  // 498,
+  // 497,
+  // 496,
+  // 495,
+  // 494,
+  // 493,
+  // 492,
+  // 491,
+  // 490,
+  // 489,
+  // 488,
   487,
   486,
   485,
-  // 484 NA
+  // 484,
   483,
-  // 482 NA
-  // 481 NA
-  // 480 NA
-  // 479 NA
+  482,
+  // 481,
+  // 480,
+  // 479,
   478,
   477,
-  // 476 NA
-  // 475 NA
-  474,
-  473,
-  472,
-  // 471 NA
-  470,
-  // 469 NA
-  468,
-  467,
-  466,
-  // 465 NA
-  // 464 NA
-  463,
-  462,
-  // 461 NA
-  // 460 NA
-  // 459 NA
-  458,
+  // 476,
+  // 475,
+  // 474,
+  // 473,
+  // 472,
+  // 471,
+  // 470,
+  // 469,
+  // 468,
+  // 467,
+  // 466,
+  465,
+  // 464,
+  // 463,
+  // 462,
+  461,
+  // 460,
+  459,
+  // 458,
   457,
-  456,
-  455,
-  454,
-  // 453 NA
-  452,
-  // 451 NA
-  450,
-  449,
-  // 448 NA
-  447,
-  446,
-  445,
-  444,
-  // 443 NA
-  442,
-  441,
-  440,
-  439,
-  438,
-  437,
-  436,
-  435,
-  434,
-  433,
-  // 432 NA
-  // 431 NA
-  // 430 NA
-  // 429 NA
-  // 428 NA
-  427,
-  // 426 NA
-  425,
-  // 424 NA
-  423,
-  422,
-  421,
-  // 420 NA
-  419,
-  418,
-  417,
-  416,
-  415,
-  414,
-  // 413 NA
-  // 412 NA
-  411,
-  410,
-  // 409 NA
+  // 456,
+  // 455,
+  // 454,
+  453,
+  // 452,
+  // 451,
+  // 450,
+  // 449,
+  // 448,
+  // 447,
+  // 446,
+  // 445,
+  // 444,
+  // 443,
+  // 442,
+  // 441,
+  // 440,
+  // 439,
+  // 438,
+  // 437,
+  // 436,
+  // 435,
+  // 434,
+  // 433,
+  // 432,
+  // 431,
+  // 430,
+  // 429,
+  // 428,
+  // 427,
+  // 426,
+  // 425,
+  // 424,
+  // 423,
+  // 422,
+  // 421,
+  // 420,
+  // 419,
+  // 418,
+  // 417,
+  // 416,
+  // 415,
+  // 414,
+  // 413,
+  // 412,
+  // 411,
+  // 410,
+  // 409,
   408,
   407,
-  406,
+  // 406,
   405,
-  // 404 NA
-  // 403 NA
-  // 402 NA
-  // 401 NA
-  // 400 NA
-  // 399 NA
-  // 398 NA
-  397,
-  396,
-  395,
-  // 394 NA
-  // 393 NA
-  392,
-  391,
+  // 404,
+  // 403,
+  // 402,
+  // 401,
+  400,
+  // 399,
+  // 398,
+  // 397,
+  // 396,
+  // 395,
+  // 394,
+  393,
+  // 392,
+  // 391,
   390,
-  389,
+  // 389,
   388,
-  387,
-  386,
-  // 385 NA
-  // 384 NA
-  383,
-  382,
-  381,
-  // 380 NA
-  379,
+  // 387,
+  // 386,
+  // 385,
+  // 384,
+  // 383,
+  // 382,
+  // 381,
+  // 380,
+  // 379,
   378,
   377,
   376,
-  375,
-  374,
-  373,
-  372,
-  371,
-  370,
-  369,
-  368,
-  367,
-  // 366 NA
-  365,
-  364,
-  // 363 NA
-  362,
-  361,
+  // 375,
+  // 374,
+  // 373,
+  // 372,
+  // 371,
+  // 370,
+  // 369,
+  // 368,
+  // 367,
+  // 366,
+  // 365,
+  // 364,
+  // 363,
+  // 362,
+  // 361,
   360,
-  359,
-  358,
-  357,
-  // 356 NA
-  355,
-  // 354 NA
+  // 359,
+  // 358,
+  // 357,
+  // 356,
+  // 355,
+  // 354,
   353,
-  352,
-  351,
-  350,
-  349,
-  348,
+  // 352,
+  // 351,
+  // 350,
+  // 349,
+  // 348,
   347,
-  346,
+  // 346,
   345,
-  344,
+  // 344,
   343,
-  // 342 NA
+  // 342,
   341,
-  // 340 NA
-  339,
-  338,
-  337,
-  336,
-  335,
-  334,
-  // 333 NA
-  // 332 NA
+  // 340,
+  // 339,
+  // 338,
+  // 337,
+  // 336,
+  // 335,
+  // 334,
+  // 333,
+  // 332,
   331,
-  330,
-  329,
-  328,
-  327,
-  // 326 NA
-  325,
-  324,
-  323,
-  // 322 NA
-  // 321 NA
-  320,
-  // 319 NA
-  318,
-  317,
-  // 316 NA
-  315,
-  314,
-  313,
-  312,
-  311,
-  310,
-  309,
-  308,
-  // 307 NA
-  306,
-  305,
-  // 304 NA
-  303,
-  302,
-  301,
-  // 300 NA
-  // 299 NA
-  298,
+  // 330,
+  // 329,
+  // 328,
+  // 327,
+  // 326,
+  // 325,
+  // 324,
+  // 323,
+  322,
+  // 321,
+  // 320,
+  319,
+  // 318,
+  // 317,
+  // 316,
+  // 315,
+  // 314,
+  // 313,
+  // 312,
+  // 311,
+  // 310,
+  // 309,
+  // 308,
+  307,
+  // 306,
+  // 305,
+  // 304,
+  // 303,
+  // 302,
+  // 301,
+  // 300,
+  // 299,
+  // 298,
   297,
-  296,
-  295,
-  294,
-  293,
-  292,
-  291,
-  290,
-  289,
-  288,
-  // 287 NA
-  286,
-  285,
-  284,
-  // 283 NA
-  282,
-  281,
+  // 296,
+  // 295,
+  // 294,
+  // 293,
+  // 292,
+  // 291,
+  // 290,
+  // 289,
+  // 288,
+  // 287,
+  // 286,
+  // 285,
+  // 284,
+  // 283,
+  // 282,
+  // 281,
   280,
-  279,
-  278,
-  277,
-  276,
+  // 279,
+  // 278,
+  // 277,
+  // 276,
   275,
   274,
-  // 273 NA
-  272,
-  // 271 NA
-  // 270 NA
-  269,
-  268,
-  267,
+  // 273,
+  // 272,
+  // 271,
+  // 270,
+  // 269,
+  // 268,
+  // 267,
   266,
-  265,
-  264,
-  // 263 NA
-  262,
-  261,
-  260,
-  // 259 NA
-  // 258 NA
-  // 257 NA
-  256,
-  // 255 NA
-  // 254 NA
-  253,
-  // 252 NA
-  251,
-  // 250 NA
-  249,
-  248,
-  247,
-  // 246 NA
-  245,
-  // 244 NA
+  // 265,
+  // 264,
+  // 263,
+  // 262,
+  // 261,
+  // 260,
+  259,
+  // 258,
+  // 257,
+  // 256,
+  // 255,
+  // 254,
+  // 253,
+  // 252,
+  // 251,
+  250,
+  // 249,
+  // 248,
+  // 247,
+  // 246,
+  // 245,
+  // 244,
   243,
-  242,
-  241,
-  240,
-  239,
-  // 238 NA
-  237,
-  236,
-  235,
-  234,
-  233,
-  232,
-  231,
-  230,
+  // 242,
+  // 241,
+  // 240,
+  // 239,
+  // 238,
+  // 237,
+  // 236,
+  // 235,
+  // 234,
+  // 233,
+  // 232,
+  // 231,
+  // 230,
   229,
-  // 228 NA
-  // 227 NA
-  226,
-  // 225 NA
-  // 224 NA
-  // 223 NA
-  // 222 NA
-  221,
-  220,
+  // 228,
+  // 227,
+  // 226,
+  // 225,
+  // 224,
+  223,
+  // 222,
+  // 221,
+  // 220,
   219,
-  218,
-  // 217 NA
-  // 216 NA
-  215,
-  // 214 NA
-  213,
-  // 212 NA
-  211,
-  210,
-  209,
-  // 208 NA
-  207,
-  // 206 NA
+  // 218,
+  // 217,
+  // 216,
+  // 215,
+  // 214,
+  // 213,
+  // 212,
+  // 211,
+  // 210,
+  // 209,
+  208,
+  // 207,
+  // 206,
   205,
-  204,
-  203,
-  // 202 NA
-  201,
-  // 200 NA
-  199,
-  // 198 NA
-  // 197 NA
-  // 196 NA
-  // 195 NA
-  // 194 NA
-  193,
-  192,
-  191,
-  // 190 NA
-  // 189 NA
-  // 188 NA
-  187,
-  186,
-  // 185 NA
-  184,
-  // 183 NA
-  // 182 NA
-  181,
-  // 180 NA
-  // 179 NA
+  // 204,
+  // 203,
+  // 202,
+  // 201,
+  // 200,
+  // 199,
+  // 198,
+  // 197,
+  // 196,
+  195,
+  // 194,
+  // 193,
+  // 192,
+  // 191,
+  190,
+  // 189,
+  // 188,
+  // 187,
+  // 186,
+  // 185,
+  // 184,
+  // 183,
+  // 182,
+  // 181,
+  // 180,
+  179,
   178,
-  // 177 NA
-  // 176 NA
-  // 175 NA
-  // 174 NA
-  173,
+  177,
+  176,
+  // 175,
+  // 174,
+  // 173,
   172,
-  171,
-  170,
-  169,
-  // 168 NA
+  // 171,
+  // 170,
+  // 169,
+  168,
   167,
-  166,
-  165,
-  // 164 NA
-  // 163 NA
-  // 162 NA
-  // 161 NA
-  160,
+  // 166,
+  // 165,
+  // 164,
+  // 163,
+  // 162,
+  // 161,
+  // 160,
   159,
   158,
-  157,
+  // 157,
   156,
-  155,
-  154,
-  153,
-  152,
-  151,
+  // 155,
+  // 154,
+  // 153,
+  // 152,
+  // 151,
   150,
-  149,
-  148,
-  147,
-  146,
-  145,
-  144,
-  143,
-  142,
-  141,
-  140,
-  139,
-  138,
-  137,
+  // 149,
+  // 148,
+  // 147,
+  // 146,
+  // 145,
+  // 144,
+  // 143,
+  // 142,
+  // 141,
+  // 140,
+  // 139,
+  // 138,
+  // 137,
   136,
   135,
-  134,
-  133,
-  132,
-  131,
-  130,
-  129,
-  128,
+  // 134,
+  // 133,
+  // 132,
+  // 131,
+  // 130,
+  // 129,
+  // 128,
   127,
-  126,
-  125,
-  124,
-  123,
-  122,
+  // 126,
+  // 125,
+  // 124,
+  // 123,
+  // 122,
   121,
-  120,
-  119,
-  118,
-  117,
+  // 120,
+  // 119,
+  // 118,
+  // 117,
   116,
-  115,
-  114,
-  113,
-  112,
-  111,
+  // 115,
+  // 114,
+  // 113,
+  // 112,
+  // 111,
   110,
-  109,
-  108,
-  107,
-  106,
+  // 109,
+  // 108,
+  // 107,
+  // 106,
   105,
-  104,
-  103,
-  102,
-  101,
-  100,
+  // 104,
+  // 103,
+  // 102,
+  // 101,
+  // 100,
   99,
-  98,
-  97,
-  96,
-  95,
-  94,
-  93,
-  92,
-  91,
-  90,
-  89,
-  88,
-  87,
-  86,
-  85,
-  84,
+  // 98,
+  // 97,
+  // 96,
+  // 95,
+  // 94,
+  // 93,
+  // 92,
+  // 91,
+  // 90,
+  // 89,
+  // 88,
+  // 87,
+  // 86,
+  // 85,
+  // 84,
   83,
-  82,
-  81,
-  80,
-  79,
-  78,
-  77,
-  76,
-  75,
-  74,
-  73,
-  72,
-  71,
-  70,
-  69,
+  // 82,
+  // 81,
+  // 80,
+  // 79,
+  // 78,
+  // 77,
+  // 76,
+  // 75,
+  // 74,
+  // 73,
+  // 72,
+  // 71,
+  // 70,
+  // 69,
   68,
-  67,
+  // 67,
   66,
-  65,
+  // 65,
   64,
-  63,
-  62,
-  61,
+  // 63,
+  // 62,
+  // 61,
   60,
-  59,
+  // 59,
   58,
   57,
   56,
-  55,
-  54,
+  // 55,
+  // 54,
   53,
-  52,
-  51,
+  // 52,
+  // 51,
   50,
   49,
-  48,
+  // 48,
   47,
-  46,
-  45,
-  44,
+  // 46,
+  // 45,
+  // 44,
   43,
   42,
   41,
   40,
-  39,
-  38,
+  // 39,
+  // 38,
   37,
-  36,
+  // 36,
   35,
-  34,
+  // 34,
   33,
   32,
-  31,
-  30,
-  29,
-  28,
-  27,
-  26,
-  25,
-  24,
-  23,
-  22,
-  21,
-  20,
+  // 31,
+  // 30,
+  // 29,
+  // 28,
+  // 27,
+  // 26,
+  // 25,
+  // 24,
+  // 23,
+  // 22,
+  // 21,
+  // 20,
   19,
-  18,
-  17,
-  16,
-  15,
-  14,
-  13,
-  12,
-  11,
-  10,
-  9,
+  // 18,
+  // 17,
+  // 16,
+  // 15,
+  // 14,
+  // 13,
+  // 12,
+  // 11,
+  // 10,
+  // 9,
   8,
-  7,
+  // 7,
   6,
-  5,
-  4,
-  3,
+  // 5,
+  // 4,
+  // 3,
   2,
   1,
   0
-- 
cgit 


From 08e4b6b4f377aa3cc9f9fd10c0049783dc1f4a94 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 22 Apr 2017 21:38:58 -0400
Subject: version.c: Mark NA patches

- Netbeans: 0005, 0024, 0213
- Vim-specific documentation: 0007
- Vim CI/buildsystem: 0009, 0077, 0080, 0082, 0093, 0115, 0117, 0129,
  0130, 0144, 0145, 0203, 0239, 0240, 0249, 0257, 0272, 0279
- +cryptv: 0010, 0014
- Channel support: 0011, 0013, 0015, 0016, 0022, 0027, 0036, 0076, 0097,
  0103, 0105, 0107, 0108, 0120, 0122, 0152, 0267, 0284
- Timer implementation: 0028, 0098
- Removing legacy support: 0029, 0070, 0109, 0241, 0246
- TUI tweaks: 0030
- viminfo: 0039
- Jobs: 0045, 0048, 0050, 0051, 0054, 0071, 0087
- Style: 0055, 0114
- VMS/Sun support: 0059, 0067, 0123, 0173
- FEAT_* ifdefs: 0061, 0065, 0138, 0139, 0161, 0192, 0193, 0199, 0211,
  0217, 0221, 0260, 0276, 0281
- GUI support: 0072, 0089, 0095, 0113, 0162, 0273, 0277, 0278
- win32 fixes: 0094
- Test infrastructure: 0285, 0288, 0400
- Language bindings: 0163, 0187, 0191, 0268-0271
- Unsupported options: 0232

vim-patch:20eeb612
vim-patch:17777875
vim-patch:99c5eb4f
vim-patch:294740d2
vim-patch:a4ce25bd
vim-patch:7034a837
vim-patch:14a612fa
vim-patch:aaeabfbc
---
 src/nvim/version.c | 198 ++++++++++++++++++++++++++---------------------------
 1 file changed, 99 insertions(+), 99 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 75b09bcee7..44e9d5e26c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -324,12 +324,12 @@ static const int included_patches[] = {
   408,
   407,
   // 406,
-  405,
+  // 405 NA
   // 404,
   // 403,
   // 402,
   // 401,
-  400,
+  // 400 NA
   // 399,
   // 398,
   // 397,
@@ -441,38 +441,38 @@ static const int included_patches[] = {
   // 291,
   // 290,
   // 289,
-  // 288,
+  // 288 NA
   // 287,
   // 286,
-  // 285,
-  // 284,
+  // 285 NA
+  // 284 NA
   // 283,
   // 282,
-  // 281,
+  // 281 NA
   280,
-  // 279,
-  // 278,
-  // 277,
-  // 276,
+  // 279 NA
+  // 278 NA
+  // 277 NA
+  // 276 NA
   275,
   274,
-  // 273,
-  // 272,
-  // 271,
-  // 270,
-  // 269,
-  // 268,
-  // 267,
+  // 273 NA
+  // 272 NA
+  // 271 NA
+  // 270 NA
+  // 269 NA
+  // 268 NA
+  // 267 NA
   266,
   // 265,
   // 264,
   // 263,
   // 262,
   // 261,
-  // 260,
+  // 260 NA
   259,
   // 258,
-  // 257,
+  // 257 NA
   // 256,
   // 255,
   // 254,
@@ -480,24 +480,24 @@ static const int included_patches[] = {
   // 252,
   // 251,
   250,
-  // 249,
+  // 249 NA
   // 248,
   // 247,
-  // 246,
+  // 246 NA
   // 245,
   // 244,
   243,
   // 242,
-  // 241,
-  // 240,
-  // 239,
+  // 241 NA
+  // 240 NA
+  // 239 NA
   // 238,
   // 237,
   // 236,
   // 235,
   // 234,
   // 233,
-  // 232,
+  // 232 NA
   // 231,
   // 230,
   229,
@@ -508,17 +508,17 @@ static const int included_patches[] = {
   // 224,
   223,
   // 222,
-  // 221,
+  // 221 NA
   // 220,
   219,
   // 218,
-  // 217,
+  // 217 NA
   // 216,
   // 215,
   // 214,
-  // 213,
+  // 213 NA
   // 212,
-  // 211,
+  // 211 NA
   // 210,
   // 209,
   208,
@@ -526,23 +526,23 @@ static const int included_patches[] = {
   // 206,
   205,
   // 204,
-  // 203,
+  // 203 NA
   // 202,
   // 201,
   // 200,
-  // 199,
+  // 199 NA
   // 198,
   // 197,
   // 196,
   195,
   // 194,
-  // 193,
-  // 192,
-  // 191,
+  // 193 NA
+  // 192 NA
+  // 191 NA
   190,
   // 189,
   // 188,
-  // 187,
+  // 187 NA
   // 186,
   // 185,
   // 184,
@@ -556,7 +556,7 @@ static const int included_patches[] = {
   176,
   // 175,
   // 174,
-  // 173,
+  // 173 NA
   172,
   // 171,
   // 170,
@@ -566,9 +566,9 @@ static const int included_patches[] = {
   // 166,
   // 165,
   // 164,
-  // 163,
-  // 162,
-  // 161,
+  // 163 NA
+  // 162 NA
+  // 161 NA
   // 160,
   159,
   158,
@@ -577,21 +577,21 @@ static const int included_patches[] = {
   // 155,
   // 154,
   // 153,
-  // 152,
+  // 152 NA
   // 151,
   150,
   // 149,
   // 148,
   // 147,
   // 146,
-  // 145,
-  // 144,
+  // 145 NA
+  // 144 NA
   // 143,
   // 142,
   // 141,
   // 140,
-  // 139,
-  // 138,
+  // 139 NA
+  // 138 NA
   // 137,
   136,
   135,
@@ -599,132 +599,132 @@ static const int included_patches[] = {
   // 133,
   // 132,
   // 131,
-  // 130,
-  // 129,
+  // 130 NA
+  // 129 NA
   // 128,
   127,
   // 126,
   // 125,
   // 124,
-  // 123,
-  // 122,
+  // 123 NA
+  // 122 NA
   121,
-  // 120,
+  // 120 NA
   // 119,
   // 118,
-  // 117,
+  // 117 NA
   116,
-  // 115,
-  // 114,
-  // 113,
+  // 115 NA
+  // 114 NA
+  // 113 NA
   // 112,
   // 111,
   110,
-  // 109,
-  // 108,
-  // 107,
+  // 109 NA
+  // 108 NA
+  // 107 NA
   // 106,
-  105,
+  // 105 NA
   // 104,
-  // 103,
+  // 103 NA
   // 102,
   // 101,
   // 100,
   99,
-  // 98,
-  // 97,
+  // 98 NA
+  // 97 NA
   // 96,
-  // 95,
-  // 94,
-  // 93,
+  // 95 NA
+  // 94 NA
+  // 93 NA
   // 92,
   // 91,
   // 90,
-  // 89,
+  // 89 NA
   // 88,
-  // 87,
+  // 87 NA
   // 86,
   // 85,
   // 84,
   83,
-  // 82,
+  // 82 NA
   // 81,
-  // 80,
+  // 80 NA
   // 79,
   // 78,
-  // 77,
-  // 76,
+  // 77 NA
+  // 76 NA
   // 75,
   // 74,
   // 73,
-  // 72,
-  // 71,
-  // 70,
+  // 72 NA
+  // 71 NA
+  // 70 NA
   // 69,
   68,
-  // 67,
+  // 67 NA
   66,
-  // 65,
+  // 65 NA
   64,
   // 63,
   // 62,
-  // 61,
+  // 61 NA
   60,
-  // 59,
+  // 59 NA
   58,
   57,
   56,
-  // 55,
-  // 54,
+  // 55 NA
+  // 54 NA
   53,
   // 52,
-  // 51,
-  50,
+  // 51 NA
+  // 50 NA
   49,
-  // 48,
+  // 48 NA
   47,
   // 46,
-  // 45,
+  // 45 NA
   // 44,
   43,
   42,
   41,
   40,
-  // 39,
+  // 39 NA
   // 38,
   37,
-  // 36,
+  // 36 NA
   35,
   // 34,
   33,
   32,
   // 31,
-  // 30,
-  // 29,
-  // 28,
-  // 27,
+  // 30 NA
+  // 29 NA
+  // 28 NA
+  // 27 NA
   // 26,
   // 25,
-  // 24,
+  // 24 NA
   // 23,
-  // 22,
+  // 22 NA
   // 21,
   // 20,
   19,
   // 18,
   // 17,
-  // 16,
-  // 15,
-  // 14,
-  // 13,
+  // 16 NA
+  // 15 NA
+  // 14 NA
+  // 13 NA
   // 12,
-  // 11,
-  // 10,
-  // 9,
+  // 11 NA
+  // 10 NA
+  // 9 NA
   8,
-  // 7,
+  // 7 NA
   6,
-  // 5,
+  // 5 NA
   // 4,
   // 3,
   2,
-- 
cgit 


From d8fe63199f10c944312e802010bec13b5950120a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 15 Jul 2017 18:13:49 +0200
Subject: intro: change byline to "by al." (#6984)

Several people have suggested that the "by Bram" byline is misleading,
it implies that Bram is actively involved with the project. Up to now we
left it as an homage.

Bram agreed that it is misleading, and suggested a mention somewhere
other than the intro.
---
 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 44e9d5e26c..c7b8220776 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -993,7 +993,7 @@ void intro_message(int colon)
   static char *(lines[]) = {
     N_(NVIM_VERSION_LONG),
     "",
-    N_("by Bram Moolenaar et al."),
+    N_("by al."),
     N_("Nvim is open source and freely distributable"),
     N_("https://neovim.io/community"),
     "",
-- 
cgit 


From 33efad7dbc26750486d1910157345c508684125e Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Sun, 16 Jul 2017 14:23:56 +0200
Subject: vim-patch:8.0.0017

Problem:    Cannot get the number of the current quickfix or location list.
Solution:   Use the current list if "nr" in "what" is zero. (Yegappan
            Lakshmanan)  Remove debug command from test.

https://github.com/vim/vim/commit/890680ca6364386fabb271c85e0755bcaa6a33c1
---
 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 c7b8220776..a8b1e4d22d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -712,7 +712,7 @@ static const int included_patches[] = {
   // 20,
   19,
   // 18,
-  // 17,
+  17,
   // 16 NA
   // 15 NA
   // 14 NA
-- 
cgit 


From c00300ecdd694cad53da74256e52675f79a3fd78 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Sun, 16 Jul 2017 16:58:25 +0200
Subject: vim-patch:8.0.0026

Problem:    Error format with %W, %C and %Z does not work. (Gerd Wachsmuth)
Solution:   Skip code when qf_multiignore is set. (Lcd)

https://github.com/vim/vim/commit/9b4579481892a62e7e002498b9eddaaf75bbda49
---
 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 a8b1e4d22d..efda51547e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -703,7 +703,7 @@ static const int included_patches[] = {
   // 29 NA
   // 28 NA
   // 27 NA
-  // 26,
+  26,
   // 25,
   // 24 NA
   // 23,
-- 
cgit 


From ffa2e4354986cc12b8d44781708f0b9d51b84f31 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Sun, 16 Jul 2017 17:28:14 +0200
Subject: vim-patch:8.0.0078

Problem:    Accessing freed memory in quickfix.
Solution:   Reset pointer when freeing 'errorformat'. (Domenique Pelle)

https://github.com/vim/vim/commit/63bed3d319b5d90765dbdae93a3579b6322d79fb
---
 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 efda51547e..d10d78d695 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -651,7 +651,7 @@ static const int included_patches[] = {
   // 81,
   // 80 NA
   // 79,
-  // 78,
+  78,
   // 77 NA
   // 76 NA
   // 75,
-- 
cgit 


From 875c356a83b07573b87b2995478fc3b0703bc023 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Sun, 16 Jul 2017 17:32:32 +0200
Subject: vim-patch:8.0.0079

Problem:    Accessing freed memory in quickfix. (Domenique Pelle)
Solution:   Do not free the current list when adding to it.

https://github.com/vim/vim/commit/2b946c9f9b0e0fd805fb8f3e4c16e0a68ae13129
---
 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 d10d78d695..62af3ab34d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -650,7 +650,7 @@ static const int included_patches[] = {
   // 82 NA
   // 81,
   // 80 NA
-  // 79,
+  79,
   78,
   // 77 NA
   // 76 NA
-- 
cgit 


From e29ec131d67f3410dba85ab13ba4c617e5768269 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Sun, 16 Jul 2017 17:39:53 +0200
Subject: vim-patch:8.0.0084

Problem:    Using freed memory when adding to a quickfix list. (Domenique
            Pelle)
Solution:   Clear the directory name.

https://github.com/vim/vim/commit/7618e00d3b8bfe064cfc524640d754607361f9df
---
 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 62af3ab34d..2beb13edf8 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -645,7 +645,7 @@ static const int included_patches[] = {
   // 87 NA
   // 86,
   // 85,
-  // 84,
+  84,
   83,
   // 82 NA
   // 81,
-- 
cgit 


From 9ffa22b7efefebf49a42364de21bb895adabd2de Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Sun, 16 Jul 2017 20:49:07 +0200
Subject: vim-patch:8.0.0023

Problem:    "gd" and "gD" may find a match in a comment or string.
Solution:   Ignore matches in comments and strings. (Anton Lindqvist)

https://github.com/vim/vim/commit/226630a030c0d41145e1109f09633360fc9c999d
---
 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 c7b8220776..0bc1655a74 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -706,7 +706,7 @@ static const int included_patches[] = {
   // 26,
   // 25,
   // 24 NA
-  // 23,
+  23,
   // 22 NA
   // 21,
   // 20,
-- 
cgit 


From 9cf0415761bab62e8dad95b965fb6a14d00a4f4b Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Sun, 16 Jul 2017 21:43:17 +0200
Subject: vim-patch:8.0.0025

Problem:    Inconsistent use of spaces vs tabs in gd test.
Solution:   Use tabs. (Anton Lindqvist)

https://github.com/vim/vim/commit/936c48f8ca82a0257640c8c9d0792538f5a7e813
---
 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 0bc1655a74..b6a0ca3e1b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -704,7 +704,7 @@ static const int included_patches[] = {
   // 28 NA
   // 27 NA
   // 26,
-  // 25,
+  25,
   // 24 NA
   23,
   // 22 NA
-- 
cgit 


From 24a0d4e122024071195ac8a2828fba3184c8e12e Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 17 Jul 2017 22:38:03 +0800
Subject: vim-patch:8.0.0004 (#7044)

Problem:    A string argument for function() that is not a function name
            results in an error message with NULL. (Christian Brabandt)
Solution:   Use the argument for the error message.

https://github.com/vim/vim/commit/5582ef14384525e8cec86016876d97a6b32dd548
---
 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 c7b8220776..06efcc5bfc 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -725,7 +725,7 @@ static const int included_patches[] = {
   // 7 NA
   6,
   // 5 NA
-  // 4,
+  4,
   // 3,
   2,
   1,
-- 
cgit 


From b98ea04226d5ae7f2d8f9650101f87a848145ca4 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Sat, 15 Jul 2017 21:02:15 +0800
Subject: vim-patch:8.0.0003

Problem:    getwinvar() returns wrong Value of boolean and number options,
            especially non big endian systems. (James McCoy)
Solution:   Cast the pointer to long or int. (closes vim/vim#1060)

https://github.com/vim/vim/commit/789a5c0e3d27f09456678f0cfb6c1bd2d8ab4a35
---
 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 2200c5e04a..a7d6885b4c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -726,7 +726,7 @@ static const int included_patches[] = {
   6,
   // 5 NA
   4,
-  // 3,
+  3,
   2,
   1,
   0
-- 
cgit 


From 710546c5e93cd433bd2eb566df52b58e3583c386 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Mon, 17 Jul 2017 15:53:23 +0200
Subject: vim-patch:8.0.0085

Problem:    Using freed memory with recursive function call. (Dominique Pelle)
Solution:   Make a copy of the function name.

https://github.com/vim/vim/commit/8a01f969c198eeb655ad2f96f2796a6f6f4a1924
---
 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 a7d6885b4c..9b5c5eefb8 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -644,7 +644,7 @@ static const int included_patches[] = {
   // 88,
   // 87 NA
   // 86,
-  // 85,
+  85,
   84,
   83,
   // 82 NA
-- 
cgit 


From 962e8cc1dd4d1b901b249e8434ac4db6554d3e05 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 23 Jul 2017 00:59:14 +0800
Subject: vim-patch:8.0.0052 (#7057)

Problem:    Conceal test passes even without the bug fix.
Solution:   Add a redraw command. (Christian Brabandt)

https://github.com/vim/vim/commit/35a1f59d635d9a655e1267c18f7cc757afd0d5b0
---
 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 9b5c5eefb8..b325052cd2 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -677,7 +677,7 @@ static const int included_patches[] = {
   // 55 NA
   // 54 NA
   53,
-  // 52,
+  52,
   // 51 NA
   // 50 NA
   49,
-- 
cgit 


From 8fb599029f41b74e6c34b680a0817ff19f544cf3 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 23 Jul 2017 01:03:15 +0800
Subject: vim-patch:8.0.0031 (#7050)

Problem:    After ":bwipeout" 'fileformat' is not set to the right default.
Solution:   Get the default from 'fileformats'. (Mike Williams)

https://github.com/vim/vim/commit/e8ef3a093453b73594e15462d4de50b011c8ba66
---
 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 b325052cd2..61d947017e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -698,7 +698,7 @@ static const int included_patches[] = {
   // 34,
   33,
   32,
-  // 31,
+  31,
   // 30 NA
   // 29 NA
   // 28 NA
-- 
cgit 


From 253f6f3bbfd16b7aeb2f72714c1d5d1c88a3478a Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 23 Jul 2017 01:04:45 +0800
Subject: vim-patch:8.0.0038 (#7051)

Problem:    OPEN_CHR_FILES not defined for FreeBSD using Debian userland
            files.
Solution:   Check for __FreeBSD_kernel__. (James McCoy, closes vim/vim#1166)

https://github.com/vim/vim/commit/ca291aec99b60fe81eaab36aa718e51421bb88d5
---
 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 61d947017e..d372779c75 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -691,7 +691,7 @@ static const int included_patches[] = {
   41,
   40,
   // 39 NA
-  // 38,
+  38,
   37,
   // 36 NA
   35,
-- 
cgit 


From ad07e9c7fcabeb991f0849c9e11b5b225cf470fd Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 23 Jul 2017 10:12:05 +0800
Subject: vim-patch:8.0.0069

Problem:    Compiler warning for self-comparison.
Solution:   Define ONE_WINDOW and add vim/vim#ifdef.

https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
---
 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 d372779c75..4e780f31ad 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -660,7 +660,7 @@ static const int included_patches[] = {
   // 72 NA
   // 71 NA
   // 70 NA
-  // 69,
+  69,
   68,
   // 67 NA
   66,
-- 
cgit 


From b656159fcfded40839c222ae1c4e86873c82f295 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 23 Jul 2017 11:11:56 +0800
Subject: vim-patch:8.0.0073

Problem:    More comparisons between firstwin and lastwin.
Solution:   Use ONE_WINDOW for consistency. (Hirohito Higashi)

https://github.com/vim/vim/commit/459ca563128f2edb7e3bb190090bbb755a56dd55
---
 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 4e780f31ad..d27b2b2012 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -656,7 +656,7 @@ static const int included_patches[] = {
   // 76 NA
   // 75,
   // 74,
-  // 73,
+  73,
   // 72 NA
   // 71 NA
   // 70 NA
-- 
cgit 


From 811c45163c5613981c8e5abdca40e28c1b61d076 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Tue, 25 Jul 2017 18:30:28 +0200
Subject: vim-patch:8.0.0034

Problem:    No completion for ":messages".
Solution:   Complete "clear" argument. (Hirohito Higashi)

https://github.com/vim/vim/commit/9e507ca8a3e1535e62de4bd86374b0fcd18ef5b8
---
 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 62e8919913..44348c4d98 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -695,7 +695,7 @@ static const int included_patches[] = {
   37,
   // 36 NA
   35,
-  // 34,
+  34,
   33,
   32,
   31,
-- 
cgit 


From 09470eb673e7582e6103173754fff85ee0e1d232 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Tue, 25 Jul 2017 18:53:47 +0200
Subject: vim-patch:8.0.0075

Problem:    Using number for exception type lacks type checking.
Solution:   Use an enum.

https://github.com/vim/vim/commit/8a5883b7488e492419dde7e1637cc72f2d566ba4
---
 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 62e8919913..be3ee12262 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -654,7 +654,7 @@ static const int included_patches[] = {
   78,
   // 77 NA
   // 76 NA
-  // 75,
+  75,
   // 74,
   73,
   // 72 NA
-- 
cgit 


From d94e39a517d5ccf895c6f1b95bfb621954f3bbec Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Tue, 25 Jul 2017 18:47:10 +0200
Subject: vim-patch:8.0.0062

Problem:    No digraph for HORIZONTAL ELLIPSIS.
Solution:   Use ",.". (Hans Ginzel, closes vim/vim#1226)

https://github.com/vim/vim/commit/81615517249bb78cba9c37c9834b787c1b265521
---
 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 62e8919913..bc478c4123 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -667,7 +667,7 @@ static const int included_patches[] = {
   // 65 NA
   64,
   // 63,
-  // 62,
+  62,
   // 61 NA
   60,
   // 59 NA
-- 
cgit 


From 8eb54c5deca228fa5a34d22cb9f91d956eed773c Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Thu, 27 Jul 2017 09:56:25 +0800
Subject: vim-patch:8.0.0088 (#7080)

Problem:    When a test fails in Setup or Teardown the problem is not reported.
Solution:   Add a try/catch. (Hirohito Higashi)

https://github.com/vim/vim/commit/cc28e2d05d05552d8b72a520be8a193f3d9822d4
---
 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 d07a1c2d68..b585c3ad9a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -641,7 +641,7 @@ static const int included_patches[] = {
   // 91,
   // 90,
   // 89 NA
-  // 88,
+  88,
   // 87 NA
   // 86,
   85,
-- 
cgit 


From 707bb3749459fb30c02701b63553af7a3460f980 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sat, 29 Jul 2017 06:00:53 +0800
Subject: vim-patch:8.0.0100 (#7085)

vim-patch:8.0.0100

Problem:    Options that are a file name may contain non-filename characters.
Solution:   Check for more invalid characters.

https://github.com/vim/vim/commit/319afe3804741db5a6c188bd69535fa7ed044c62
---
 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 b585c3ad9a..f0048fb234 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -629,7 +629,7 @@ static const int included_patches[] = {
   // 103 NA
   // 102,
   // 101,
-  // 100,
+  100,
   99,
   // 98 NA
   // 97 NA
-- 
cgit 


From fe0bcc08003c82af7742636d3f7a95a1c91cf909 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Tue, 25 Jul 2017 14:18:08 +0200
Subject: vim-patch:8.0.0020

Problem:    The regexp engines are not reentrant.
Solution:   Add regexec_T and save/restore the state when needed.

https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
---
 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 f0048fb234..31d3122f95 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -709,7 +709,7 @@ static const int included_patches[] = {
   23,
   // 22 NA
   // 21,
-  // 20,
+  20,
   19,
   // 18,
   17,
-- 
cgit 


From 743993eb553302a461ee0ef9cffa57f93c10c955 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 30 Jul 2017 07:36:44 +0800
Subject: vim-patch:8.0.0119 (#7091)

Problem:    No test for using CTRL-R on the command line.
Solution:   Add a test. (Dominique Pelle) And some more.

https://github.com/vim/vim/commit/21efc3633edb58809c5dd89b025d34d7002e731c
---
 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 31d3122f95..4f83b09e1b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -610,7 +610,7 @@ static const int included_patches[] = {
   // 122 NA
   121,
   // 120 NA
-  // 119,
+  119,
   // 118,
   // 117 NA
   116,
-- 
cgit 


From 5cd68b39003dc51c5b80147d689cf7e8b67443b0 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sat, 29 Jul 2017 10:24:07 +0800
Subject: vim-patch:8.0.0124 #7092

Problem:    Internal error for assert_inrange(1, 1).
Solution:   Adjust number of allowed arguments. (Dominique Pelle)

https://github.com/vim/vim/commit/3421566376b5723213af502bd3c2b9debe025ef1
---
 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 4f83b09e1b..962096000a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -605,7 +605,7 @@ static const int included_patches[] = {
   127,
   // 126,
   // 125,
-  // 124,
+  124,
   // 123 NA
   // 122 NA
   121,
-- 
cgit 


From 0795dd3c9031a7151f41838fb8a9970d60e7d864 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Mon, 31 Jul 2017 05:10:09 +0800
Subject: vim-patch: 8.0.00{12, 46, 93} (#7098)

vim-patch:8.0.0012
Problem:    Typos in comments.
Solution:   Change "its" to "it's". (Matthew Brener, closes vim/vim#1088)
https://github.com/vim/vim/commit/9af418427652562384744648d7d173a4bfebba95

vim-patch:8.0.0046
version.c: mark 8.0.0046 applied

vim-patch:8.0.0063
version.c: mark 8.0.0063 as NA patch
---
 src/nvim/version.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 962096000a..6662dff437 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -666,7 +666,7 @@ static const int included_patches[] = {
   66,
   // 65 NA
   64,
-  // 63,
+  // 63 NA
   62,
   // 61 NA
   60,
@@ -683,7 +683,7 @@ static const int included_patches[] = {
   49,
   // 48 NA
   47,
-  // 46,
+  46,
   // 45 NA
   // 44,
   43,
@@ -717,7 +717,7 @@ static const int included_patches[] = {
   // 15 NA
   // 14 NA
   // 13 NA
-  // 12,
+  12,
   // 11 NA
   // 10 NA
   // 9 NA
-- 
cgit 


From 10399165e5dd93a3cfda5082f4aa544a13273e5d Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 31 Jul 2017 03:54:18 +0200
Subject: vim-patch:8.0.0498 (#7103)

Problem:    Two autocmd tests are skipped on MS-Windows.
Solution:   Make the test pass on MS-Windows. Write the messages in a file
            instead of getting the output of system().
https://github.com/vim/vim/commit/e94260f3582cf928cc59e792b3b6ede57794a4a6
---
 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 6662dff437..1035963136 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -231,7 +231,7 @@ static const int included_patches[] = {
   // 501,
   // 500,
   499,
-  // 498,
+  498,
   // 497,
   // 496,
   // 495,
-- 
cgit 


From eb40b7ec404e8651137513ced43d503bc6656f17 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Wed, 2 Aug 2017 16:22:04 +0800
Subject: vim-patch:8.0.0133 (#7107)

Problem:    "2;'(" causes ml_get errors in an empty buffer.  (Dominique Pelle)
Solution:   Check the cursor line earlier.

https://github.com/vim/vim/commit/fe38b494fff56cd9b2fcaeef26a8fd7b6557d69c
---
 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 1035963136..a018585976 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -596,7 +596,7 @@ static const int included_patches[] = {
   136,
   135,
   // 134,
-  // 133,
+  133,
   // 132,
   // 131,
   // 130 NA
-- 
cgit 


From 8160a0e04244d054c4555a5a1af09963470964a1 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 3 Aug 2017 09:31:05 +0200
Subject: Revert "vim-patch:8.0.0133 (#7107)"

This reverts commit eb40b7ec404e8651137513ced43d503bc6656f17.

The change caused this error on QuickBuild:

    INFO  - # test/functional/core/job_spec.lua @ 668: pty process teardown does not prevent/delay exit. #4798 #4900
    INFO  - not ok 321 - pty process teardown does not prevent/delay exit. #4798 #4900
    INFO  - # test/functional/core/job_spec.lua @ 668
    INFO  - # Failure message: ./test/functional/ui/screen.lua:302: Row 1 did not match.
    INFO  - # Expected:
    INFO  - # |* |
    INFO  - # |[Process exited 0] |
    INFO  - # | |
    INFO  - # | |
    INFO  - # | |
    INFO  - # |-- TERMINAL -- |
    INFO  - # Actual:
    INFO  - # |*E575: Error while reading ShaD|
    INFO  - # |a file: mark entry at position|
    INFO  - # | 92 has invalid line number |
    INFO  - # |Press ENTER or type command to|
    INFO  - # | continue |
    INFO  - # |-- TERMINAL -- |
    INFO  - #
    INFO  - # To print the expect() call that would assert the current screen state, use
    INFO  - # screen:snaphot_util(). In case of non-deterministic failures, use
    INFO  - # screen:redraw_debug() to show all intermediate screen states.
    INFO  - # stack traceback:
    INFO  - #     ./test/functional/ui/screen.lua:302: in function 'wait'
    INFO  - #     ./test/functional/ui/screen.lua:216: in function 'expect'
    INFO  - #     test/functional/core/job_spec.lua:677: in function <test/functional/core/job_spec.lua:668>
---
 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 a018585976..1035963136 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -596,7 +596,7 @@ static const int included_patches[] = {
   136,
   135,
   // 134,
-  133,
+  // 133,
   // 132,
   // 131,
   // 130 NA
-- 
cgit 


From 99aeb607f4753907529e13d4d347ca3551da9cc5 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Fri, 4 Aug 2017 19:58:10 +0800
Subject: vim-patch:8.0.0081

Problem:    Inconsistent function names.
Solution:   Rename do_cscope to ex_cscope.  Clean up comments.

https://github.com/vim/vim/commit/d4db7719bdfbc54df396eac08d8cbb2389feacf4
---
 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 1035963136..c68bc6351e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -648,7 +648,7 @@ static const int included_patches[] = {
   84,
   83,
   // 82 NA
-  // 81,
+  81,
   // 80 NA
   79,
   78,
-- 
cgit 


From 348229b1d32010292013eee415c28926e2b7009b Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Wed, 2 Aug 2017 16:22:04 +0800
Subject: vim-patch:8.0.0133 (#7107)

Problem:    "2;'(" causes ml_get errors in an empty buffer.  (Dominique Pelle)
Solution:   Check the cursor line earlier.

https://github.com/vim/vim/commit/fe38b494fff56cd9b2fcaeef26a8fd7b6557d69c
---
 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 c68bc6351e..7f0b45e896 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -596,7 +596,7 @@ static const int included_patches[] = {
   136,
   135,
   // 134,
-  // 133,
+  133,
   // 132,
   // 131,
   // 130 NA
-- 
cgit 


From 55c0401dfd137a5e173d8551f763cb4c6fed56e1 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sat, 5 Aug 2017 10:17:30 +0800
Subject: vim-patch:8.0.0134 (#7109)

Problem:    Null pointer access reported by UBsan.
Solution:   Check curwin->w_buffer is not NULL. (Yegappan Lakshmanan)

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

src/nvim/ex_cmds.c have been merged by someone. while version.c remain unmerged.
---
 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 7f0b45e896..f2b56e0108 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -595,7 +595,7 @@ static const int included_patches[] = {
   // 137,
   136,
   135,
-  // 134,
+  134,
   133,
   // 132,
   // 131,
-- 
cgit 


From c6954437277175c9e2b8eb7e7e753314725aef8b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 3 Aug 2017 00:41:52 +0200
Subject: win_redr_status(): skip if wildmenu is showing

This might be too coarse, but it passes all tests ...

A more nuanced approach might be: only skip the windows whose
statuslines are overwritten by the wildmenu.

Closes #2255
Closes #7108

vim-patch:8.0.0710 N/A because of the changes in this commit.
---
 src/nvim/version.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 223 insertions(+)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index f2b56e0108..c443b63bb0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -77,6 +77,229 @@ static char *features[] = {
 
 // clang-format off
 static const int included_patches[] = {
+  // 875,
+  // 874,
+  // 873,
+  // 872,
+  // 871,
+  // 870,
+  // 869,
+  // 868,
+  // 867,
+  // 866,
+  // 865,
+  // 864,
+  // 863,
+  // 862,
+  // 861,
+  // 860,
+  // 859,
+  // 858,
+  // 857,
+  // 856,
+  // 855,
+  // 854,
+  // 853,
+  // 852,
+  // 851,
+  // 850,
+  // 849,
+  // 848,
+  // 847,
+  // 846,
+  // 845,
+  // 844,
+  // 843,
+  // 842,
+  // 841,
+  // 840,
+  // 839,
+  // 838,
+  // 837,
+  // 836,
+  // 835,
+  // 834,
+  // 833,
+  // 832,
+  // 831,
+  // 830,
+  // 829,
+  // 828,
+  // 827,
+  // 826,
+  // 825,
+  // 824,
+  // 823,
+  // 822,
+  // 821,
+  // 820,
+  // 819,
+  // 818,
+  // 817,
+  // 816,
+  // 815,
+  // 814,
+  // 813,
+  // 812,
+  // 811,
+  // 810,
+  // 809,
+  // 808,
+  // 807,
+  // 806,
+  // 805,
+  // 804,
+  // 803,
+  // 802,
+  // 801,
+  // 800,
+  // 799,
+  // 798,
+  // 797,
+  // 796,
+  // 795,
+  // 794,
+  // 793,
+  // 792,
+  // 791,
+  // 790,
+  // 789,
+  // 788,
+  // 787,
+  // 786,
+  // 785,
+  // 784,
+  // 783,
+  // 782,
+  // 781,
+  // 780,
+  // 779,
+  // 778,
+  // 777,
+  // 776,
+  // 775,
+  // 774,
+  // 773,
+  // 772,
+  // 771,
+  // 770,
+  // 769,
+  // 768,
+  // 767,
+  // 766,
+  // 765,
+  // 764,
+  // 763,
+  // 762,
+  // 761,
+  // 760,
+  // 759,
+  // 758,
+  // 757,
+  // 756,
+  // 755,
+  // 754,
+  // 753,
+  // 752,
+  // 751,
+  // 750,
+  // 749,
+  // 748,
+  // 747,
+  // 746,
+  // 745,
+  // 744,
+  // 743,
+  // 742,
+  // 741,
+  // 740,
+  // 739,
+  // 738,
+  // 737,
+  // 736,
+  // 735,
+  // 734,
+  // 733,
+  // 732,
+  // 731,
+  // 730,
+  // 729,
+  // 728,
+  // 727,
+  // 726,
+  // 725,
+  // 724,
+  // 723,
+  // 722,
+  // 721,
+  // 720,
+  // 719,
+  // 718,
+  // 717,
+  // 716,
+  // 715,
+  // 714,
+  // 713,
+  // 712,
+  // 711,
+  710,
+  // 709,
+  // 708,
+  // 707,
+  // 706,
+  // 705,
+  // 704,
+  // 703,
+  // 702,
+  // 701,
+  // 700,
+  // 699,
+  // 698,
+  // 697,
+  // 696,
+  // 695,
+  // 694,
+  // 693,
+  // 692,
+  // 691,
+  // 690,
+  // 689,
+  // 688,
+  // 687,
+  // 686,
+  // 685,
+  // 684,
+  // 683,
+  // 682,
+  // 681,
+  // 680,
+  // 679,
+  // 678,
+  // 677,
+  // 676,
+  // 675,
+  // 674,
+  // 673,
+  // 672,
+  // 671,
+  // 670,
+  // 669,
+  // 668,
+  // 667,
+  // 666,
+  // 665,
+  // 664,
+  // 663,
+  // 662,
+  // 661,
+  // 660,
+  // 659,
+  // 658,
+  // 657,
+  // 656,
+  // 655,
+  // 654,
+  // 653,
   652,
   // 651,
   // 650,
-- 
cgit 


From d801ce70c1fb8dd8b3735ca9e06158aaf48203ba Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 5 Aug 2017 23:29:02 +0200
Subject: win_defs.h: redefine RGB macro after undefining

Before this change, if os_defs.h was included after macros.h then
win_defs.h would undefine our own RGB macro.

vim-patch:8.0.0146
---
 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 c443b63bb0..81152bbaa4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -806,7 +806,7 @@ static const int included_patches[] = {
   // 149,
   // 148,
   // 147,
-  // 146,
+  146,
   // 145 NA
   // 144 NA
   // 143,
-- 
cgit 


From 36ceb9397c7fc383356e54ea8eab8fa3d6cefb1f Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Mon, 7 Aug 2017 05:00:19 +0800
Subject: vim-patch:8.0.0086 (#7118)

Problem:    Cannot add a comment after ":hide". (Norio Takagi)
Solution:   Make it work, add a test. (Hirohito Higashi)

https://github.com/vim/vim/commit/2256c9947164229c0960803e2a2992b793c23298
---
 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 81152bbaa4..9305618eae 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -866,7 +866,7 @@ static const int included_patches[] = {
   // 89 NA
   88,
   // 87 NA
-  // 86,
+  86,
   85,
   84,
   83,
-- 
cgit 


From d1f0b5aa5d594f3041c3fc6c026ff720c07beaeb Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 7 Aug 2017 05:03:08 +0800
Subject: vim-patch:8.0.0137 (#7119)

Problem:    When 'maxfuncdepth' is set above 200 the nesting is limited to
            200. (Brett Stahlman)
Solution:   Allow for Ex command recursion depending on 'maxfuncdepth'.

https://github.com/vim/vim/commit/777b30f827bcbe10a40640b1bf0361cb93a16be1
---
 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 9305618eae..fd2f1fd212 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -815,7 +815,7 @@ static const int included_patches[] = {
   // 140,
   // 139 NA
   // 138 NA
-  // 137,
+  137,
   136,
   135,
   134,
-- 
cgit 


From 644fa6537cfda6281f6ac6c837b9a08fa35fb516 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 7 Aug 2017 05:04:50 +0800
Subject: vim-patch:8.0.0143 (#7120)

Problem:    Line number of current buffer in getbufinfo() is wrong.
Solution:   For the current buffer use the current line number. (Ken Takata)

https://github.com/vim/vim/commit/f845b87f2b3a45cbee160e28d7a3f50e54054809
---
 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 fd2f1fd212..aa7c613f3a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -809,7 +809,7 @@ static const int included_patches[] = {
   146,
   // 145 NA
   // 144 NA
-  // 143,
+  143,
   // 142,
   // 141,
   // 140,
-- 
cgit 


From 120d1b80c9aa3ad39902310a99f5d19f41ca4bb8 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sat, 5 Aug 2017 13:26:36 +0800
Subject: vim-patch:8.0.0147 #7121

Problem:    searchpair() does not work when 'magic' is off. (Chris Paul)
Solution:   Add \m in the pattern. (Christian Brabandt, closes vim/vim#1341)

https://github.com/vim/vim/commit/6e450a57541676036203a72d40b2e604e938371e
---
 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 aa7c613f3a..d4d2af2f26 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -805,7 +805,7 @@ static const int included_patches[] = {
   150,
   // 149,
   // 148,
-  // 147,
+  147,
   146,
   // 145 NA
   // 144 NA
-- 
cgit 


From 2753d61e4cb037323d78ed3fd978a10694c902c6 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 7 Aug 2017 05:42:52 +0800
Subject: vim-patch:8.0.0111 (#7090)

Problem:    The :history command is not tested.
Solution:   Add tests. (Dominique Pelle)

https://github.com/vim/vim/commit/eebd84eb94ed7f59a06a52cb4863563642f58899
---
 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 d4d2af2f26..1ecda654d1 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -841,7 +841,7 @@ static const int included_patches[] = {
   // 114 NA
   // 113 NA
   // 112,
-  // 111,
+  111,
   110,
   // 109 NA
   // 108 NA
-- 
cgit 


From e13b4a21cac9d173885249034fe20fb209b157df Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Tue, 8 Aug 2017 09:32:47 +0800
Subject: vim-patch:8.0.0149 (#7127)

Problem:    ":earlier" and ":later" do not work after startup or reading the
            undo file.
Solution:   Use absolute time stamps instead of relative to the Vim start
            time. (Christian Brabandt, Pavel Juhas, closes vim/vim#1300, closes
            vim/vim#1254)

https://github.com/vim/vim/commit/cbd4de44e8d08fba3c09eb40ad6e36e83faf020a
---
 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 1ecda654d1..fa179b4f63 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -803,7 +803,7 @@ static const int included_patches[] = {
   // 152 NA
   // 151,
   150,
-  // 149,
+  149,
   // 148,
   147,
   146,
-- 
cgit 


From 4cd2749b102864a3e194b136cc88f4846b412dfe Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Thu, 10 Aug 2017 08:36:31 +0800
Subject: vim-patch:8.0.0174

Problem:    For completion "locale -a" is executed on MS-Windows, even though
            it most likely won't work.
Solution:   Skip executing "locale -a" on MS-Windows. (Ken Takata)

https://github.com/vim/vim/commit/b8f7bd68f6fdff51ca4db5b145dcde42ee7b804b
---
 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 fa179b4f63..bc5035f215 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -778,7 +778,7 @@ static const int included_patches[] = {
   177,
   176,
   // 175,
-  // 174,
+  174,
   // 173 NA
   172,
   // 171,
-- 
cgit 


From b7e84de7d2385670aadcea9c02bc68206db98862 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Thu, 10 Aug 2017 10:20:55 +0800
Subject: vim-patch:8.0.0165 (#7132)

Problem:    Ubsan warns for integer overflow.
Solution:   Swap two conditions. (Dominique Pelle)

https://github.com/vim/vim/commit/f446b48ff0bffae2b453cd4f9e3c25dfe363d29d
---
 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 fa179b4f63..72af7dbafd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -787,7 +787,7 @@ static const int included_patches[] = {
   168,
   167,
   // 166,
-  // 165,
+  165,
   // 164,
   // 163 NA
   // 162 NA
-- 
cgit 


From df02f9cc37be38b8189991f9e76bfcafa6e271c6 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Jul 2017 01:51:08 +0200
Subject: vim-patch:8.0.0090 fix breakindent bug

(original Vim commit-message is bogus)

https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
---
 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 72af7dbafd..69d5cb8e8d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -862,7 +862,7 @@ static const int included_patches[] = {
   // 93 NA
   // 92,
   // 91,
-  // 90,
+  90,
   // 89 NA
   88,
   // 87 NA
-- 
cgit 


From 1bcb3ed0e29e924167c8429fde2338dd9a6c29d4 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Jul 2017 02:26:21 +0200
Subject: vim-patch:8.0.0126

Problem:    Display problem with 'foldcolumn' and a wide character.
            (esiegerman)
Solution:   Don't use "extra" but an allocated buffer. (Christian Brabandt,
            closes vim/vim#1310)

https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
---
 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 69d5cb8e8d..ca1d64ac56 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -826,7 +826,7 @@ static const int included_patches[] = {
   // 129 NA
   // 128,
   127,
-  // 126,
+  126,
   // 125,
   124,
   // 123 NA
-- 
cgit 


From b7320471de524ffa0e2ba3f561e4c117c1600b62 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Jul 2017 02:30:54 +0200
Subject: vim-patch:8.0.0128

Problem:    Display test fails on MS-Windows.
Solution:   Set 'isprint' to "@".

https://github.com/vim/vim/commit/7089237885218eb8a19805bc2b75481c4efcd6ba
---
 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 ca1d64ac56..dfee84c1b2 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -824,7 +824,7 @@ static const int included_patches[] = {
   // 131,
   // 130 NA
   // 129 NA
-  // 128,
+  128,
   127,
   126,
   // 125,
-- 
cgit 


From c747b53f84bfd64ec9f36d4b5912a980a6da8b3e Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Jul 2017 01:46:43 +0200
Subject: vim-patch:8.0.0311

Problem:    Linebreak tests are old style.
Solution:   Turn the tests into new style. Share utility functions. (Ozaki
            Kiichi, closes vim/vim#1444)

https://github.com/vim/vim/commit/544d3bc9f0e494cb712a33b61558b8e8e12b1e0b
---
 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 dfee84c1b2..7fca8aee82 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -641,7 +641,7 @@ static const int included_patches[] = {
   // 314,
   // 313,
   // 312,
-  // 311,
+  311,
   // 310,
   // 309,
   // 308,
-- 
cgit 


From 49b671f8f1c93dcd317aec464352206cc705748a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Jul 2017 02:11:31 +0200
Subject: vim-patch:8.0.0290 vim-patch:8.0.0394

vim-patch:8.0.0290: cursor positioning wrong if wide character wraps
Problem:    If a wide character doesn't fit at the end of the screen line, and
            the line doesn't fit on the screen, then the cursor position may
            be wrong. (anliting)
Solution:   Don't skip over wide character. (Christian Brabandt, closes vim/1408)

vim-patch:8.0.0394
Problem:    Tabs are not aligned when scrolling horizontally and a Tab doesn't
            fit. (Axel Bender)
Solution:   Handle a Tab as a not fitting character. (Christian Brabandt)
            Also fix that ":redraw" does not scroll horizontally to show the
            cursor.  And fix the test that depended on the old behavior.

https://github.com/vim/vim/commit/abc39ab642791ae3d22a524516eeedb673a95d9d
---
 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 7fca8aee82..a7479c6b18 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -558,7 +558,7 @@ static const int included_patches[] = {
   // 397,
   // 396,
   // 395,
-  // 394,
+  394,
   393,
   // 392,
   // 391,
@@ -662,7 +662,7 @@ static const int included_patches[] = {
   // 293,
   // 292,
   // 291,
-  // 290,
+  290,
   // 289,
   // 288 NA
   // 287,
-- 
cgit 


From cddd4e613e2fefaa1c3fe8c20617f5ee02845617 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Jul 2017 01:44:58 +0200
Subject: vim-patch:8.0.0518

Closes #7086

Problem:    Storing a zero byte from a multi-byte character causes fold text
            to show up wrong.
Solution:   Avoid putting zero in ScreenLines. (Christian Brabandt,
            closes vim/vim#1567)

https://github.com/vim/vim/commit/c6cd8409c2993b1476e123fba11cb4b8d743b896
---
 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 a7479c6b18..b6386049bf 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -434,7 +434,7 @@ static const int included_patches[] = {
   // 521,
   // 520,
   // 519,
-  // 518,
+  518,
   // 517,
   // 516,
   // 515,
-- 
cgit 


From a0c7e35eeed489840f1d063b3b8265d01024e340 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Jul 2017 02:40:25 +0200
Subject: vim-patch:8.0.0524

Problem:    Folds are messed up when 'encodin' is "utf-8".
Solution:   Also set the fold character when it's not multi-byte.

https://github.com/vim/vim/commit/8da1e6cedf839902e15987a98733ebd31b5f1b81
---
 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 b6386049bf..a1655f1caa 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -428,7 +428,7 @@ static const int included_patches[] = {
   // 527,
   // 526,
   // 525,
-  // 524,
+  524,
   // 523,
   // 522,
   // 521,
-- 
cgit 


From c87dbadc44f7d3705c7cf4e4dc7345da33f63e1a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 12 Aug 2017 18:22:47 +0200
Subject: vim-patch:8.0.0235

Problem:    Memory leak detected when running tests for diff mode.
Solution:   Free p_extra_free.

https://github.com/vim/vim/commit/b031c4ea04eb1e37a873fbb85e90d835aa1e2b1c
---
 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 a1655f1caa..f4984864f3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -717,7 +717,7 @@ static const int included_patches[] = {
   // 238,
   // 237,
   // 236,
-  // 235,
+  235,
   // 234,
   // 233,
   // 232 NA
-- 
cgit 


From f0a9b7ff637b1c33988b8ec20530657ba71644fc Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 25 Jun 2017 06:43:26 +0200
Subject: vim-patch:8.0.0678 closing a window does not trigger resizing

Closes #6748

Problem:    When 'equalalways' is set and closing a window in a separate
            frame, not all window sizes are adjusted. (Glacambre)
Solution:   Resize all windows if the new current window is not in the same
            frame as the closed window. (closes vim/vim#1707)

https://github.com/vim/vim/commit/8eeeba8c025ff844e6514c4a60cec11bf1fc1b35
---
 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 f4984864f3..80b8b03258 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -274,7 +274,7 @@ static const int included_patches[] = {
   // 681,
   // 680,
   // 679,
-  // 678,
+  678,
   // 677,
   // 676,
   // 675,
-- 
cgit 


From 1fb3339844b2244daaee9b44264137c8c6c67164 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 27 Jun 2017 02:32:08 +0200
Subject: vim-patch:8.0.0679

Problem:    Using freed memory.
Solution:   Get the parent frame pointer earlier.

https://github.com/vim/vim/commit/41cc038ff83498c589c7d25b3d2984145528eb92
---
 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 80b8b03258..bd90f28629 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -273,7 +273,7 @@ static const int included_patches[] = {
   // 682,
   // 681,
   // 680,
-  // 679,
+  679,
   678,
   // 677,
   // 676,
-- 
cgit 


From 8dddf5590796994254fb31b4cbe1736ec3faf9f6 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Wed, 19 Jul 2017 22:48:05 +0800
Subject: vim-patch:8.0.0044

Problem:    In diff mode the cursor may end up below the last line, resulting
            in an ml_get error.
Solution:   Check the line to be valid.

https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
---
 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 f4984864f3..86c87b08ef 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -908,7 +908,7 @@ static const int included_patches[] = {
   47,
   46,
   // 45 NA
-  // 44,
+  44,
   43,
   42,
   41,
-- 
cgit 


From 6ca6a8134ddf62d3b6abc57185b096fd712cc873 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 17 Aug 2017 00:29:25 +0200
Subject: intro: remove byline #6984

---
 src/nvim/version.c | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index f5b45caefc..e024982faf 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -1216,7 +1216,6 @@ void intro_message(int colon)
   static char *(lines[]) = {
     N_(NVIM_VERSION_LONG),
     "",
-    N_("by al."),
     N_("Nvim is open source and freely distributable"),
     N_("https://neovim.io/community"),
     "",
-- 
cgit 


From af046a3a81c0d7ebc5219bf20c1463cb5ccd1b9b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 17 Aug 2017 21:23:28 +0200
Subject: version: tweak layout, doc

---
 src/nvim/version.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index e024982faf..2a3fdbd70d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -1089,13 +1089,7 @@ static void list_features(void)
           msg_putchar('\n');
         }
       } else {
-        while (msg_col % width) {
-          int old_msg_col = msg_col;
-          msg_putchar(' ');
-          if (old_msg_col == msg_col) {
-            break;  // XXX: Avoid infinite loop.
-          }
-        }
+        msg_putchar(' ');
       }
     } else {
       if (msg_col > 0) {
@@ -1103,7 +1097,7 @@ static void list_features(void)
       }
     }
   }
-  MSG_PUTS("For differences from Vim, see :help vim-differences\n\n");
+  MSG_PUTS("See \":help feature-compile\"\n\n");
 }
 
 void list_version(void)
@@ -1144,7 +1138,7 @@ void list_version(void)
   }
 #endif  // ifdef HAVE_PATHDEF
 
-  version_msg(_("\n\nOptional features included (+) or not (-): "));
+  version_msg(_("\n\nFeatures: "));
 
   list_features();
 
-- 
cgit 


From d2595ba1c4491a31d18211050e1abe86ea5379d3 Mon Sep 17 00:00:00 2001
From: Lech Lorens <lech.lorens@gmail.com>
Date: Sun, 20 Aug 2017 12:14:27 +0200
Subject: vim-patch:8.0.0092

Problem:    C indenting does not support nested namespaces that C++ 17 has.
Solution:   Add check that passes double colon inside a name. (Pauli, closes
            vim/vim#1214)

https://github.com/vim/vim/commit/ca8b8d6956dd881de6446fc32c38e817a364a6cc
---
 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 2a3fdbd70d..68c41cee88 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -860,7 +860,7 @@ static const int included_patches[] = {
   // 95 NA
   // 94 NA
   // 93 NA
-  // 92,
+  92,
   // 91,
   90,
   // 89 NA
-- 
cgit 


From a66eca78c2082aca112125f759be2ef3aa7ef832 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 21 Aug 2017 12:10:15 -0400
Subject: vim-patch:8.0.0308

Problem:    When using a symbolic link, the package path will not be inserted
            at the right position in 'runtimepath'. (Dugan Chen, Norio Takagi)
Solution:   Resolve symbolic links when finding the right position in
            'runtimepath'. (Hirohito Higashi)

https://github.com/vim/vim/commit/2f9e575583c2ad3978ee3d0f790eeff7df56bd6c
---
 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 2a3fdbd70d..a190293d8e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -644,7 +644,7 @@ static const int included_patches[] = {
   311,
   // 310,
   // 309,
-  // 308,
+  308,
   307,
   // 306,
   // 305,
-- 
cgit 


From 24a556419627d3369f0a55b95dce07cb5316cf8b Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 21 Aug 2017 12:37:24 -0400
Subject: vim-patch:8.0.0325

Problem:    Packadd test does not clean up symlink.
Solution:   Delete the link. (Hirohito Higashi)

https://github.com/vim/vim/commit/913727e56761d57aaba61197c2d3485418dea7eb
---
 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 a190293d8e..a0c46c0e3d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -627,7 +627,7 @@ static const int included_patches[] = {
   // 328,
   // 327,
   // 326,
-  // 325,
+  325,
   // 324,
   // 323,
   322,
-- 
cgit 


From 651c6f9b6ebcd76fbf65045ab877fdf38b9d3db2 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 21 Aug 2017 12:38:24 -0400
Subject: vim-patch:8.0.0326

Problem:    Packadd test uses wrong directory name.
Solution:   Use the variable name value. (Hirohito Higashi)

https://github.com/vim/vim/commit/24f8f543d4036c5d2ce4ea6973a174cf2176cb72
---
 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 a0c46c0e3d..92c776c1e8 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -626,7 +626,7 @@ static const int included_patches[] = {
   // 329,
   // 328,
   // 327,
-  // 326,
+  326,
   325,
   // 324,
   // 323,
-- 
cgit 


From fc7bf1c71d41dae7b8ab7e82b92ec0e8253b5291 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 21 Aug 2017 12:46:07 -0400
Subject: vim-patch:8.0.0437

Problem:    The packadd test does not create the symlink correctly and does
            not test the right thing.
Solution:   Create the directory and symlink correctly.

https://github.com/vim/vim/commit/644df41c44cbdfacdedbba55ef77a6c6031eccd8
---
 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 92c776c1e8..d4cbf32009 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -515,7 +515,7 @@ static const int included_patches[] = {
   // 440,
   // 439,
   // 438,
-  // 437,
+  437,
   // 436,
   // 435,
   // 434,
-- 
cgit 


From 622c3454dff35cae7ec93383bbf49f16621dc778 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 21 Aug 2017 12:47:58 -0400
Subject: vim-patch:8.0.0612

Problem:    Package directories are added to 'runtimepath' only after loading
            non-package plugins.
Solution:   Split off the code to add package directories to 'runtimepath'.
            (Ingo Karkat, closes vim/vim#1680)

https://github.com/vim/vim/commit/ce876aaa9a250a5a0d0e34b3a2625e51cf9bf5bb
---
 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 d4cbf32009..3313ffdfa9 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -340,7 +340,7 @@ static const int included_patches[] = {
   // 615,
   614,
   // 613,
-  // 612,
+  612,
   // 611,
   // 610,
   // 609,
-- 
cgit 


From 41d180abb4693814be5833b0907e111ce46b3791 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 21 Aug 2017 12:54:22 -0400
Subject: vim-patch:8.0.0680

Problem:    Plugins in start packages are sourced twice. (mseplowitz)
Solution:   Use the unmodified runtime path when loading plugins (test by Ingo
            Karkat, closes vim/vim#1801)

https://github.com/vim/vim/commit/07ecfa64a18609a986f21d6132d04ee8934f3200
---
 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 3313ffdfa9..598c3c3778 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -272,7 +272,7 @@ static const int included_patches[] = {
   // 683,
   // 682,
   // 681,
-  // 680,
+  680,
   679,
   678,
   // 677,
-- 
cgit 


From 0e13b15fde1cc02cd1bb390d161cdc13afb96e39 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Wed, 30 Aug 2017 19:54:14 +0800
Subject: vim-patch:8.0.0209

Problem:    When using :substitute with the "c" flag and 'cursorbind' is set
            the cursor is not updated in other windows.
Solution:   Call do_check_cursorbind(). (Masanori Misono)

https://github.com/vim/vim/commit/41baa7983aa81b0343b053e6a672cf8224a10245
---
 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 53b44f8029..d7ebc26321 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -743,7 +743,7 @@ static const int included_patches[] = {
   // 212,
   // 211 NA
   // 210,
-  // 209,
+  209,
   208,
   // 207,
   // 206,
-- 
cgit 


From 11429f94293b95394df436cb09d64a528fa387db Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 3 Sep 2017 16:58:32 +0800
Subject: vim-patch:8.0.0247 (#7232)

Problem:    Under some circumstances, one needs to type Ctrl-N or Ctrl-P twice
            to have a menu entry selected. (Lifepillar)
Solution:   call ins_compl_free(). (Christian Brabandt, closes vim/vim#1411)

https://github.com/vim/vim/commit/aed6d0b81a14a81433c0f3c2c65cef935100db33
---
 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 d7ebc26321..73ac3fa6ce 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -705,7 +705,7 @@ static const int included_patches[] = {
   250,
   // 249 NA
   // 248,
-  // 247,
+  247,
   // 246 NA
   // 245,
   // 244,
-- 
cgit 


From 69a201d6c5504ded687a0603c2a6e88531deb5dc Mon Sep 17 00:00:00 2001
From: Albert Han <yjhan96@gmail.com>
Date: Sun, 3 Sep 2017 09:23:09 -0400
Subject: vim-patch:8.0.0125

Problem:    Not enough testing for entering Ex commands.
Solution:   Add test for CTRL-\ e {expr}. (Dominique Pelle)

https://github.com/vim/vim/commit/eaaa9bbda6ec0a8589a9b23720f95bffe01dc267
---
 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 73ac3fa6ce..6e24e30a09 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -827,7 +827,7 @@ static const int included_patches[] = {
   128,
   127,
   126,
-  // 125,
+  125,
   124,
   // 123 NA
   // 122 NA
-- 
cgit 


From 82795c2c3a429b2725af882cad4317bed8f1b741 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Wed, 6 Sep 2017 01:04:57 +0800
Subject: vim-patch: 8.0.0{181,182,188} (#7152)

vim-patch:8.0.0181
Problem:    When 'cursorbind' and 'cursorcolumn' are both on, the column
            highlignt in non-current windows is wrong.
Solution:   Add validate_cursor(). (Masanori Misono, closes vim/vim#1372)
https://github.com/vim/vim/commit/519d7785f4437762c07b2e04217f83a069a8c663

vim-patch:8.0.0182
Problem:    When 'cursorbind' and 'cursorline' are set, but 'cursorcolumn' is
            not, then the cursor line highlighting is not updated. (Hirohito
            Higashi)
Solution:   Call redraw_later() with NOT_VALID.
https://github.com/vim/vim/commit/e47683a0913f102b6ae08c8848d5aa675d99b188

vim-patch:8.0.0188
    Problem:    Using NOT_VALID for redraw_later() to update the cursor
                line/column highlighting is not efficient.
    Solution:   Call validate_cursor() when 'cul' or 'cuc' is set.
https://github.com/vim/vim/commit/9506cad7a1a6e52a613f356de969cbd980815777
---
 src/nvim/version.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 6e24e30a09..ce1cc03c1f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -764,14 +764,14 @@ static const int included_patches[] = {
   // 191 NA
   190,
   // 189,
-  // 188,
+  188,
   // 187 NA
   // 186,
   // 185,
   // 184,
   // 183,
-  // 182,
-  // 181,
+  182,
+  181,
   // 180,
   179,
   178,
-- 
cgit 


From 713a957e9c90fc1c57935e33346347807595f946 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 10 Sep 2017 18:21:52 +0800
Subject: vim-patch:8.0.0282 vim-patch:8.0.0291 (#7255)

vim-patch:8.0.0291

Problem:    Visual block insertion does not insert in all lines.
Solution:   Don't bail out of insert too early. Add a test. (Christian
            Brabandt, closes vim/vim#1290)

https://github.com/vim/vim/commit/23fa81d2223cd9bb7c51829c48047b2976bc2d11

vim-patch:8.0.0282

Problem:    When doing a Visual selection and using "I" to go to insert mode,
            CTRL-O needs to be used twice to go to Normal mode.
            (Coacher)
Solution:   Check for the return value of edit(). (Christian Brabandt,
            closes #1290)

https://github.com/vim/vim/commit/0b5c93a7f266cd8c90ea27bdaf9f7214a95d64d7
---
 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 ce1cc03c1f..e7061fff9d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -661,7 +661,7 @@ static const int included_patches[] = {
   // 294,
   // 293,
   // 292,
-  // 291,
+  291,
   290,
   // 289,
   // 288 NA
@@ -670,7 +670,7 @@ static const int included_patches[] = {
   // 285 NA
   // 284 NA
   // 283,
-  // 282,
+  282,
   // 281 NA
   280,
   // 279 NA
-- 
cgit 


From ceade2fe53175555c44fdc4b65530f18aeb17591 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 10 Sep 2017 18:52:43 +0800
Subject: vim-patch:8.0.0186 (#7154)

Problem:    The error message from assert_notequal() is confusing.
Solution:   Only mention the expected value.

https://github.com/vim/vim/commit/5869cf060e60cc09e71b2b3bd85f0576ec78f9f5
---
 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 e7061fff9d..4c0071f248 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -766,7 +766,7 @@ static const int included_patches[] = {
   // 189,
   188,
   // 187 NA
-  // 186,
+  186,
   // 185,
   // 184,
   // 183,
-- 
cgit 


From d2cbc311855114b7736919a344a82e303d4a8164 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 11 Sep 2017 22:17:41 +0800
Subject: Vim-patch 8.0.0300 (#7258)

vim-patch:8.0.0300

Problem:    Cannot stop diffing hidden buffers. (Daniel Hahler)
Solution:   When using :diffoff! make the whole list if diffed buffers empty.
            (closes vim/vim#736)

https://github.com/vim/vim/commit/25ea0544587dd45088512fec9d7a685e35fea679
---
 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 4c0071f248..6f38776a60 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -652,7 +652,7 @@ static const int included_patches[] = {
   // 303,
   // 302,
   // 301,
-  // 300,
+  300,
   // 299,
   // 298,
   297,
-- 
cgit 


From e53af2b1f50c4662698f4a7c42a6008955a73426 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 18 Sep 2017 01:43:45 +0800
Subject: vim-patch:8.0.0305 (#7265)

Problem:    Invalid memory access when option has duplicate flag.
Solution:   Correct pointer computation. (Dominique Pelle, closes vim/vim#1442)

https://github.com/vim/vim/commit/aaaf57d8a936efe420190c077e4a74041cc6c72e
---
 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 6f38776a60..f5df256d3d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -647,7 +647,7 @@ static const int included_patches[] = {
   308,
   307,
   // 306,
-  // 305,
+  305,
   // 304,
   // 303,
   // 302,
-- 
cgit 


From 009c695f0a6c6da322f89e0f621d59d596e712fa Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 18 Sep 2017 01:56:08 +0800
Subject: vim-patch:8.0.0302 NA (#7264)

(NA: Nvim removed the ability to set termcodes directly.)

Problem:    Cannot set terminal key codes with :let.
Solution:   Make it work.

https://github.com/vim/vim/commit/e353c402e63b9b0a0bc06acf390e352d9e7eeaeb
---
 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 f5df256d3d..e4142dea98 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -650,7 +650,7 @@ static const int included_patches[] = {
   305,
   // 304,
   // 303,
-  // 302,
+  // 302, NA
   // 301,
   300,
   // 299,
-- 
cgit 


From cf59d617bc6d2aabb487c4d6be8082160a633a39 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 18 Sep 2017 02:04:17 +0800
Subject: vim-patch:8.0.0324 (#7279)

Problem:    Illegal memory access with "1;y".
Solution:   Call check_cursor() instead of check_cursor_lnum(). (Dominique
            Pelle, closes vim/vim#1455)

https://github.com/vim/vim/commit/f1f6f3f7df2938b3583e341482d96c1d53124c51
---
 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 e4142dea98..1f040b214b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -628,7 +628,7 @@ static const int included_patches[] = {
   // 327,
   326,
   325,
-  // 324,
+  324,
   // 323,
   322,
   // 321,
-- 
cgit 


From 12efbf897de28f00523885ceb99fb7cf41ed82e6 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 18 Sep 2017 02:05:22 +0800
Subject: vim-patch:8.0.0327 (#7281)

Problem:    The E11 error message in the command line window is not
            translated.
Solution:   use _(). (Hirohito Higashi)

https://github.com/vim/vim/commit/75c19464ed7fb6024af64747379e61abc4e4a483
---
 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 1f040b214b..675ebb17b0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -625,7 +625,7 @@ static const int included_patches[] = {
   // 330,
   // 329,
   // 328,
-  // 327,
+  327,
   326,
   325,
   324,
-- 
cgit 


From f8dcd319d9338cccc66ae481d5865e8816794306 Mon Sep 17 00:00:00 2001
From: Michael Schupikov <DarkDeepBlue@users.noreply.github.com>
Date: Sat, 23 Sep 2017 08:32:29 +0200
Subject: vim-patch:8.0.0294 (#7305)

Problem:    Argument list is not stored correctly in a session file.
            (lgpasquale)
Solution:   Use "$argadd" instead of "argadd". (closes vim/vim#1434)

https://github.com/vim/vim/commit/79da563cf9220b9abb83455a68d995684133ea56
Signed-off-by: Michael Schupikov <michael@schupikov.de>
---
 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 675ebb17b0..d4f9c0232f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -658,7 +658,7 @@ static const int included_patches[] = {
   297,
   // 296,
   // 295,
-  // 294,
+  294,
   // 293,
   // 292,
   291,
-- 
cgit 


From 3ab6a519fca63d1fcb5eeb98437697a7abaca7b0 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 24 Sep 2017 09:29:08 +0800
Subject: vim-patch:8.0.0328

Problem:    The "zero count" error doesn't have a number. (Hirohito Higashi)
Solution:   Give it a number and be more specific about the error.

https://github.com/vim/vim/commit/23a5558cfd860401aa694f0302d621887440f031
---
 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 d4f9c0232f..09a62a3b0e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -624,7 +624,7 @@ static const int included_patches[] = {
   331,
   // 330,
   // 329,
-  // 328,
+  328,
   327,
   326,
   325,
-- 
cgit 


From 006425b8b683711cfb4f89074034ec1fe2085d40 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 24 Sep 2017 09:48:52 +0800
Subject: vim-patch:8.0.0330

Problem:    Illegal memory access after "vapo". (Dominique Pelle)
Solution:   Fix the cursor column.

https://github.com/vim/vim/commit/84b2a381451e9068b09ef6d85f5e8cf1598e7355
---
 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 d4f9c0232f..b642777d8a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -622,7 +622,7 @@ static const int included_patches[] = {
   // 333,
   // 332,
   331,
-  // 330,
+  330,
   // 329,
   // 328,
   327,
-- 
cgit 


From 2b53a565b991fc329ab7af683ec50e9cfcac557f Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 24 Sep 2017 10:05:53 +0800
Subject: vim-patch:8.0.0333

Problem:    Illegal memory access when 'complete' ends in a backslash.
Solution:   Check for trailing backslash. (Dominique Pelle, closes vim/vim#1478)

https://github.com/vim/vim/commit/226c53429109f24e31c17016aedfd7fbf7a9aa50
---
 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 d4f9c0232f..7470b07655 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -619,7 +619,7 @@ static const int included_patches[] = {
   // 336,
   // 335,
   // 334,
-  // 333,
+  333,
   // 332,
   331,
   // 330,
-- 
cgit 


From 583b68f5a94f362c44ff29c62909969e6908438b Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 24 Sep 2017 11:06:16 +0800
Subject: vim-patch:8.0.0101

Problem:    Some options are not strictly checked.
Solution:   Add flags for strickter checks.

https://github.com/vim/vim/commit/031cb743ae154cfb727a9b7787bdcb61202ff1c8
---
 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 d4f9c0232f..feb69cae52 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -851,7 +851,7 @@ static const int included_patches[] = {
   // 104,
   // 103 NA
   // 102,
-  // 101,
+  101,
   100,
   99,
   // 98 NA
-- 
cgit 


From d2eba872fb80ec9ace3a244aa706e55c82a48e83 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 24 Sep 2017 11:06:16 +0800
Subject: vim-patch:8.0.0101

Problem:    Some options are not strictly checked.
Solution:   Add flags for strickter checks.

https://github.com/vim/vim/commit/031cb743ae154cfb727a9b7787bdcb61202ff1c8
---
 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 d4f9c0232f..feb69cae52 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -851,7 +851,7 @@ static const int included_patches[] = {
   // 104,
   // 103 NA
   // 102,
-  // 101,
+  101,
   100,
   99,
   // 98 NA
-- 
cgit 


From cd13c24427a3191c7383b76a0bf9467bee2736e3 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 24 Sep 2017 11:54:40 +0800
Subject: vim-patch:8.0.0102

Problem:    Cannot set 'dictionary' to a path.
Solution:   Allow for slash and backslash.  Add a test (partly by Daisuke
            Suzuki, closes vim/vim#1279, closes vim/vim#1284)

https://github.com/vim/vim/commit/7554da4033498c4da0af3cde542c3e87e9097b73
---
 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 feb69cae52..890587b307 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -850,7 +850,7 @@ static const int included_patches[] = {
   // 105 NA
   // 104,
   // 103 NA
-  // 102,
+  102,
   101,
   100,
   99,
-- 
cgit 


From 3a1c33a6c3ad5074bfc442507282a438726f1b58 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 24 Sep 2017 13:21:07 +0800
Subject: vim-patch:8.0.0106

Problem:    Cannot use a semicolon in 'backupext'. (Jeff)
Solution:   Allow for a few more characters when "secure" isn't set.

https://github.com/vim/vim/commit/0945eaface83e78138fbd40f95cc590bab0e8c86
---
 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 06482bf490..f6a9418dbf 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -846,7 +846,7 @@ static const int included_patches[] = {
   // 109 NA
   // 108 NA
   // 107 NA
-  // 106,
+  106,
   // 105 NA
   104,
   // 103 NA
-- 
cgit 


From 2b4a52f901bf4cc9a88c45eea39c303028091dd3 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 24 Sep 2017 23:20:45 +0800
Subject: vim-patch:8.0.0091 (#7312)

Problem:    Test_help_complete sometimes fails in MS-Windows console.
Solution:   Use getcompletion() instead of feedkeys() and command line
            completion. (Hirohito Higashi)

https://github.com/vim/vim/commit/9f0e423c2818c0cacd0810f9c3c67cbb6b80963d
---
 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 d4f9c0232f..16523380cc 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -861,7 +861,7 @@ static const int included_patches[] = {
   // 94 NA
   // 93 NA
   92,
-  // 91,
+  91,
   90,
   // 89 NA
   88,
-- 
cgit 


From 1c7f396f0cba3e87c4c1cae041489e28d59d1306 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 26 Sep 2017 15:32:31 -0400
Subject: vim-patch:8.0.0112

Problem:    Tests 92 and 93 are old style.
Solution:   Make test92 and test93 new style. (Hirohito Higashi, closes vim/vim#1289)

https://github.com/vim/vim/commit/eca626fcdb73d480660c78b9f84cc043fa561922
---
 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 a060b4a74f..80018f6eab 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -840,7 +840,7 @@ static const int included_patches[] = {
   // 115 NA
   // 114 NA
   // 113 NA
-  // 112,
+  112,
   111,
   110,
   // 109 NA
-- 
cgit 


From 5bb2a19417e33ef573411b2069ab3d8095f7a9fa Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 26 Sep 2017 15:39:41 -0400
Subject: vim-patch:8.0.0253

Problem:    When creating a session when winminheight is 2 or larger and
            loading that session gives an error.
Solution:   Also set winminheight before setting winheight to 1. (Rafael
            Bodill, neovim vim/vim#5717)

https://github.com/vim/vim/commit/36ae89c550a4f0a380606c3fb4a054957ad698f0
---
 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 80018f6eab..f2686eacec 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -699,7 +699,7 @@ static const int included_patches[] = {
   // 256,
   // 255,
   // 254,
-  // 253,
+  253,
   // 252,
   // 251,
   250,
-- 
cgit 


From 43da7ea27b3391a9e74c658b90a5ed1cae926d40 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 26 Sep 2017 15:50:09 -0400
Subject: vim-patch:8.0.0258

Problem:    mksession test leaves file behind.
Solution:   Delete the file.  Rename files to start with "X".

https://github.com/vim/vim/commit/c9b56b2ceb4662f87c39ea07ba5090a073fd6286
---
 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 f2686eacec..580ed592ca 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -694,7 +694,7 @@ static const int included_patches[] = {
   // 261,
   // 260 NA
   259,
-  // 258,
+  258,
   // 257 NA
   // 256,
   // 255,
-- 
cgit 


From 25d4cd7e2830265505b0f6f88e6d08b4954af6eb Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 26 Sep 2017 15:52:21 -0400
Subject: vim-patch:8.0.1024

Problem:    Manual folds are lost when a session file has the same buffer in
            two windows. (Jeansen)
Solution:   Use ":edit" only once. (Christian Brabandt, closes vim/vim#1958)

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

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 580ed592ca..9f75f75d4f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -77,6 +77,157 @@ static char *features[] = {
 
 // clang-format off
 static const int included_patches[] = {
+  // 1026,
+  // 1025,
+  1024,
+  // 1023,
+  // 1022,
+  // 1021,
+  // 1020,
+  // 1019,
+  // 1018,
+  // 1017,
+  // 1016,
+  // 1015,
+  // 1014,
+  // 1013,
+  // 1012,
+  // 1011,
+  // 1010,
+  // 1009,
+  // 1008,
+  // 1007,
+  // 1006,
+  // 1005,
+  // 1004,
+  // 1003,
+  // 1002,
+  // 1001,
+  // 1000,
+  // 999,
+  // 998,
+  // 997,
+  // 996,
+  // 995,
+  // 994,
+  // 993,
+  // 992,
+  // 991,
+  // 990,
+  // 989,
+  // 988,
+  // 987,
+  // 986,
+  // 985,
+  // 984,
+  // 983,
+  // 982,
+  // 981,
+  // 980,
+  // 979,
+  // 978,
+  // 977,
+  // 976,
+  // 975,
+  // 974,
+  // 973,
+  // 972,
+  // 971,
+  // 970,
+  // 969,
+  // 968,
+  // 967,
+  // 966,
+  // 965,
+  // 964,
+  // 963,
+  // 962,
+  // 961,
+  // 960,
+  // 959,
+  // 958,
+  // 957,
+  // 956,
+  // 955,
+  // 954,
+  // 953,
+  // 952,
+  // 951,
+  // 950,
+  // 949,
+  // 948,
+  // 947,
+  // 946,
+  // 945,
+  // 944,
+  // 943,
+  // 942,
+  // 941,
+  // 940,
+  // 939,
+  // 938,
+  // 937,
+  // 936,
+  // 935,
+  // 934,
+  // 933,
+  // 932,
+  // 931,
+  // 930,
+  // 929,
+  // 928,
+  // 927,
+  // 926,
+  // 925,
+  // 924,
+  // 923,
+  // 922,
+  // 921,
+  // 920,
+  // 919,
+  // 918,
+  // 917,
+  // 916,
+  // 915,
+  // 914,
+  // 913,
+  // 912,
+  // 911,
+  // 910,
+  // 909,
+  // 908,
+  // 907,
+  // 906,
+  // 905,
+  // 904,
+  // 903,
+  // 902,
+  // 901,
+  // 900,
+  // 899,
+  // 898,
+  // 897,
+  // 896,
+  // 895,
+  // 894,
+  // 893,
+  // 892,
+  // 891,
+  // 890,
+  // 889,
+  // 888,
+  // 887,
+  // 886,
+  // 885,
+  // 884,
+  // 883,
+  // 882,
+  // 881,
+  // 880,
+  // 879,
+  // 878,
+  // 877,
+  // 876,
   // 875,
   // 874,
   // 873,
-- 
cgit 


From e0197a4d76420e611e9da2f437f01cb31d65cdb0 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 26 Sep 2017 16:04:01 -0400
Subject: vim-patch:8.0.1025

Problem:    Stray copy command in test.
Solution:   Remove the copy command.

https://github.com/vim/vim/commit/4e83961985abb78757b135f29ac4ffde675247af
---
 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 9f75f75d4f..fa8b495703 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -78,7 +78,7 @@ static char *features[] = {
 // clang-format off
 static const int included_patches[] = {
   // 1026,
-  // 1025,
+  1025,
   1024,
   // 1023,
   // 1022,
-- 
cgit 


From 36f13ceb0ab384f0cad9813ae02792a1cf13021a Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Wed, 27 Sep 2017 20:05:17 +0800
Subject: vim-patch:8.0.0131

Problem:    Not enough test coverage for syntax commands.
Solution:   Add more tests. (Dominique Pelle)

https://github.com/vim/vim/commit/73b484c4da00011317dc68ada4f5dfc6515ad263
---
 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 b0d4e194fa..bf53f16e8d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -972,7 +972,7 @@ static const int included_patches[] = {
   134,
   133,
   // 132,
-  // 131,
+  131,
   // 130 NA
   // 129 NA
   128,
-- 
cgit 


From 65c97961ecdcfa89bb0ce9ff88f1e84e4d926f21 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Wed, 27 Sep 2017 20:06:35 +0800
Subject: vim-patch:8.0.0132

Problem:    Test fails because of using :finish.
Solution:   Change to return.

https://github.com/vim/vim/commit/4c8980b717f73042f1d625ee255fa74eddb989ba
---
 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 bf53f16e8d..6b57185b50 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -971,7 +971,7 @@ static const int included_patches[] = {
   135,
   134,
   133,
-  // 132,
+  132,
   131,
   // 130 NA
   // 129 NA
-- 
cgit 


From f97ca6b3339ca04477296c834a159d40d2201ccd Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Thu, 28 Sep 2017 11:47:26 +0800
Subject: vim-patch:8.0.0155

Problem:    When sorting zero elements a NULL pointer is passed to qsort(),
            which ubsan warns for.
Solution:   Don't call qsort() if there are no elements. (Dominique Pelle)

https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
---
 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 6b57185b50..1432a92998 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -948,7 +948,7 @@ static const int included_patches[] = {
   158,
   // 157,
   156,
-  // 155,
+  155,
   // 154,
   // 153,
   // 152 NA
-- 
cgit 


From 9ad7529f705c883e13fba9a014696fb37318145f Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sat, 7 Oct 2017 20:32:37 +0800
Subject: vim-patch:8.0.0157 (#7362)

Problem:    No command line completion for ":syntax spell" and ":syntax sync".
Solution:   Implement the completion. (Dominique Pelle)

https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
---
 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 b0d4e194fa..76897088a1 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -946,7 +946,7 @@ static const int included_patches[] = {
   // 160,
   159,
   158,
-  // 157,
+  157,
   156,
   // 155,
   // 154,
-- 
cgit 


From c0e45d97b0cbc700cd6f2b9733c15875339262df Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sat, 30 Sep 2017 21:43:03 +0800
Subject: vim-patch:8.0.0148 #7344

Problem:    When a C preprocessor statement has two line continuations the
            following line does not have the right indent. (Ken Takata)
Solution:   Add the indent of the previous continuation line. (Hirohito
            Higashi)

https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
---
 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 76897088a1..8bcf8c7a59 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -955,7 +955,7 @@ static const int included_patches[] = {
   // 151,
   150,
   149,
-  // 148,
+  148,
   147,
   146,
   // 145 NA
-- 
cgit 


From e3ca1e604630d930ddc49fccb9a1541d381b1915 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sat, 7 Oct 2017 23:20:34 +0800
Subject: vim-patch:8.0.0142 (#7335)

see also #7082

Problem:    Normal colors are wrong with 'termguicolors'.
Solution:   Initialize to INVALCOLOR instead of zero. (Ben Jackson, closes vim/vim#1344)

https://github.com/vim/vim/commit/0cdb72aa38c4a0140c94d56bf8bc17cb30260ebf
---
 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 8bcf8c7a59..8015d7520d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -961,7 +961,7 @@ static const int included_patches[] = {
   // 145 NA
   // 144 NA
   143,
-  // 142,
+  142,
   // 141,
   // 140,
   // 139 NA
-- 
cgit 


From 1663599bebd7bd360f116b003b9f572b01d7a8d8 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 9 Oct 2017 00:52:57 +0800
Subject: vim-patch:8.0.0164 (#7368)

Problem:    Outdated and misplaced comments.
Solution:   Fix the comments.

https://github.com/vim/vim/commit/caa55b65c204946d160c1b743c5f8f3b506dc4d3
---
 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 8015d7520d..11ae3f11b6 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -939,7 +939,7 @@ static const int included_patches[] = {
   167,
   // 166,
   165,
-  // 164,
+  164,
   // 163 NA
   // 162 NA
   // 161 NA
-- 
cgit 


From 97dc1350f0d4f8509ebad2beb7da8847b81bbf4b Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Tue, 10 Oct 2017 14:53:27 +0800
Subject: vim-patch:8.0.0183 NA

Problem:    Ubsan warns for using a pointer that is not aligned.
Solution:   First copy the address. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/7173b47958a238bb07f80b8f26fb232b0ea69b4a
---
 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 7e59f3327a..cb66dcd6fe 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -920,7 +920,7 @@ static const int included_patches[] = {
   186,
   // 185,
   // 184,
-  // 183,
+  // 183 NA
   182,
   181,
   // 180,
-- 
cgit 


From d214df4e9b23b5f2d9f7e6c78624881a7d298cdb Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 15 Oct 2017 20:31:12 +0200
Subject: doc: replace ":CheckHealth" with ":checkhealth"

---
 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 7e59f3327a..c2a8dcac07 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -1365,7 +1365,7 @@ void intro_message(int colon)
     N_("https://neovim.io/community"),
     "",
     N_("type  :help nvim<Enter>       if you are new! "),
-    N_("type  :CheckHealth<Enter>     to optimize Nvim"),
+    N_("type  :checkhealth<Enter>     to optimize Nvim"),
     N_("type  :q<Enter>               to exit         "),
     N_("type  :help<Enter>            for help        "),
     "",
-- 
cgit 


From 70b574dab36a99e676b1845bdfe0fef4bfa63584 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 17 Oct 2017 12:55:12 -0400
Subject: vim-patch:8.0.0118

Runtime updates that were bundled into the otherwise NA commit:

Problem:    "make proto" adds extra function prototype.
Solution:   Add vim/vim#ifdef.

https://github.com/vim/vim/commit/5162822914372fc916a93f85848c0c82209e7cec
---
 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 7f1a219322..60066ec8d3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -985,7 +985,7 @@ static const int included_patches[] = {
   121,
   // 120 NA
   119,
-  // 118,
+  118,
   // 117 NA
   116,
   // 115 NA
-- 
cgit 


From bead15f10dbdd71c0091bbfa18ec0aab9b8b2e82 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 22 Oct 2017 18:13:46 +0800
Subject: vim-patch:8.0.0140 (#7428)

Problem:    Pasting inserted text in Visual mode does not work properly.
            (Matthew Malcomson)
Solution:   Stop Visual mode before stuffing the inserted text. (Christian
            Brabandt, from neovim #5709)

https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
---
 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 fb3eadac3d..30ebbb22bc 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -963,7 +963,7 @@ static const int included_patches[] = {
   143,
   142,
   // 141,
-  // 140,
+  140,
   // 139 NA
   // 138 NA
   137,
-- 
cgit 


From fdd9b1982ba2bce586e30a5a119273aa448bf049 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 24 Oct 2017 21:57:11 +0200
Subject: :version : show Lua[Jit] version (#7436)

Also remove vestigial `extra_patches` code.
---
 src/nvim/version.c | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 30ebbb22bc..6f3ca12458 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -22,6 +22,7 @@
 #include "nvim/message.h"
 #include "nvim/screen.h"
 #include "nvim/strings.h"
+#include "nvim/lua/executor.h"
 
 // version info generated by the build system
 #include "auto/versiondef.h"
@@ -1107,16 +1108,6 @@ static const int included_patches[] = {
 };
 // clang-format on
 
-/// Place to put a short description when adding a feature with a patch.
-/// Keep it short, e.g.,: "relative numbers", "persistent undo".
-/// Also add a comment marker to separate the lines.
-/// See the official Vim patches for the diff format: It must use a context of
-/// one line only.  Create it by hand or use "diff -C2" and edit the patch.
-static char *(extra_patches[]) = {
-  // Add your patch description below this line
-  NULL
-};
-
 /// Compares a version string to the current Nvim version.
 ///
 /// @param version Version string like "1.3.42"
@@ -1251,27 +1242,24 @@ static void list_features(void)
   MSG_PUTS("See \":help feature-compile\"\n\n");
 }
 
+void list_lua_version(void)
+{
+  typval_T luaver_tv;
+  typval_T arg = { .v_type = VAR_UNKNOWN };  // No args.
+  char *luaver_expr = "((jit and jit.version) and jit.version or _VERSION)";
+  executor_eval_lua(cstr_as_string(luaver_expr), &arg, &luaver_tv);
+  assert(luaver_tv.v_type == VAR_STRING);
+  MSG(luaver_tv.vval.v_string);
+  xfree(luaver_tv.vval.v_string);
+}
+
 void list_version(void)
 {
-  // When adding features here, don't forget to update the list of
-  // internal variables in eval.c!
   MSG(longVersion);
   MSG(version_buildtype);
+  list_lua_version();
   MSG(version_cflags);
 
-  // Print the list of extra patch descriptions if there is at least one.
-  char *s = "";
-  if (extra_patches[0] != NULL) {
-    MSG_PUTS(_("\nExtra patches: "));
-    s = "";
-
-    for (int i = 0; extra_patches[i] != NULL; ++i) {
-      MSG_PUTS(s);
-      s = ", ";
-      MSG_PUTS(extra_patches[i]);
-    }
-  }
-
 #ifdef HAVE_PATHDEF
 
   if ((*compiled_user != NUL) || (*compiled_sys != NUL)) {
@@ -1312,6 +1300,8 @@ void list_version(void)
     version_msg("\"\n");
   }
 #endif  // ifdef HAVE_PATHDEF
+
+  version_msg("\nRun :checkhealth for more info");
 }
 
 /// Output a string for the version message.  If it's going to wrap, output a
-- 
cgit 


From aab16e6939a45b3c08f21cd4b5f348e9e612d947 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Fri, 27 Oct 2017 09:41:41 +0800
Subject: vim-patch:8.0.0189

Problem:    There are no tests for the :profile command.
Solution:   Add tests. (Dominique Pelle, closes vim/vim#1383)

https://github.com/vim/vim/commit/296b1f28ca9cedeb55872f306808b2214b519ce7
---
 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 6f3ca12458..3e4d51d70c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -915,7 +915,7 @@ static const int included_patches[] = {
   // 192 NA
   // 191 NA
   190,
-  // 189,
+  189,
   188,
   // 187 NA
   186,
-- 
cgit 


From 2bd424c1c5493f3311239a2c0932dd9ff6fac5a5 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Fri, 27 Oct 2017 09:48:22 +0800
Subject: vim-patch:8.0.0194

Problem:    Profile tests fails if total and self time are equal.
Solution:   Make one time optional.

https://github.com/vim/vim/commit/e32bbded641a5da0263ecf82f9ccc95a8e0a089e
---
 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 3e4d51d70c..7c2cb4d580 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -910,7 +910,7 @@ static const int included_patches[] = {
   // 197,
   // 196,
   195,
-  // 194,
+  194,
   // 193 NA
   // 192 NA
   // 191 NA
-- 
cgit 


From 45a95a8a5b75473bf9d8f707ed10794ae4ae1528 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Fri, 27 Oct 2017 09:49:36 +0800
Subject: vim-patch:8.0.0196

Problem:    The test for :profile is slow and does not work on MS-Windows.
Solution:   Use the "-es" argument. (Dominique Pelle)  Swap single and double
            quotes for system()

https://github.com/vim/vim/commit/c011a3d083001bcd9853b4447422f1819f3cee2f
---
 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 7c2cb4d580..7fd5f2c588 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -908,7 +908,7 @@ static const int included_patches[] = {
   // 199 NA
   // 198,
   // 197,
-  // 196,
+  196,
   195,
   194,
   // 193 NA
-- 
cgit 


From 122f52bf897abd1cda4fa467157657fee6bcfe94 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 29 Oct 2017 00:05:59 +0800
Subject: vim-patch:8.0.0206 (#7446)

Problem:    Test coverage for :retab insufficient.
Solution:   Add test for :retab. (Dominique Pelle, closes vim/vim#1391)

https://github.com/vim/vim/commit/8822744b4d9d40aa1fd59870a8bdd7c64c59a42b
---
 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 6f3ca12458..d841f58b92 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -898,7 +898,7 @@ static const int included_patches[] = {
   209,
   208,
   // 207,
-  // 206,
+  206,
   205,
   // 204,
   // 203 NA
-- 
cgit 


From 6c43fccb278382e5ce59b6035a84fbdb3e7a1734 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 29 Oct 2017 13:46:40 +0100
Subject: vim-patch:8.0.0944

Problem:    Test_profile is a little bit flaky.
Solution:   Accept a match when self and total time are the same. (James
            McCoy, closes vim/vim#1972)

https://github.com/vim/vim/commit/d21b16f3c0c676bfe3a37aef1ac3118e1ecded60
---
 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 7fd5f2c588..e8d82d3b87 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -160,7 +160,7 @@ static const int included_patches[] = {
   // 947,
   // 946,
   // 945,
-  // 944,
+  944,
   // 943,
   // 942,
   // 941,
-- 
cgit 


From 7e8212c459b285aacf2dd225c1dad5593314f094 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Fri, 10 Nov 2017 23:17:20 +0800
Subject: vim-patch:8.0.0224

Problem:    When 'fileformats' is changed in a BufReadPre auto command, it
            does not take effect in readfile(). (Gary Johnson)
Solution:   Check the value of 'fileformats' after executing auto commands.
            (Christian Brabandt)

https://github.com/vim/vim/commit/7a2699e868bca781e26b060a44fc714d87cfa4ba
---
 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 a31381eddf..c57ca1e815 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -880,7 +880,7 @@ static const int included_patches[] = {
   // 227,
   // 226,
   // 225,
-  // 224,
+  224,
   223,
   // 222,
   // 221 NA
-- 
cgit 


From 67a2207c4a4d9b848a4759a7f1e11b5ad1265648 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Fri, 10 Nov 2017 23:28:58 +0800
Subject: vim-patch:8.0.0226

Problem:    The test for patch 8.0.0224 misses the CR characters and passes
            even without the fix. (Christian Brabandt)
Solution:   Use double quotes and \<CR>.

https://github.com/vim/vim/commit/1695f99d08076d77ed3015f1edf09a668a4d449a
---
 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 c57ca1e815..ae1c85d8e2 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -878,7 +878,7 @@ static const int included_patches[] = {
   229,
   // 228,
   // 227,
-  // 226,
+  226,
   // 225,
   224,
   223,
-- 
cgit 


From faa15c5b83d409489c5147ad99e2c44adb3eb37c Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sat, 11 Nov 2017 06:35:55 +0800
Subject: vim-patch:8.0.0218 (#7529)

Problem:    No command line completion for :cexpr, :cgetexpr, :caddexpr, etc.
Solution:   Make completion work. (Yegappan Lakshmanan)  Add a test.

https://github.com/vim/vim/commit/2b2207ba69c6b009e466a36eef0644ca723e16d3
---
 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 a31381eddf..7a12e6c38a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -886,7 +886,7 @@ static const int included_patches[] = {
   // 221 NA
   // 220,
   219,
-  // 218,
+  218,
   // 217 NA
   // 216,
   // 215,
-- 
cgit 


From 4fa0970519c332350ce7cc687a0cd93ace17f5ca Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sat, 11 Nov 2017 07:00:11 +0800
Subject: vim-patch:8.0.0242 (#7532)

Problem:    Completion of user defined functions is not covered by tests.
Solution:   Add tests.  Also test various errors of user-defined commands.
            (Dominique Pelle, closes vim/vim#1413)

https://github.com/vim/vim/commit/65c836e6004647196ae0bc18e409a9e7b79207c0
---
 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 7a12e6c38a..16a265fed3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -862,7 +862,7 @@ static const int included_patches[] = {
   // 245,
   // 244,
   243,
-  // 242,
+  242,
   // 241 NA
   // 240 NA
   // 239 NA
-- 
cgit 


From a2fdd0a72f9d1f72f2e49e80719902a6f555454e Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sat, 11 Nov 2017 08:26:55 +0800
Subject: vim-patch:8.0.0237 (#7531)

Problem:    When setting wildoptions=tagfile the completion context is not set
            correctly. (desjardins)
Solution:   Check for EXPAND_TAGS_LISTFILES. (Christian Brabandt, closes vim/vim#1399)

https://github.com/vim/vim/commit/ba47b51ff88d91c9bb5aa522183e23a656865697
---
 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 16a265fed3..05725a59f9 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -867,7 +867,7 @@ static const int included_patches[] = {
   // 240 NA
   // 239 NA
   // 238,
-  // 237,
+  237,
   // 236,
   235,
   // 234,
-- 
cgit 


From 6b8c34137cf3253616e6a6f861380541537c0bb9 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 13 Nov 2017 06:27:08 +0800
Subject: vim-patch: NA

* vim-patch:8.0.0245

Problem:    The generated zh_CN.cp936.po message file is not encoded properly.
Solution:   Instead of using zh_CN.po as input, use zh_CN.UTF-8.po.

https://github.com/vim/vim/commit/16038d50c4309e8dee33c70ca2c9e7f73439c4df

* vim-patch:8.0.0248

Problem:    vim_strcat() cannot handle overlapping arguments.
Solution:   Use mch_memmove() instead of strcpy(). (Justin M Keyes,
            closes vim/vim#1415)

https://github.com/vim/vim/commit/45600ce8f2bead069882032f992623cd5a799ca0
---
 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 05725a59f9..8c9bea9a9b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -856,10 +856,10 @@ static const int included_patches[] = {
   // 251,
   250,
   // 249 NA
-  // 248,
+  // 248 NA
   247,
   // 246 NA
-  // 245,
+  245,
   // 244,
   243,
   242,
-- 
cgit 


From 540ed646358f9e3910681add39aa96a937074668 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 19 Nov 2017 19:15:03 +0800
Subject: vim-patch:8.0.0283

Problem:    The return value of mode() does not indicate that completion is
            active in Replace and Insert mode. (Zhen-Huan (Kenny) Hu)
Solution:   Add "c" or "x" for two kinds of completion. (Yegappan Lakshmanan,
            closes vim/vim#1397)  Test some more modes.

https://github.com/vim/vim/commit/e90858d0229444b3cd16b1cd3a8d61a24c435705
---
 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 5accf8f1d6..c73cc0d3ee 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -821,7 +821,7 @@ static const int included_patches[] = {
   // 286,
   // 285 NA
   // 284 NA
-  // 283,
+  283,
   282,
   // 281 NA
   280,
-- 
cgit 


From 7d24a95b450c0d97706e2d92a19424d84d51015e Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 20 Nov 2017 09:02:15 +0800
Subject: vim-patch:8.0.0287 (#7590)

Problem:    Cannot access the arguments of the current function in debug mode.
            (Luc Hermitte)
Solution:   use get_funccal(). (Lemonboy, closes vim/vim#1432, closes vim/vim#1352)

https://github.com/vim/vim/commit/c7d9eacefa319e5ac3b3b2334fda5acb126b8716
---
 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 c73cc0d3ee..997db1726b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -817,7 +817,7 @@ static const int included_patches[] = {
   290,
   // 289,
   // 288 NA
-  // 287,
+  287,
   // 286,
   // 285 NA
   // 284 NA
-- 
cgit 


From bb7795e82065ef2e8028064c62cb542362568e19 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Wed, 22 Nov 2017 18:57:56 +0800
Subject: vim-patch:8.0.0292 (#7592)

Problem:    The stat test is a bit slow.
Solution:   Remove a couple of sleep comments and reduce another.

https://github.com/vim/vim/commit/a2f28859bfb3fa52bde14c9d2ca3ab7196a9154a
---
 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 997db1726b..61cfd99c5d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -812,7 +812,7 @@ static const int included_patches[] = {
   // 295,
   294,
   // 293,
-  // 292,
+  292,
   291,
   290,
   // 289,
-- 
cgit 


From 9393be477a733183c2a992cc8728e3ebc65a3118 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Wed, 22 Nov 2017 18:59:30 +0800
Subject: vim-patch:8.0.0289 (#7591)

Problem:    No test for "ga" and :ascii.
Solution:   Add a test. (Dominique Pelle, closes vim/vim#1429)

https://github.com/vim/vim/commit/21d7c9b601f3048e1293ecd6c09b8325a15503cd
---
 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 61cfd99c5d..1ceda55cf1 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -815,7 +815,7 @@ static const int included_patches[] = {
   292,
   291,
   290,
-  // 289,
+  289,
   // 288 NA
   287,
   // 286,
-- 
cgit 


From a4f6cec7a31ff8dbfa089b9e22227afbeb951e9b Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Wed, 22 Nov 2017 22:35:20 +0100
Subject: cmdline: CmdlineEnter and CmdlineLeave autocommands (#7422)

vim-patch:fafcf0dd59fd

patch 8.0.1206: no autocmd for entering or leaving the command line

Problem:    No autocmd for entering or leaving the command line.
Solution:   Add CmdlineEnter and CmdlineLeave.

https://github.com/vim/vim/commit/fafcf0dd59fd9c4ef743bb333ae40d1d322b6079
---
 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 1ceda55cf1..205c25b6cd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -78,6 +78,7 @@ static char *features[] = {
 
 // clang-format off
 static const int included_patches[] = {
+  1206,
   // 1026,
   1025,
   1024,
-- 
cgit 


From 27a70fec48f5ca6c6b91aa3402eb0d1591021024 Mon Sep 17 00:00:00 2001
From: Michael Schupikov <michael@schupikov.de>
Date: Sat, 23 Sep 2017 12:44:37 +0200
Subject: version.c: mark NA patches

- channels: vim-patch:8.0.0018
- GUI: vim-patch:8.0.0021
- Different recursive function implementation: vim-patch:8.0.0141
- JSON handling: vim-patch:8.0.0166, vim-patch:8.0.0169, vim-patch:8.0.0170,
  vim-patch:8.0.0171, vim-patch:8.0.0180

Mark vim-patch:8.0.0096 applied, since it was added in
860ecd705588470b52094b7036c016b2af15f8c9.

[ci skip]
---
 src/nvim/version.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 205c25b6cd..286fcc2391 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -803,7 +803,7 @@ static const int included_patches[] = {
   305,
   // 304,
   // 303,
-  // 302, NA
+  // 302 NA
   // 301,
   300,
   // 299,
@@ -925,7 +925,7 @@ static const int included_patches[] = {
   // 183 NA
   182,
   181,
-  // 180,
+  // 180 NA
   179,
   178,
   177,
@@ -935,11 +935,11 @@ static const int included_patches[] = {
   // 173 NA
   172,
   // 171,
-  // 170,
-  // 169,
+  // 170 NA
+  // 169 NA
   168,
   167,
-  // 166,
+  // 166 NA
   165,
   164,
   // 163 NA
@@ -964,7 +964,7 @@ static const int included_patches[] = {
   // 144 NA
   143,
   142,
-  // 141,
+  // 141 NA
   140,
   // 139 NA
   // 138 NA
@@ -1009,7 +1009,7 @@ static const int included_patches[] = {
   99,
   // 98 NA
   // 97 NA
-  // 96,
+  96,
   // 95 NA
   // 94 NA
   // 93 NA
@@ -1084,10 +1084,10 @@ static const int included_patches[] = {
   // 24 NA
   23,
   // 22 NA
-  // 21,
+  // 21 NA
   20,
   19,
-  // 18,
+  // 18 NA
   17,
   // 16 NA
   // 15 NA
-- 
cgit 


From 8f91f2c9b47e6705e29da2fdbc9519092c757ba5 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sun, 26 Nov 2017 21:26:56 -0500
Subject: Use defined(BSD) check when defining OPEN_CHR_FILES

Rather than enumerate predefines for all BSD systems, just rely on the
fact that they all "#define BSD" in sys/param.h.

Debian's GNU/kFreeBSD still requires its own check, since it isn't using
the BSD userspace.

References:
OpenBSD - https://github.com/openbsd/src/blob/210ebf9df0460bbdad02da9bbd5d859b61f57462/sys/sys/param.h#L40
FreeBSD - https://github.com/freebsd/freebsd/blob/f5d95e1f8d32db4ccccfd5ad9cecb21ed07a695d/sys/sys/param.h#L43
NetBSD - https://github.com/NetBSD/src/blob/ea620980793cf2011e5424f4a537b0488e3ffb4d/sys/sys/param.h#L49
DragonFlyBSD - https://github.com/DragonFlyBSD/DragonFlyBSD/blob/94ecf1295bb42b59772448d58ff40dd75c4a3ef8/sys/sys/param.h#L41

vim-patch:8.0.1357
---
 src/nvim/version.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)

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

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 286fcc2391..a09574a73e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -78,6 +78,157 @@ static char *features[] = {
 
 // clang-format off
 static const int included_patches[] = {
+  1357,
+  // 1356,
+  // 1355,
+  // 1354,
+  // 1353,
+  // 1352,
+  // 1351,
+  // 1350,
+  // 1349,
+  // 1348,
+  // 1347,
+  // 1346,
+  // 1345,
+  // 1344,
+  // 1343,
+  // 1342,
+  // 1341,
+  // 1340,
+  // 1339,
+  // 1338,
+  // 1337,
+  // 1336,
+  // 1335,
+  // 1334,
+  // 1333,
+  // 1332,
+  // 1331,
+  // 1330,
+  // 1329,
+  // 1328,
+  // 1327,
+  // 1326,
+  // 1325,
+  // 1324,
+  // 1323,
+  // 1322,
+  // 1321,
+  // 1320,
+  // 1319,
+  // 1318,
+  // 1317,
+  // 1316,
+  // 1315,
+  // 1314,
+  // 1313,
+  // 1312,
+  // 1311,
+  // 1310,
+  // 1309,
+  // 1308,
+  // 1307,
+  // 1306,
+  // 1305,
+  // 1304,
+  // 1303,
+  // 1302,
+  // 1301,
+  // 1300,
+  // 1299,
+  // 1298,
+  // 1297,
+  // 1296,
+  // 1295,
+  // 1294,
+  // 1293,
+  // 1292,
+  // 1291,
+  // 1290,
+  // 1289,
+  // 1288,
+  // 1287,
+  // 1286,
+  // 1285,
+  // 1284,
+  // 1283,
+  // 1282,
+  // 1281,
+  // 1280,
+  // 1279,
+  // 1278,
+  // 1277,
+  // 1276,
+  // 1275,
+  // 1274,
+  // 1273,
+  // 1272,
+  // 1271,
+  // 1270,
+  // 1269,
+  // 1268,
+  // 1267,
+  // 1266,
+  // 1265,
+  // 1264,
+  // 1263,
+  // 1262,
+  // 1261,
+  // 1260,
+  // 1259,
+  // 1258,
+  // 1257,
+  // 1256,
+  // 1255,
+  // 1254,
+  // 1253,
+  // 1252,
+  // 1251,
+  // 1250,
+  // 1249,
+  // 1248,
+  // 1247,
+  // 1246,
+  // 1245,
+  // 1244,
+  // 1243,
+  // 1242,
+  // 1241,
+  // 1240,
+  // 1239,
+  // 1238,
+  // 1237,
+  // 1236,
+  // 1235,
+  // 1234,
+  // 1233,
+  // 1232,
+  // 1231,
+  // 1230,
+  // 1229,
+  // 1228,
+  // 1227,
+  // 1226,
+  // 1225,
+  // 1224,
+  // 1223,
+  // 1222,
+  // 1221,
+  // 1220,
+  // 1219,
+  // 1218,
+  // 1217,
+  // 1216,
+  // 1215,
+  // 1214,
+  // 1213,
+  // 1212,
+  // 1211,
+  // 1210,
+  // 1209,
+  // 1208,
+  // 1207,
   1206,
   // 1026,
   1025,
-- 
cgit 


From 10c3b206cbf394d7b67bff95242b7033a1ce1d63 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 29 Nov 2017 20:43:07 -0500
Subject: version.c: Mark 8.0.0171 as NA

[ci skip]
---
 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 a09574a73e..b228b8909d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -1085,7 +1085,7 @@ static const int included_patches[] = {
   174,
   // 173 NA
   172,
-  // 171,
+  // 171 NA
   // 170 NA
   // 169 NA
   168,
-- 
cgit 


From 585d664b7b0d5032082bdc3ca8a17bc7fa34a4e8 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sat, 2 Dec 2017 15:25:24 +0800
Subject: vim-patch:8.0.0298

Problem:    Ex command range with repeated search does not work. (Bruce
            DeVisser)
Solution:   Skip over \/, \? and \&.

https://github.com/vim/vim/commit/cbf20fbcd3e9bb006f694bcc35da859930fb12a2
---
 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 b228b8909d..0f058c751b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -958,7 +958,7 @@ static const int included_patches[] = {
   // 301,
   300,
   // 299,
-  // 298,
+  298,
   297,
   // 296,
   // 295,
-- 
cgit 


From 7a4c9dc1c22c8cafba9c33cb7c085b7d0b467226 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 3 Dec 2017 00:14:18 +0800
Subject: vim-patch:8.0.0295 (#7671)

Problem:    test_viml hangs.
Solution:   Put resetting 'more' before sourcing the script.

https://github.com/vim/vim/commit/7a073549a3b1e72037a4e98ceb406d057ac9ba50
---
 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 b228b8909d..96161c91ff 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -961,7 +961,7 @@ static const int included_patches[] = {
   // 298,
   297,
   // 296,
-  // 295,
+  295,
   294,
   // 293,
   292,
-- 
cgit 


From 44421a22c0d9e8e2181d9338a36d1a4ec1f329be Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 3 Dec 2017 00:25:50 +0800
Subject: vim-patch:8.0.0306 (#7675)

Problem:    mode() not sufficiently tested.
Solution:   Add more tests. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/e971df39a5aac5d9b7e8033247dc18b12daa0eb8
---
 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 24ee7ddffc..8d85855c6e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -950,7 +950,7 @@ static const int included_patches[] = {
   // 309,
   308,
   307,
-  // 306,
+  306,
   305,
   // 304,
   // 303,
-- 
cgit