version.c: update [ci skip] #10308

vim-patch:8.0.1671: crash when passing non-dict argument as env to job_start()
vim-patch 8.1.1669: Travis: test results section is closed even when failed
vim-patch:8.1.0424: test output is very verbose, loading CI log is slow (vim/vim@e76d7a6)
N/A: only for sign icons (gvim, ref: #10834)
vim-patch:8.1.1587: redraw problem when sign icons in the number column
vim-patch:8.1.1910: redrawing too much when toggling 'relativenumber'
vim-patch:8.0.0910: cannot create a terminal in the current window
vim-patch:8.0.0912: cannot run a job in a hidden terminal
vim-patch:8.0.0916: cannot specify properties of window for terminal open
vim-patch:8.0.0917: MS-Windows:CTRL-C handling in terminal window is wrong
vim-patch:8.0.0918: cannot get terminal window cursor shape or attributes
vim-patch:8.0.0960: job in terminal does not get CTRL-C
vim-patch:8.0.1000: cannot open a terminal without running a job in it
vim-patch:8.0.1035: sending buffer lines to terminal doesn't work on MS-Windows
vim-patch:8.0.1051: cannot run terminal with spaces in argument
vim-patch:8.0.1060: when imstyle is one, mapping <Left> breaks preediting
vim-patch:8.0.1074: ":term NONE" does not work on MS-Windows
vim-patch:8.0.1113: can go to Insert mode from Terminal-Normal mode
vim-patch:8.0.1170: using termdebug results in 100% CPU time
vim-patch:8.0.1174: Mac Terminal.app has wrong color for white
vim-patch:8.0.1194: actual fg and bg colors of terminal are unknown
vim-patch:8.0.1203: terminal window mistreats composing characters
vim-patch:8.0.1240: MS-Windows: term_start() does not support environment
vim-patch:8.0.1244: search test does not work correctly on MS-Windows
vim-patch:8.0.1264: terminal debugger gets stuck in small window
vim-patch:8.0.1276: key lost when window closed in exit callback
vim-patch:8.0.1295: cannot automatically get a server name in a terminal
vim-patch:8.0.1297: +autoservername does not show enabled on MS-Windows
vim-patch:8.0.1319: can't build GUI on MS-Windows
vim-patch:8.0.1341: 'imactivatefunc' test fails on MS-Windows
vim-patch:8.0.1344: using 'imactivatefunc' in the GUI does not work
vim-patch:8.0.1349: options test fails when using Motif or GTK GUI
vim-patch:8.0.1436: not enough information about what Python version may work
vim-patch:8.0.1440: terminal window: some vterm responses are delayed
vim-patch:8.0.1452: terminal test fails on some systems
vim-patch:8.0.1453: terminal test fails on some slow terminals
vim-patch:8.0.1527: screen dump test fails on MS-Windows
vim-patch:8.0.1551: on Mac 'maxmemtot' is set to a weird value
vim-patch:8.0.1568: can't build on older Mac, header file is missing
vim-patch:8.0.1572: Mac: getting memory size doesn't work everywhere
vim-patch:8.0.1596: no autocommand specifically for opening a terminal window
vim-patch:8.0.1599: no error message when gdb does not support debugger
vim-patch:8.0.1604: paste test may fail if $DISPLAY is not set
vim-patch:8.0.1612: need to close terminal after shell stopped
vim-patch:8.0.1641: job in terminal can't communicate with Vim
vim-patch:8.0.1647: terminal API may call any user function
vim-patch:8.0.1655: outdated gdb message in terminal debugger unclear
vim-patch:8.0.1671: crash when passing non-dict argument as env to job_start()
vim-patch:8.0.1713: terminal debugger doesn't handle arguments
vim-patch:8.0.1759: memory leak from duplicate options
vim-patch:8.0.1797: terminal window is redrawn too often
vim-patch:8.0.1850: todo items in source code not visible for users

vim-patch:8.1.0055: complete test has wrong order of arguments
vim-patch:8.1.0081: the terminal debugger doesn't adjust to changed 'background'
vim-patch:8.1.0100: terminal debugger: error when setting a watch point
vim-patch:8.1.0195: terminal debugger commands don't always work
vim-patch:8.1.0196: terminal debugger error with .gdbinit file
vim-patch:8.1.0359: no clue what test failed when using a screendump twice
vim-patch:8.1.0371: argument types for select() may be wrong
vim-patch:8.1.0382: some make programs can't handle "xdiff/../"
vim-patch:8.1.0423: MS-Windows: using dup-close for flushing a file
vim-patch:8.1.0445: setting 'term' does not store location for termcap options
vim-patch:8.1.0451: Win32 console: keypad keys don't work
vim-patch:8.1.0457: win32 console: key mappings don't work
vim-patch:8.1.0462: when using ConPTY Vim can be a child process
vim-patch:8.1.0465: client-server test fails
vim-patch:8.1.0481: when "Terminal" highlight is reverted cursor doesn't show
vim-patch:8.1.0486: can't build in MS-Windows
vim-patch:8.1.0491: if a terminal dump has CR it is considered corrupt
vim-patch:8.1.0525: terminal test skips part on Windows
vim-patch:8.1.0526: running out of signal stack in RealWaitForChar
vim-patch:8.1.0561: MSCV error format has changed
vim-patch:8.1.0580: invalid memory access when using text properties
vim-patch:8.1.0590: when a job ends the closed channels are not handled
vim-patch:8.1.0591: channel sort test is flaky
vim-patch:8.1.0603: the :stop command is not tested
vim-patch:8.1.0611: crash when using terminal with long composing characters
vim-patch:8.1.0618: term_getjob() does not return v:null as documented
vim-patch:8.1.0625: MS-Windows: terminal test fails in white console
vim-patch:8.1.0631: test for :stop fails on Arch
vim-patch:8.1.0647: MS-Windows: balloon_show() does not handle wide characters
vim-patch:8.1.0657: get error for using regexp recursively
vim-patch:8.1.0659: build failure without the sign feature
vim-patch:8.1.0666: text property test fails
vim-patch:8.1.0692: if a buffer was deleted a channel can't write to it
vim-patch:8.1.0693: channel test fails sometimes
vim-patch:8.1.0705: :colorscheme isn't tested enough
vim-patch:8.1.0708: third argument for redrawWinline() is always FALSE
vim-patch:8.1.0724: build for MinGW fails
vim-patch:8.1.0731: JS encoding does not handle negative infinity
vim-patch:8.1.0760: no proper test for using 'termencoding'
vim-patch:8.1.0774: VMS build is missing the blob file
vim-patch:8.1.0778: terminal test fails on MS-Windows
vim-patch:8.1.0780: terminal test fails on Mac
vim-patch:8.1.0781: build error when using if_xcmdsrv.c
vim-patch:8.1.0782: Win32: cursor blinks when Vim is not active
vim-patch:8.1.0795: cannot build without popup menu
vim-patch:8.1.0796: MS-Windows 7: problem with named pipe on channel
vim-patch:8.1.0799: calling deleted function; test doesn't work on Mac
vim-patch:8.1.0812: Unicode 16 feature is not useful
vim-patch:8.1.0823: not sufficient testing of xxd
vim-patch:8.1.0827: missing dependency in Makefile
vim-patch:8.1.0831: xxd test fails if man page has dos fileformat
vim-patch:8.1.0835: GUI build fails on MS-Windows
vim-patch:8.1.0847: may use terminal after it was cleaned up
vim-patch:8.1.0848: cannot build with Ruby 1.8
vim-patch:8.1.0860: debug lines left in the code
vim-patch:8.1.0861: building with MinGW and static libc doesn't work
vim-patch:8.1.0866: build file dependencies are outdated
vim-patch:8.1.0867: cannot build Python interface with Python 2.4
vim-patch:8.1.0871: build error when building with Ruby 2.6.0
vim-patch:8.1.0872: confusing condition
vim-patch:8.1.0889: MS-Windows: a channel write may hang
vim-patch:8.1.0898: a messed up rgb.txt can crash Vim
vim-patch:8.1.0900: ConPTY many crash with 32-bit build
vim-patch:8.1.0904: USE_LONG_FNAME never defined
vim-patch:8.1.0915: fsync() may not work properly on Mac
vim-patch:8.1.0919: compiler warnings
vim-patch:8.1.0920: in Terminal-Normal mode job output messes up the window
vim-patch:8.1.0921: terminal test sometimes fails; using memory after free
vim-patch:8.1.0922: terminal scrollback test is flaky
vim-patch:8.1.0923: terminal dump diff swap does not update file names
vim-patch:8.1.0924: terminal scrollback test still flaky
vim-patch:8.1.0925: terminal scrollback test still still flaky
vim-patch:8.1.0931: vtp_working included in GUI build but unused
vim-patch:8.1.0960: when using ConPTY garbage collection has undefined behavior
vim-patch:8.1.0961: Mac: fsync may fail sometimes
vim-patch:8.1.0964: cannot see in CI why a screenshot test failed
vim-patch:8.1.0981: pasting in terminal insufficiently tested
vim-patch:8.1.0982: update_cursor() called twice in :shell
vim-patch:8.1.0993: ch_read() may return garbage if terminating NL is missing
vim-patch:8.1.1018: window cleared when entering Terminal-Normal twice
vim-patch:8.1.1024: stray log calls in terminal code
vim-patch:8.1.1051: not all ways to switch terminal mode are tested
vim-patch:8.1.1080: when a screendump test fails, moving the file is a hassle
vim-patch:8.1.1102: Win32 exe file contains unused code
vim-patch:8.1.1121: test for term_gettitle() was disabled
vim-patch:8.1.1128: getwinpos() test does not work on MS-Windows
vim-patch:8.1.1129: when making a new screendump test have to create the file
vim-patch:8.1.1132: getwinpos() test fails on MS-Windows
vim-patch:8.1.1141: terminal winpos test fails with very large terminal
vim-patch:8.1.1162: incorrect coverage information; typo in color name
vim-patch:8.1.1168: not all screen update code of terminal is executed in tests
vim-patch:8.1.1170: terminal ANSI color test does not cover all colors
vim-patch:8.1.1172: cursor properties were not fully tested
vim-patch:8.1.1330: using bold attribute in terminal changes the color
vim-patch:8.1.1505: running "make clean" twice gives errors
vim-patch:8.1.1572: compiler warnings with tiny build
vim-patch:8.1.1576: compiler warning for unused argument
vim-patch:8.1.1592: may start file dialog while exiting
vim-patch:8.1.1594: may still start file dialog while exiting
vim-patch:8.1.1595: MS-Windows with VIMDLL: colors wrong in console
vim-patch:8.1.1605: Vim may delay processing messages on a json channel
vim-patch:8.1.1616: build failure with gcc on Amiga
vim-patch:8.1.1618: Amiga-like systems quickly run out of stack
vim-patch:8.1.1621: Amiga: time.h included twice
vim-patch:8.1.1627: header file contains mixed comment style
vim-patch:8.1.1633: cannot generate prototypes with X11 but without GUI
vim-patch:8.1.1635: warnings for unused variables in small version
vim-patch:8.1.1643: sign placement is wrong when 'foldcolumn' is set
vim-patch:8.1.1644: sound test does not work on Travis
vim-patch:8.1.1647: build error with GTK and hangulinput feature
vim-patch:8.1.1653: ubsan warns for possibly passing NULL pointer
vim-patch:8.1.1658: debug statements included in patch
vim-patch:8.1.1661: cannot build with +textprop but without +balloon_eval
vim-patch:8.1.1662: cannot build uninstal.exe with some version of MinGW
vim-patch:8.1.1664: GUI resize may cause changing Rows at a bad time
vim-patch:8.1.1669: Travis: test results section is closed even when failed
vim-patch:8.1.1670: sign column not always properly aligned
vim-patch:8.1.1685: missing file in distributed file list
vim-patch:8.1.1688: old makefiles are no longer useful
vim-patch:8.1.1691: diff test fails on some systems
vim-patch:8.1.1696: MSVC: link command line is too long
vim-patch:8.1.1697: cannot build with MSVC
vim-patch:8.1.1698: Appveyor build with MSVC fails
vim-patch:8.1.1701: Appveyor build with MSVC fails puts progress bar in log
vim-patch:8.1.1702: compiler warning for uninitialized variable
vim-patch:8.1.1706: typo in #ifdef
vim-patch:8.1.1721: build failure with normal features without netbeans interface
vim-patch:8.1.1735: can't build with tiny features
vim-patch:8.1.1744: build error without the conceal feature
vim-patch:8.1.1777: useless checks for job feature in channel test
vim-patch:8.1.1781: Amiga: no builtin OS readable version info
vim-patch:8.1.1788: missing changes in proto file
vim-patch:8.1.1792: the vgetorpeek() function is too long
vim-patch:8.1.1794: tests are flaky
vim-patch:8.1.1815: duplicating info for internal functions
vim-patch:8.1.1817: github contribution text is incomplete
vim-patch:8.1.1825: allocating more memory than needed for extended structs
vim-patch:8.1.1830: Travis does not report error when tests fail
vim-patch:8.1.1836: inaccurate memory estimate for Amiga-like OS
vim-patch:8.1.1847: suspend test is failing
vim-patch:8.1.1848: 'langmap' is not used for CTRL-W command in terminal
vim-patch:8.1.1873: cannot build tiny version
vim-patch:8.1.1876: proto file missing from distribution
vim-patch:8.1.1885: comments in libvterm are inconsistent
vim-patch:8.1.1889: Coverity warns for using a NULL pointer
vim-patch:8.1.1894: not checking for out-of-memory of autoload_name()
vim-patch:8.1.1896: compiler warning for unused variable
vim-patch:8.1.1898: crash when out of memory during startup
vim-patch:8.1.1916: trying to allocate negative amount of memory closing popup
vim-patch:8.1.1942: shadow directory gets outdated when files are added
vim-patch:8.1.1948: mouse doesn't work in Linux console

The following is N/A because of https://github.com/neovim/neovim/pull/10565:
vim-patch:8.1.0537: ui_breakcheck() may be called recursively

vim-patch:8.1.1833
This was merged in Neovim before Vim.

vim-patch:8.1.1479: change included for debugging only
This is N/A iff vim-patch:8.1.0424 is N/A. https://github.com/neovim/neovim/pull/10308#issuecomment-504716053

https://github.com/neovim/neovim/commit/82d52b229df711b710862ce772603ea55113a32e makes `src/testdir/test_paste.vim` patches N/A.
vim-patch:8.0.0233: paste test fails in the GUI
vim-patch:8.1.1307: cannot reconnect to the X server after it restarted

`bufIsChangedNotTerm` is N/A because of neovim/neovim@2929dbf2233f05f58e094ce4a80fb1320ac6d336
vim-patch:8.0.1382: get "no write since last change" message if terminal is open

vim-patch:8.1.1483 was merged without merging the older patches first so I assume that the following patches are N/A:
vim-patch:8.0.1578: no test for :popup in terminal

1 files changed, 203 insertions, 203 deletions

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 74a4852def..0eb005d5df 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -69,17 +69,17 @@ NULL
 // clang-format off
 static const int included_patches[] = {
   1849,
-  // 1848,
+  1848,
   1847,
-  // 1846,
+  1846,
   1845,
   // 1844,
   1843,
   // 1842,
-  // 1841,
+  1841,
   1840,
   1839,
-  // 1838,
+  1838,
   1837,
   1836,
   // 1835,
@@ -87,23 +87,23 @@ static const int included_patches[] = {
   1833,
   1832,
   1831,
-  // 1830,
+  1830,
   1829,
   1828,
   1827,
   1826,
   1825,
   1824,
-  // 1823,
+  1823,
   1822,
-  // 1821,
-  // 1820,
+  1821,
+  1820,
   1819,
-  // 1818,
+  1818,
   // 1817,
   1816,
   // 1815,
-  // 1814,
+  1814,
   1813,
   // 1812,
   1811,
@@ -111,18 +111,18 @@ static const int included_patches[] = {
   1809,
   1808,
   1807,
-  // 1806,
+  1806,
   1805,
   // 1804,
   1803,
-  // 1802,
-  // 1801,
+  1802,
+  1801,
   1800,
   1799,
   // 1798,
   // 1797,
-  // 1796,
-  // 1795,
+  1796,
+  1795,
   // 1794,
   // 1793,
   1792,
@@ -137,26 +137,26 @@ static const int included_patches[] = {
   // 1783,
   1782,
   1781,
-  // 1780,
+  1780,
   1779,
   1778,
   1777,
   // 1776,
-  // 1775,
+  1775,
   // 1774,
   1773,
   // 1772,
   // 1771,
   // 1770,
   // 1769,
-  // 1768,
+  1768,
   // 1767,
   1766,
   1765,
   1764,
   1763,
-  // 1762,
-  // 1761,
+  1762,
+  1761,
   1760,
   // 1759,
   1758,
@@ -164,22 +164,22 @@ static const int included_patches[] = {
   1756,
   1755,
   // 1754,
-  // 1753,
+  1753,
   // 1752,
   1751,
   1750,
   1749,
   1748,
   // 1747,
-  // 1746,
+  1746,
   // 1745,
   // 1744,
   // 1743,
   // 1742,
   1741,
-  // 1740,
+  1740,
   1739,
-  // 1738,
+  1738,
   1737,
   1736,
   1735,
@@ -188,113 +188,113 @@ static const int included_patches[] = {
   // 1732,
   1731,
   1730,
-  // 1729,
-  // 1728,
+  1729,
+  1728,
   1727,
   1726,
   // 1725,
-  // 1724,
+  1724,
   1723,
   // 1722,
-  // 1721,
-  // 1720,
+  1721,
+  1720,
   1719,
-  // 1718,
+  1718,
   1717,
-  // 1716,
-  // 1715,
-  // 1714,
+  1716,
+  1715,
+  1714,
   // 1713,
   // 1712,
   // 1711,
   1710,
-  // 1709,
+  1709,
   1708,
   1707,
   // 1706,
   1705,
   1704,
-  // 1703,
+  1703,
   1702,
   1701,
   1700,
   1699,
   1698,
-  // 1697,
+  1697,
   1696,
-  // 1695,
-  // 1694,
+  1695,
+  1694,
   1693,
   1692,
-  // 1691,
-  // 1690,
+  1691,
+  1690,
   1689,
-  // 1688,
+  1688,
   1687,
   1686,
   // 1685,
-  // 1684,
+  1684,
   1683,
   1682,
-  // 1681,
-  // 1680,
+  1681,
+  1680,
   1679,
   1678,
   1677,
   1676,
   1675,
   1674,
-  // 1673,
+  1673,
   1672,
   // 1671,
-  // 1670,
+  1670,
   1669,
   // 1668,
-  // 1667,
+  1667,
   // 1666,
   // 1665,
-  // 1664,
+  1664,
   1663,
-  // 1662,
+  1662,
   1661,
   // 1660,
   1659,
   1658,
-  // 1657,
-  // 1656,
+  1657,
+  1656,
   // 1655,
   1654,
-  // 1653,
-  // 1652,
+  1653,
+  1652,
   // 1651,
   1650,
   1649,
-  // 1648,
+  1648,
   // 1647,
   1646,
-  // 1645,
-  // 1644,
-  // 1643,
-  // 1642,
+  1645,
+  1644,
+  1643,
+  1642,
   // 1641,
-  // 1640,
+  1640,
   1639,
-  // 1638,
-  // 1637,
-  // 1636,
+  1638,
+  1637,
+  1636,
   1635,
   1634,
   1633,
-  // 1632,
-  // 1631,
+  1632,
+  1631,
   1630,
-  // 1629,
-  // 1628,
+  1629,
+  1628,
   1627,
   1626,
   1625,
   // 1624,
-  // 1623,
+  1623,
   1622,
   // 1621,
   1620,
@@ -302,28 +302,28 @@ static const int included_patches[] = {
   1618,
   // 1617,
   // 1616,
-  // 1615,
+  1615,
   1614,
   1613,
   // 1612,
-  // 1611,
+  1611,
   1610,
   // 1609,
   1608,
   1607,
   1606,
-  // 1605,
+  1605,
   // 1604,
   1603,
   1602,
   1601,
   1600,
   // 1599,
-  // 1598,
+  1598,
   1597,
   // 1596,
   1595,
-  // 1594,
+  1594,
   // 1593,
   // 1592,
   // 1591,
@@ -341,7 +341,7 @@ static const int included_patches[] = {
   1579,
   // 1578,
   1577,
-  // 1576,
+  1576,
   1575,
   // 1574,
   1573,
@@ -365,44 +365,44 @@ static const int included_patches[] = {
   1555,
   // 1554,
   1553,
-  // 1552,
+  1552,
   // 1551,
   // 1550,
   1549,
   1548,
   1547,
-  // 1546,
+  1546,
   1545,
   // 1544,
   // 1543,
-  // 1542,
+  1542,
   1541,
   // 1540,
   // 1539,
   // 1538,
-  // 1537,
+  1537,
   1536,
-  // 1535,
-  // 1534,
-  // 1533,
+  1535,
+  1534,
+  1533,
   1532,
   // 1531,
   1530,
   // 1529,
   1528,
   // 1527,
-  // 1526,
+  1526,
   // 1525,
   1524,
   // 1523,
   // 1522,
-  // 1521,
+  1521,
   // 1520,
   1519,
   1518,
   1517,
   1516,
-  // 1515,
+  1515,
   1514,
   1513,
   1512,
@@ -433,15 +433,15 @@ static const int included_patches[] = {
   1487,
   1486,
   1485,
-  // 1484,
+  1484,
   1483,
-  // 1482,
+  1482,
   1481,
-  // 1480,
-  // 1479,
+  1480,
+  1479,
   1478,
-  // 1477,
-  // 1476,
+  1477,
+  1476,
   1475,
   1474,
   1473,
@@ -455,7 +455,7 @@ static const int included_patches[] = {
   1465,
   1464,
   // 1463,
-  // 1462,
+  1462,
   // 1461,
   // 1460,
   // 1459,
@@ -487,8 +487,8 @@ static const int included_patches[] = {
   1433,
   1432,
   1431,
-  // 1430,
-  // 1429,
+  1430,
+  1429,
   1428,
   1427,
   1426,
@@ -531,17 +531,17 @@ static const int included_patches[] = {
   1389,
   // 1388,
   1387,
-  // 1386,
+  1386,
   1385,
   1384,
   1383,
   // 1382,
-  // 1381,
+  1381,
   1380,
   1379,
   1378,
   1377,
-  // 1376,
+  1376,
   // 1375,
   1374,
   1373,
@@ -549,16 +549,16 @@ static const int included_patches[] = {
   // 1371,
   1370,
   1369,
-  // 1368,
+  1368,
   // 1367,
   // 1366,
   1365,
   1364,
   1363,
-  // 1362,
+  1362,
   1361,
-  // 1360,
-  // 1359,
+  1360,
+  1359,
   // 1358,
   1357,
   // 1356,
@@ -570,14 +570,14 @@ static const int included_patches[] = {
   1350,
   // 1349,
   1348,
-  // 1347,
+  1347,
   // 1346,
   // 1345,
   // 1344,
   1343,
-  // 1342,
+  1342,
   // 1341,
-  // 1340,
+  1340,
   // 1339,
   1338,
   1337,
@@ -589,20 +589,20 @@ static const int included_patches[] = {
   1331,
   // 1330,
   1329,
-  // 1328,
+  1328,
   1327,
   1326,
   1325,
   1324,
-  // 1323,
+  1323,
   1322,
   // 1321,
   // 1320,
   // 1319,
   // 1318,
-  // 1317,
-  // 1316,
-  // 1315,
+  1317,
+  1316,
+  1315,
   1314,
   1313,
   // 1312,
@@ -621,7 +621,7 @@ static const int included_patches[] = {
   1299,
   1298,
   // 1297,
-  // 1296,
+  1296,
   // 1295,
   1294,
   // 1293,
@@ -631,7 +631,7 @@ static const int included_patches[] = {
   1289,
   1288,
   // 1287,
-  // 1286,
+  1286,
   1285,
   1284,
   1283,
@@ -640,10 +640,10 @@ static const int included_patches[] = {
   1280,
   1279,
   1278,
-  // 1277,
+  1277,
   // 1276,
   1275,
-  // 1274,
+  1274,
   1273,
   1272,
   1271,
@@ -656,9 +656,9 @@ static const int included_patches[] = {
   // 1264,
   1263,
   1262,
-  // 1261,
-  // 1260,
-  // 1259,
+  1261,
+  1260,
+  1259,
   1258,
   1257,
   1256,
@@ -671,17 +671,17 @@ static const int included_patches[] = {
   1249,
   1248,
   1247,
-  // 1246,
+  1246,
   1245,
   // 1244,
   1243,
   1242,
-  // 1241,
+  1241,
   // 1240,
-  // 1239,
+  1239,
   1238,
   1237,
-  // 1236,
+  1236,
   1235,
   1234,
   1233,
@@ -700,11 +700,11 @@ static const int included_patches[] = {
   1220,
   1219,
   1218,
-  // 1217,
+  1217,
   1216,
   1215,
   1214,
-  // 1213,
+  1213,
   1212,
   1211,
   1210,
@@ -715,7 +715,7 @@ static const int included_patches[] = {
   1205,
   1204,
   // 1203,
-  // 1202,
+  1202,
   1201,
   1200,
   1199,
@@ -724,7 +724,7 @@ static const int included_patches[] = {
   1196,
   1195,
   // 1194,
-  // 1193,
+  1193,
   1192,
   1191,
   1190,
@@ -738,24 +738,24 @@ static const int included_patches[] = {
   1182,
   1181,
   1180,
-  // 1179,
+  1179,
   1178,
-  // 1177,
+  1177,
   // 1176,
   1175,
   // 1174,
-  // 1173,
+  1173,
   1172,
   1171,
   // 1170,
   1169,
   1168,
-  // 1167,
+  1167,
   1166,
   1165,
-  // 1164,
+  1164,
   1163,
-  // 1162,
+  1162,
   1161,
   1160,
   1159,
@@ -768,10 +768,10 @@ static const int included_patches[] = {
   1152,
   1151,
   1150,
-  // 1149,
+  1149,
   1148,
   1147,
-  // 1146,
+  1146,
   1145,
   1144,
   1143,
@@ -786,22 +786,22 @@ static const int included_patches[] = {
   // 1134,
   1133,
   1132,
-  // 1131,
+  1131,
   1130,
   // 1129,
   1128,
   // 1127,
-  // 1126,
+  1126,
   // 1125,
   1124,
   // 1123,
   1122,
   1121,
-  // 1120,
+  1120,
   // 1119,
   1118,
-  // 1117,
-  // 1116,
+  1117,
+  1116,
   1115,
   1114,
   // 1113,
@@ -811,18 +811,18 @@ static const int included_patches[] = {
   // 1109,
   1108,
   1107,
-  // 1106,
+  1106,
   1105,
   1104,
-  // 1103,
+  1103,
   // 1102,
-  // 1101,
-  // 1100,
+  1101,
+  1100,
   1099,
   1098,
   // 1097,
   // 1096,
-  // 1095,
+  1095,
   1094,
   1093,
   1092,
@@ -830,24 +830,24 @@ static const int included_patches[] = {
   1090,
   1089,
   1088,
-  // 1087,
+  1087,
   1086,
   1085,
   1084,
-  // 1083,
+  1083,
   1082,
-  // 1081,
-  // 1080,
+  1081,
+  1080,
   1079,
   1078,
   1077,
-  // 1076,
-  // 1075,
+  1076,
+  1075,
   // 1074,
   1073,
   1072,
   1071,
-  // 1070,
+  1070,
   1069,
   1068,
   1067,
@@ -859,16 +859,16 @@ static const int included_patches[] = {
   1061,
   // 1060,
   1059,
-  // 1058,
-  // 1057,
+  1058,
+  1057,
   1056,
-  // 1055,
-  // 1054,
-  // 1053,
-  // 1052,
+  1055,
+  1054,
+  1053,
+  1052,
   // 1051,
   1050,
-  // 1049,
+  1049,
   1048,
   1047,
   1046,
@@ -878,12 +878,12 @@ static const int included_patches[] = {
   1042,
   1041,
   1040,
-  // 1039,
+  1039,
   // 1038,
   1037,
-  // 1036,
+  1036,
   // 1035,
-  // 1034,
+  1034,
   1033,
   1032,
   1031,
@@ -902,13 +902,13 @@ static const int included_patches[] = {
   1018,
   1017,
   1016,
-  // 1015,
+  1015,
   1014,
-  // 1013,
+  1013,
   1012,
-  // 1011,
+  1011,
   1010,
-  // 1009,
+  1009,
   1008,
   1007,
   1006,
@@ -922,45 +922,45 @@ static const int included_patches[] = {
   998,
   997,
   996,
-  // 995,
-  // 994,
+  995,
+  994,
   993,
-  // 992,
-  // 991,
-  // 990,
+  992,
+  991,
+  990,
   989,
   988,
-  // 987,
+  987,
   986,
-  // 985,
-  // 984,
+  985,
+  984,
   983,
-  // 982,
-  // 981,
+  982,
+  981,
   980,
-  // 979,
-  // 978,
-  // 977,
+  979,
+  978,
+  977,
   // 976,
   975,
   974,
-  // 973,
+  973,
   972,
   971,
   // 970,
   969,
-  // 968,
+  968,
   967,
   966,
-  // 965,
-  // 964,
-  // 963,
+  965,
+  964,
+  963,
   962,
   961,
   // 960,
-  // 959,
-  // 958,
-  // 957,
+  959,
+  958,
+  957,
   // 956,
   955,
   954,
@@ -970,34 +970,34 @@ static const int included_patches[] = {
   950,
   949,
   948,
-  // 947,
+  947,
   946,
   945,
   944,
-  // 943,
-  // 942,
+  943,
+  942,
   // 941,
-  // 940,
-  // 939,
-  // 938,
+  940,
+  939,
+  938,
   // 937,
-  // 936,
-  // 935,
+  936,
+  935,
   // 934,
   933,
   // 932,
   931,
-  // 930,
-  // 929,
+  930,
+  929,
   928,
-  // 927,
-  // 926,
+  927,
+  926,
   925,
-  // 924,
-  // 923,
+  924,
+  923,
   922,
   921,
-  // 920,
+  920,
   919,
   // 918,
   // 917,
@@ -1008,8 +1008,8 @@ static const int included_patches[] = {
   // 912,
   911,
   // 910,
-  // 909,
-  // 908,
+  909,
+  908,
   907,
   906,
   905,
@@ -1614,14 +1614,14 @@ static const int included_patches[] = {
   306,
   305,
   304,
-  // 303,
+  303,
   302,
   301,
   300,
   299,
   298,
   297,
-  // 296,
+  296,
   295,
   294,
   293,
@@ -1679,14 +1679,14 @@ static const int included_patches[] = {
   241,
   240,
   239,
-  // 238,
+  238,
   237,
   236,
   235,
   234,
   // 233,
   232,
-  // 231,
+  231,
   230,
   229,
   228,