aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-08-22 19:27:53 -04:00
Code

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

Browse Source 
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>
This commit is contained in:
zeertzjq 2023-12-16 14:14:36 +01:00 committed by Christian Brabandt
parent e5437c5427
commit ffba4e952b
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/optiondefs.h
View File

@ -337,10 +337,6 @@ static struct vimoption options[] =
(char_u *)224L, (char_u *)224L,
#endif #endif
(char_u *)0L} SCTX_INIT}, (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, {"allowrevins", "ari", P_BOOL|P_VI_DEF|P_VIM,
#ifdef FEAT_RIGHTLEFT #ifdef FEAT_RIGHTLEFT
(char_u *)&p_ari, PV_NONE, NULL, NULL, (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 *)&p_ambw, PV_NONE, did_set_ambiwidth, expand_set_ambiwidth,
{(char_u *)"single", (char_u *)0L} {(char_u *)"single", (char_u *)0L}
SCTX_INIT}, 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, {"arabic", "arab", P_BOOL|P_VI_DEF|P_VIM|P_CURSWANT,
#ifdef FEAT_ARABIC #ifdef FEAT_ARABIC
(char_u *)VAR_WIN, PV_ARAB, did_set_arabic, NULL, (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, {"mousetime", "mouset", P_NUM|P_VI_DEF,
(char_u *)&p_mouset, PV_NONE, NULL, NULL, (char_u *)&p_mouset, PV_NONE, NULL, NULL,
{(char_u *)500L, (char_u *)0L} SCTX_INIT}, {(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, {"mzschemedll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
#if defined(DYNAMIC_MZSCHEME) #if defined(DYNAMIC_MZSCHEME)
(char_u *)&p_mzschemedll, PV_NONE, NULL, NULL, (char_u *)&p_mzschemedll, PV_NONE, NULL, NULL,
@ -1780,13 +1787,6 @@ static struct vimoption options[] =
{(char_u *)"", (char_u *)0L} {(char_u *)"", (char_u *)0L}
#endif #endif
SCTX_INIT}, 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, {"novice", NULL, P_BOOL|P_VI_DEF,
(char_u *)NULL, PV_NONE, NULL, NULL, (char_u *)NULL, PV_NONE, NULL, NULL,
{(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
@ -2793,10 +2793,10 @@ static struct vimoption options[] =
{"visualbell", "vb", P_BOOL|P_VI_DEF, {"visualbell", "vb", P_BOOL|P_VI_DEF,
(char_u *)&p_vb, PV_NONE, NULL, NULL, (char_u *)&p_vb, PV_NONE, NULL, NULL,
{(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {(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 *)NULL, PV_NONE, NULL, NULL,
{(char_u *)0L, (char_u *)0L} SCTX_INIT}, {(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 *)NULL, PV_NONE, NULL, NULL,
{(char_u *)0L, (char_u *)0L} SCTX_INIT}, {(char_u *)0L, (char_u *)0L} SCTX_INIT},
{"w9600", NULL, P_NUM|P_VI_DEF, {"w9600", NULL, P_NUM|P_VI_DEF,

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2171,
/**/ /**/
2170, 2170,
/**/ /**/