From e89efe75f9fd872e2c7323ea525b35af90e8afa0 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 10:56:00 -0500
Subject: vim-patch:7.4.1752

Problem:    When adding to the quickfix list the current position is reset.
Solution:   Do not reset the position when not needed. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/c1808d5822ed9534ef7f0fe509b15bee92a5cc28
---
 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 ed1d7448ea..d10d5cf75b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -689,7 +689,7 @@ static int included_patches[] = {
   1754,
   1753,
   // 1753,
-  // 1752,
+  1752,
   1751,
   // 1750 NA
   // 1749 NA
-- 
cgit 


From 29d7a597115b692a7e2e39d213b87ac566444a5c Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 11:33:51 -0500
Subject: vim-patch:7.4.1768

Problem:    Arguments of setqflist() are not checked properly.
Solution:   Add better checks, add a test. (Nikolai Pavlov, Hirohito Higashi,
            closes vim/vim#661)

https://github.com/vim/vim/commit/d106e5ba7f10f0d2a14eaefe5d78405044416cb9
---
 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 d10d5cf75b..a5addaf819 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -672,7 +672,7 @@ static int included_patches[] = {
   // 1771 NA
   // 1770 NA
   // 1769,
-  // 1768,
+  1768,
   // 1767 NA
   // 1766 NA
   1765,
-- 
cgit 


From 39faa56bce66796f731ec339301acc3d303c08e9 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:04:44 -0500
Subject: vim-patch:7.4.1802

Problem:    Quickfix doesn't handle long lines well, they are split.
Solution:   Drop characters after a limit. (Anton Lindqvist)

https://github.com/vim/vim/commit/6be8c8e165204b8aa4eeb8a52be87a58d8b41b9e
---
 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 a5addaf819..897daf359c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -637,7 +637,7 @@ static int included_patches[] = {
   // 1805 NA
   // 1804 NA
   // 1803 NA
-  // 1802,
+  1802,
   // 1801 NA
   // 1800 NA
   1799,
-- 
cgit 


From 48b5d0f1ba1ad75411f6510ed79d322116ba6809 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:04:52 -0500
Subject: vim-patch:7.4.1813

Problem:    Memory access error when running test_quickfix.
Solution:   Allocate one more byte. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/9b4ebc692d77ca8ef90d72517347f74c2474dd3d
---
 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 897daf359c..5edced3f0d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -626,7 +626,7 @@ static int included_patches[] = {
   1816,
   // 1815,
   // 1814 NA
-  // 1813,
+  1813,
   // 1812,
   // 1811 NA
   // 1810 NA
-- 
cgit 


From b9c5ca21e6a666dfcd3324720ca59ed52ce34883 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:04:57 -0500
Subject: vim-patch:7.4.1815

Problem:    Compiler warnings for unused variables. (Ajit Thakkar)
Solution:   Add a dummy initialization. (Yasuhiro Matsumoto)

https://github.com/vim/vim/commit/9a3b3311d26c990208150255ad65472bb4eefaa4
---
 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 5edced3f0d..e8f639fcd4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -624,7 +624,7 @@ static int included_patches[] = {
   1818,
   // 1817 NA
   1816,
-  // 1815,
+  1815,
   // 1814 NA
   1813,
   // 1812,
-- 
cgit 


From e2b081ed0c9aa43e891e5b33c1f3f077bc579356 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 13 Dec 2016 11:03:28 -0500
Subject: vim-patch:7.4.1823

Problem:    Warning from 64 bit compiler.
Solution:   Add type cast. (Mike Williams)

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

Already silenced in earlier commits by using size_t.
---
 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 e8f639fcd4..c8eae8b588 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -616,7 +616,7 @@ static int included_patches[] = {
   // 1826 NA
   // 1825 NA
   // 1824 NA
-  // 1823,
+  1823,
   // 1822 NA
   1821,
   1820,
-- 
cgit 


From 9df9cf4ecc4143ce23b5ab85b2ad1ef413a249bd Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:01 -0500
Subject: vim-patch:7.4.1841

Problem:    The code to reallocate the buffer used for quickfix is repeated.
Solution:   Move the code to a function. (Yegappan Lakshmanan, closes vim/vim#831)

https://github.com/vim/vim/commit/2b2b8ae5ab37b04584633c469265d85825166905
---
 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 c8eae8b588..8af6579ac4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -599,7 +599,7 @@ static int included_patches[] = {
   // 1844,
   // 1843 NA
   1842,
-  // 1841,
+  1841,
   1840,
   // 1839,
   // 1838,
-- 
cgit 


From d244068f4fda821888a08858c8a00722f0326da6 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:06 -0500
Subject: vim-patch:7.4.1871

Problem:    Appending to the quickfix list while the quickfix window is open
            is very slow.
Solution:   Do not delete all the lines, only append the new ones.  Avoid
            using a window while updating the list. (closes vim/vim#841)

https://github.com/vim/vim/commit/864293abb72d62604d8d6b458addfb43c14230c3
---
 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 8af6579ac4..93ad69d5f0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -569,7 +569,7 @@ static int included_patches[] = {
   // 1874 NA
   // 1873 NA
   // 1872 NA
-  // 1871,
+  1871,
   // 1870 NA
   // 1869 NA
   // 1868,
-- 
cgit 


From 1e49cf6f233f6681a5a269bba84a09d8f8dbac22 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:10 -0500
Subject: vim-patch:7.4.1881

Problem:    Appending to a long quickfix list is slow.
Solution:   Add qf_last.

https://github.com/vim/vim/commit/83e6d7ac6a1c2a0cb5ee6c8420a5dc792f1d5ffa
---
 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 93ad69d5f0..692bbb27c8 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -559,7 +559,7 @@ static int included_patches[] = {
   // 1884,
   // 1883 NA
   // 1882,
-  // 1881,
+  1881,
   // 1880 NA
   // 1879 NA
   // 1878 NA
-- 
cgit 


From a86d8b4088d21b784c1b72a03db9c22dcae67d00 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:15 -0500
Subject: vim-patch:7.4.1882

Problem:    Check for line break at end of line wrong. (Dominique Pelle)
Solution:   Correct the logic.

https://github.com/vim/vim/commit/b37662a0fbb952838fca87aff4d26b596030b67b
---
 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 692bbb27c8..17c1a85a95 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -558,7 +558,7 @@ static int included_patches[] = {
   // 1885 NA
   // 1884,
   // 1883 NA
-  // 1882,
+  1882,
   1881,
   // 1880 NA
   // 1879 NA
-- 
cgit 


From ab43303df7f09d1789a70e2536552461657f08ac Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:20 -0500
Subject: vim-patch:7.4.1884

Problem:    Updating marks in a quickfix list is very slow when the list is
            long.
Solution:   Only update marks if the buffer has a quickfix entry.

https://github.com/vim/vim/commit/2f095a4bc4d786e0ac834f48dd18a94fe2d140e3
---
 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 17c1a85a95..bf0baa8dbf 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -556,7 +556,7 @@ static int included_patches[] = {
   // 1887 NA
   // 1886 NA
   // 1885 NA
-  // 1884,
+  1884,
   // 1883 NA
   1882,
   1881,
-- 
cgit 


From fbcc854d49330aff7e4511eb6321487f7b4fdae4 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:24 -0500
Subject: vim-patch:7.4.1912

Problem:    No test for using setqflist() on an older quickfix list.
Solution:   Add a couple of tests.

https://github.com/vim/vim/commit/1cee693b310e1494115a1677fac064941092e1bb
---
 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 bf0baa8dbf..4ecf7b2dd3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -528,7 +528,7 @@ static int included_patches[] = {
   // 1915 NA
   // 1914,
   1913,
-  // 1912,
+  1912,
   // 1911,
   // 1910,
   1909,
-- 
cgit 


From 4ac88c4faa1abe449e69263a3e6f8655b7a71d7c Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:29 -0500
Subject: vim-patch:7.4.1937

Problem:    No test for directory stack in quickfix.
Solution:   Add a test. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/ab47c61f46f0797308217cd3c045472cb0ec3195
---
 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 4ecf7b2dd3..04f995ee0a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -503,7 +503,7 @@ static int included_patches[] = {
   // 1940,
   // 1939 NA
   // 1938 NA
-  // 1937,
+  1937,
   // 1936,
   // 1935 NA
   // 1934 NA
-- 
cgit 


From 2244253c14193be94dac4b40a24dcea56e1f1b15 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:34 -0500
Subject: vim-patch:7.4.1941

Problem:    Not all quickfix tests are also done  with the location lists.
Solution:   Test more quickfix code.  Use user commands instead of "exe".
            (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/3ef5bf7d459d6b8a21aaefc80f65448f5a7aa59f
---
 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 04f995ee0a..f9385dcc93 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -499,7 +499,7 @@ static int included_patches[] = {
   // 1944 NA
   // 1943 NA
   // 1942 NA
-  // 1941,
+  1941,
   // 1940,
   // 1939 NA
   // 1938 NA
-- 
cgit 


From 63d4ac7b2515072bffabe1d69fd6eb62aeb860f4 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:38 -0500
Subject: vim-patch:7.4.1949

Problem:    Minor problems with the quickfix code.
Solution:   Fix the problems. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/38df43bd13a2498cc96b3ddd9a20dd75126bd171
---
 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 f9385dcc93..480e6723f3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -491,7 +491,7 @@ static int included_patches[] = {
   1952,
   // 1951 NA
   // 1950,
-  // 1949,
+  1949,
   // 1948,
   // 1947 NA
   // 1946 NA
-- 
cgit 


From d091faf2849dcd4ece60bffaaf8db61ae4f2fe5e Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:43 -0500
Subject: vim-patch:7.4.1950

Problem:    Quickfix long lines test not executed for buffer.
Solution:   Call the function to test long lines. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/f50df3925b7c909d1cda4c868d8c7ba38189aabe
---
 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 480e6723f3..b75aae3226 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -490,7 +490,7 @@ static int included_patches[] = {
   // 1953,
   1952,
   // 1951 NA
-  // 1950,
+  1950,
   1949,
   // 1948,
   // 1947 NA
-- 
cgit 


From 8f0bf810ff9257b55afc2ee95c2e0f81bdec79bd Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:47 -0500
Subject: vim-patch:7.4.1953

Problem:    Not all parts of the quickfix code are tested.
Solution:   Add more tests. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/049cba9e9760152b5695399a991dc61cea9ba143
---
 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 b75aae3226..c4fdcd61f9 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -487,7 +487,7 @@ static int included_patches[] = {
   1956,
   // 1955,
   // 1954,
-  // 1953,
+  1953,
   1952,
   // 1951 NA
   1950,
-- 
cgit 


From 82f54c0a5eea91dcfd7a509588b4ac37f7e55b57 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:52 -0500
Subject: vim-patch:7.4.1964

Problem:    The quickfix init function is too big.
Solution:   Factor out parsing 'errorformat' to a separate function. (Yegappan
            Lakshmanan)

https://github.com/vim/vim/commit/688e3d1fd9b9129a5ba0e0d599ccfe6f4443daf3
---
 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 c4fdcd61f9..3efc161b05 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -476,7 +476,7 @@ static int included_patches[] = {
   1967,
   // 1966,
   // 1965 NA
-  // 1964,
+  1964,
   // 1963 NA
   // 1962,
   1961,
-- 
cgit 


From fd94e6313b3e7314561cbe90b4cacd44d1088c8f Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:05:58 -0500
Subject: vim-patch:7.4.1966

Problem:    Coverity reports a resource leak.
Solution:   Close "fd" also when bailing out.

https://github.com/vim/vim/commit/bcf7772a23624edc0942120e564f6b4ac95604ad
---
 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 3efc161b05..576843e61d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -474,7 +474,7 @@ static int included_patches[] = {
   // 1969 NA
   // 1968,
   1967,
-  // 1966,
+  1966,
   // 1965 NA
   1964,
   // 1963 NA
-- 
cgit 


From 5f6eb62a316712554644a5a76d255df77fba0091 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 14 Dec 2016 10:55:21 -0500
Subject: vim-patch:7.4.1980

Problem:    'errorformat' is parsed for every call to ":caddexpr".  Can't add
            to two location lists asynchronously.
Solution:   Keep the previously parsed data when appropriate. (mostly by
            Yegappan Lakshmanan)

https://github.com/vim/vim/commit/361c8f0e517e41f1f1d34dae328044406fde80ac
---
 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 576843e61d..17bb4aa356 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -460,7 +460,7 @@ static int included_patches[] = {
   // 1983 NA
   // 1982 NA
   // 1981,
-  // 1980,
+  1980,
   // 1979,
   // 1978,
   // 1977,
-- 
cgit 


From f613c61dae7be1c4f9eadc223a77684a128508b0 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 12 Dec 2016 15:06:02 -0500
Subject: vim-patch:7.4.1984

Problem:    Not all quickfix features are tested.
Solution:   Add a few more tests. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/0fcc7c6dd1902b71e0e7d0a35ddabafef6455a83
---
 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 17bb4aa356..b5168f565b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -456,7 +456,7 @@ static int included_patches[] = {
   // 1987 NA
   // 1986,
   // 1985 NA
-  // 1984,
+  1984,
   // 1983 NA
   // 1982 NA
   // 1981,
-- 
cgit 


From f224f3fbf11ffd3095843c597045ca95c8241fcf Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 14 Dec 2016 14:36:38 -0500
Subject: vim-patch:7.4.1997

Problem:    Cannot easily scroll the quickfix window.
Solution:   Add ":cbottom".

https://github.com/vim/vim/commit/dcb170018642ec144cd87d9d9fe076575b8d1263
---
 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 b5168f565b..9a273dd66c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -443,7 +443,7 @@ static int included_patches[] = {
   // 2000,
   // 1999,
   // 1998 NA
-  // 1997,
+  1997,
   // 1996,
   // 1995 NA
   // 1994,
-- 
cgit 


From 2c59277ca867cb3cb0144adedcfe05373d5498de Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 14 Dec 2016 15:33:06 -0500
Subject: vim-patch:7.4.2010

Problem:    There is a :cbottom command but no :lbottom command.
Solution:   Add :lbottom. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/537ef08408c50e0c4104d57f74993b3b0ed9560d
---
 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 9a273dd66c..512d52cbc4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -430,7 +430,7 @@ static int included_patches[] = {
   2013,
   2012,
   2011,
-  // 2010,
+  2010,
   // 2009,
   // 2008,
   2007,
-- 
cgit