1 files changed, 112 insertions, 74 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 741ced3619..cbfffc93ad 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -61,11 +61,7 @@ static char *(features[]) = {
   "+conceal",
   "+cscope",
   "+cursorbind",
-#ifdef CURSOR_SHAPE
   "+cursorshape",
-#else  // ifdef CURSOR_SHAPE
-  "-cursorshape",
-#endif  // ifdef CURSOR_SHAPE
   "+dialog_con",
   "+diff",
   "+digraphs",
@@ -145,11 +141,7 @@ static char *(features[]) = {
   "+syntax",
   "+tag_binary",
   "+tag_old_static",
-#ifdef FEAT_TAG_ANYWHITE
-  "+tag_any_white",
-#else  // ifdef FEAT_TAG_ANYWHITE
   "-tag_any_white",
-#endif  // ifdef FEAT_TAG_ANYWHITE
 #if defined(UNIX)
 
   // only Unix can have terminfo instead of termcap
@@ -193,6 +185,52 @@ static char *(features[]) = {
 
 static int included_patches[] = {
   // Add new patch number below this line
+  //410,
+  //409,
+  //408,
+  //407,
+  //406,
+  //405,
+  //404,
+  //403,
+  //402,
+  //401,
+  //400,
+  //399,
+  //398,
+  //397,
+  //396,
+  //395,
+  //394,
+  //393,
+  //392,
+  //391,
+  //390,
+  //389,
+  //388,
+  //387,
+  //386,
+  //385,
+  //384,
+  //383,
+  //382,
+  //381,
+  //380 NA
+  //379,
+  //378,
+  //377,
+  //376,
+  //375,
+  //374,
+  //373,
+  //372,
+  //371,
+  //370,
+  //369,
+  //368,
+  //367,
+  //366,
+  //365,
   //364,
   //363,
   //362,
@@ -201,7 +239,7 @@ static int included_patches[] = {
   //359,
   //358,
   //357,
-  //356,
+  //356 NA
   //355,
   //354,
   //353,
@@ -215,62 +253,62 @@ static int included_patches[] = {
   //345,
   //344,
   //343,
-  //342,
+  //342 NA
   //341,
-  //340,
+  //340 NA
   //339,
   //338,
   //337,
   //336,
-  //335,
+  335,
   //334,
-  //333,
-  //332,
-  //331,
+  //333 NA
+  //332 NA
+  331,
   //330,
   //329,
-  //328,
-  //327,
-  //326,
+  328,
+  327,
+  //326 NA
   //325,
   //324,
-  //323,
-  //322,
-  //321,
+  323,
+  //322 NA
+  //321 NA
   //320,
-  //319,
-  //318,
+  //319 NA
+  318,
   //317,
-  //316,
+  //316 NA
   315,
-  //314,
+  314,
   //313,
   //312,
   //311,
   //310,
   309,
   308,
-  //307,
+  //307 NA
   306,
   //305,
-  //304,
+  //304 NA
   303,
   302,
   301,
-  //300,
-  //299,
+  //300 NA
+  //299 NA
   298,
   //297,
   //296,
   295,
-  //294,
-  //293,
+  294,
+  293,
   292,
   291,
   290,
   289,
   288,
-  //287,
+  //287 NA
   286,
   285,
   284,
@@ -281,13 +319,13 @@ static int included_patches[] = {
   279,
   //278,
   277,
-  //276,
+  276,
   275,
   274,
-  //273,
+  //273 NA
   272,
   //271,
-  //270,
+  //270 NA
   269,
   268,
   267,
@@ -299,13 +337,13 @@ static int included_patches[] = {
   261,
   260,
   //259,
-  //258,
-  //257,
+  //258 NA
+  //257 NA
   //256,
   //255,
   //254,
   253,
-  //252,
+  //252 NA
   251,
   //250,
   //249,
@@ -327,76 +365,76 @@ static int included_patches[] = {
   233,
   232,
   //231,
-  //230,
+  230,
   229,
-  //228,
-  //227,
+  //228 NA
+  //227 NA
   226,
-  //225,
-  //224,
-  //223,
-  //222,
+  //225 NA
+  //224 NA
+  //223 NA
+  //222 NA
   221,
   //220,
   219,
   218,
-  //217,
-  //216,
+  //217 NA
+  //216 NA
   215,
-  //214,
+  //214 NA
   213,
-  //212,
+  //212 NA
   //211,
   210,
   209,
-  //208,
+  //208 NA
   207,
-  //206,
+  //206 NA
   205,
   204,
   203,
-  //202,
-  //201,
-  //200,
+  //202 NA
+  201,
+  //200 NA
   199,
-  //198,
-  //197,
-  //196,
-  //195,
-  //194,
+  //198 NA
+  //197 NA
+  //196 NA
+  //195 NA
+  //194 NA
   193,
   192,
   191,
-  //190,
+  //190 NA
   //189,
-  //188,
+  //188 NA
   187,
   186,
   //185,
   184,
-  //183,
-  //182,
+  //183 NA
+  //182 NA
   181,
-  //180,
-  //179,
+  //180 NA
+  //179 NA
   178,
-  //177,
+  //177 NA
   //176,
-  //175,
-  //174,
+  //175 NA
+  //174 NA
   173,
   172,
   171,
   170,
   169,
-  //168,
+  //168 NA
   167,
   166,
-  //165,
-  //164,
-  //163,
-  //162,
-  //161,
+  165,
+  //164 NA
+  //163 NA
+  //162 NA
+  //161 NA
   160,
   159,
   158,