patch 9.0.2171: The options[] array is still not sorted alphabetically

Problem:  The options[] array is still not sorted alphabetically
          (after: v9.0.2154), causing test failures
Solution: Sort the remaining items

This causes an failure for the vim/vim-win32-installer builds, so make
sure it is completely sorted.

closes: #13690

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/optiondefs.h b/src/optiondefs.h
index 658e17d16d4853f7f019db981d3a3c920fdbca07..783b851f6c4a77a3b0a1055b216176cd9536056f 100644 (file)
--- a/src/optiondefs.h
+++ b/src/optiondefs.h
@@ -337,10 +337,6 @@ static struct vimoption options[] =
                            (char_u *)224L,
 #endif
                                            (char_u *)0L} SCTX_INIT},
-    {"antialias",   "anti", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
-                           (char_u *)NULL, PV_NONE, NULL, NULL,
-                           {(char_u *)FALSE, (char_u *)FALSE}
-                           SCTX_INIT},
     {"allowrevins", "ari",  P_BOOL|P_VI_DEF|P_VIM,
 #ifdef FEAT_RIGHTLEFT
                            (char_u *)&p_ari, PV_NONE, NULL, NULL,
@@ -355,6 +351,10 @@ static struct vimoption options[] =
                            (char_u *)&p_ambw, PV_NONE, did_set_ambiwidth, expand_set_ambiwidth,
                            {(char_u *)"single", (char_u *)0L}
                            SCTX_INIT},
+    {"antialias",   "anti", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
+                           (char_u *)NULL, PV_NONE, NULL, NULL,
+                           {(char_u *)FALSE, (char_u *)FALSE}
+                           SCTX_INIT},
     {"arabic",     "arab", P_BOOL|P_VI_DEF|P_VIM|P_CURSWANT,
 #ifdef FEAT_ARABIC
                            (char_u *)VAR_WIN, PV_ARAB, did_set_arabic, NULL,
@@ -1762,6 +1762,13 @@ static struct vimoption options[] =
     {"mousetime",   "mouset",  P_NUM|P_VI_DEF,
                            (char_u *)&p_mouset, PV_NONE, NULL, NULL,
                            {(char_u *)500L, (char_u *)0L} SCTX_INIT},
+    {"mzquantum",  "mzq",   P_NUM,
+#ifdef FEAT_MZSCHEME
+                           (char_u *)&p_mzq, PV_NONE, did_set_mzquantum, NULL,
+#else
+                           (char_u *)NULL, PV_NONE, NULL, NULL,
+#endif
+                           {(char_u *)100L, (char_u *)100L} SCTX_INIT},
     {"mzschemedll", NULL,   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
 #if defined(DYNAMIC_MZSCHEME)
                            (char_u *)&p_mzschemedll, PV_NONE, NULL, NULL,
@@ -1780,13 +1787,6 @@ static struct vimoption options[] =
                            {(char_u *)"", (char_u *)0L}
 #endif
                            SCTX_INIT},
-    {"mzquantum",  "mzq",   P_NUM,
-#ifdef FEAT_MZSCHEME
-                           (char_u *)&p_mzq, PV_NONE, did_set_mzquantum, NULL,
-#else
-                           (char_u *)NULL, PV_NONE, NULL, NULL,
-#endif
-                           {(char_u *)100L, (char_u *)100L} SCTX_INIT},
     {"novice",     NULL,   P_BOOL|P_VI_DEF,
                            (char_u *)NULL, PV_NONE, NULL, NULL,
                            {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
@@ -2793,10 +2793,10 @@ static struct vimoption options[] =
     {"visualbell",  "vb",   P_BOOL|P_VI_DEF,
                            (char_u *)&p_vb, PV_NONE, NULL, NULL,
                            {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
-    {"w300",       NULL,   P_NUM|P_VI_DEF,
+    {"w1200",      NULL,   P_NUM|P_VI_DEF,
                            (char_u *)NULL, PV_NONE, NULL, NULL,
                            {(char_u *)0L, (char_u *)0L} SCTX_INIT},
-    {"w1200",      NULL,   P_NUM|P_VI_DEF,
+    {"w300",       NULL,   P_NUM|P_VI_DEF,
                            (char_u *)NULL, PV_NONE, NULL, NULL,
                            {(char_u *)0L, (char_u *)0L} SCTX_INIT},
     {"w9600",      NULL,   P_NUM|P_VI_DEF,

diff --git a/src/version.c b/src/version.c
index 281124e2031f3e68213094cef4f9d10e5e2f26d0..de90fcec5ac50180e0c98c68bf1feaac8a774861 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2171,
 /**/
     2170,
 /**/