Skip to content

Commit a713ff8

Browse files
brammoolbrammool
committed
patch 8.0.0372: more options are not always defined
Problem: More options are not always defined. Solution: Consistently define all possible options.
1 parent 14c2e18 commit a713ff8

File tree

3 files changed

+137
-39
lines changed

3 files changed

+137
-39
lines changed

‎src/option.c‎

Lines changed: 134 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -559,11 +559,15 @@ static struct vimoption options[] =
559559
{(char_u *)0L, (char_u *)0L}
560560
#endif
561561
SCRIPTID_INIT},
562-
#ifdef FEAT_AUTOCHDIR
563562
{"autochdir", "acd", P_BOOL|P_VI_DEF,
563+
#ifdef FEAT_AUTOCHDIR
564564
(char_u *)&p_acd, PV_NONE,
565-
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
565+
{(char_u *)FALSE, (char_u *)0L}
566+
#else
567+
(char_u *)NULL, PV_NONE,
568+
{(char_u *)0L, (char_u *)0L}
566569
#endif
570+
SCRIPTID_INIT},
567571
{"autoindent", "ai", P_BOOL|P_VI_DEF,
568572
(char_u *)&p_ai, PV_AI,
569573
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
@@ -1210,62 +1214,125 @@ static struct vimoption options[] =
12101214
{"flash", "fl", P_BOOL|P_VI_DEF,
12111215
(char_u *)NULL, PV_NONE,
12121216
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1213-
#ifdef FEAT_FOLDING
12141217
{"foldclose", "fcl", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN,
1218+
#ifdef FEAT_FOLDING
12151219
(char_u *)&p_fcl, PV_NONE,
1216-
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
1220+
{(char_u *)"", (char_u *)0L}
1221+
#else
1222+
(char_u *)NULL, PV_NONE,
1223+
{(char_u *)NULL, (char_u *)0L}
1224+
#endif
1225+
SCRIPTID_INIT},
12171226
{"foldcolumn", "fdc", P_NUM|P_VI_DEF|P_RWIN,
1227+
#ifdef FEAT_FOLDING
12181228
(char_u *)VAR_WIN, PV_FDC,
1219-
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1229+
{(char_u *)FALSE, (char_u *)0L}
1230+
#else
1231+
(char_u *)NULL, PV_NONE,
1232+
{(char_u *)NULL, (char_u *)0L}
1233+
#endif
1234+
SCRIPTID_INIT},
12201235
{"foldenable", "fen", P_BOOL|P_VI_DEF|P_RWIN,
1236+
#ifdef FEAT_FOLDING
12211237
(char_u *)VAR_WIN, PV_FEN,
1222-
{(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
1238+
{(char_u *)TRUE, (char_u *)0L}
1239+
#else
1240+
(char_u *)NULL, PV_NONE,
1241+
{(char_u *)NULL, (char_u *)0L}
1242+
#endif
1243+
SCRIPTID_INIT},
12231244
{"foldexpr", "fde", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
1224-
# ifdef FEAT_EVAL
1245+
#if defined(FEAT_FOLDING) && defined(FEAT_EVAL)
12251246
(char_u *)VAR_WIN, PV_FDE,
12261247
{(char_u *)"0", (char_u *)NULL}
1227-
# else
1248+
#else
12281249
(char_u *)NULL, PV_NONE,
12291250
{(char_u *)NULL, (char_u *)0L}
1230-
# endif
1251+
#endif
12311252
SCRIPTID_INIT},
12321253
{"foldignore", "fdi", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
1254+
#ifdef FEAT_FOLDING
12331255
(char_u *)VAR_WIN, PV_FDI,
1234-
{(char_u *)"#", (char_u *)NULL} SCRIPTID_INIT},
1256+
{(char_u *)"#", (char_u *)NULL}
1257+
#else
1258+
(char_u *)NULL, PV_NONE,
1259+
{(char_u *)NULL, (char_u *)0L}
1260+
#endif
1261+
SCRIPTID_INIT},
12351262
{"foldlevel", "fdl", P_NUM|P_VI_DEF|P_RWIN,
1263+
#ifdef FEAT_FOLDING
12361264
(char_u *)VAR_WIN, PV_FDL,
1237-
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
1265+
{(char_u *)0L, (char_u *)0L}
1266+
#else
1267+
(char_u *)NULL, PV_NONE,
1268+
{(char_u *)NULL, (char_u *)0L}
1269+
#endif
1270+
SCRIPTID_INIT},
12381271
{"foldlevelstart","fdls", P_NUM|P_VI_DEF|P_CURSWANT,
1272+
#ifdef FEAT_FOLDING
12391273
(char_u *)&p_fdls, PV_NONE,
1240-
{(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT},
1274+
{(char_u *)-1L, (char_u *)0L}
1275+
#else
1276+
(char_u *)NULL, PV_NONE,
1277+
{(char_u *)NULL, (char_u *)0L}
1278+
#endif
1279+
SCRIPTID_INIT},
12411280
{"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|
1281+
#ifdef FEAT_FOLDING
12421282
P_RWIN|P_ONECOMMA|P_NODUP,
12431283
(char_u *)VAR_WIN, PV_FMR,
12441284
{(char_u *)"{{{,}}}", (char_u *)NULL}
1285+
#else
1286+
(char_u *)NULL, PV_NONE,
1287+
{(char_u *)NULL, (char_u *)0L}
1288+
#endif
12451289
SCRIPTID_INIT},
12461290
{"foldmethod", "fdm", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
1291+
#ifdef FEAT_FOLDING
12471292
(char_u *)VAR_WIN, PV_FDM,
1248-
{(char_u *)"manual", (char_u *)NULL} SCRIPTID_INIT},
1293+
{(char_u *)"manual", (char_u *)NULL}
1294+
#else
1295+
(char_u *)NULL, PV_NONE,
1296+
{(char_u *)NULL, (char_u *)0L}
1297+
#endif
1298+
SCRIPTID_INIT},
12491299
{"foldminlines","fml", P_NUM|P_VI_DEF|P_RWIN,
1300+
#ifdef FEAT_FOLDING
12501301
(char_u *)VAR_WIN, PV_FML,
1251-
{(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
1302+
{(char_u *)1L, (char_u *)0L}
1303+
#else
1304+
(char_u *)NULL, PV_NONE,
1305+
{(char_u *)NULL, (char_u *)0L}
1306+
#endif
1307+
SCRIPTID_INIT},
12521308
{"foldnestmax", "fdn", P_NUM|P_VI_DEF|P_RWIN,
1309+
#ifdef FEAT_FOLDING
12531310
(char_u *)VAR_WIN, PV_FDN,
1254-
{(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
1311+
{(char_u *)20L, (char_u *)0L}
1312+
#else
1313+
(char_u *)NULL, PV_NONE,
1314+
{(char_u *)NULL, (char_u *)0L}
1315+
#endif
1316+
SCRIPTID_INIT},
12551317
{"foldopen", "fdo", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_CURSWANT,
1318+
#ifdef FEAT_FOLDING
12561319
(char_u *)&p_fdo, PV_NONE,
12571320
{(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo",
1258-
(char_u *)0L} SCRIPTID_INIT},
1321+
(char_u *)0L}
1322+
#else
1323+
(char_u *)NULL, PV_NONE,
1324+
{(char_u *)NULL, (char_u *)0L}
1325+
#endif
1326+
SCRIPTID_INIT},
12591327
{"foldtext", "fdt", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
1260-
# ifdef FEAT_EVAL
1328+
#if defined(FEAT_FOLDING) && defined(FEAT_EVAL)
12611329
(char_u *)VAR_WIN, PV_FDT,
12621330
{(char_u *)"foldtext()", (char_u *)NULL}
1263-
# else
1331+
#else
12641332
(char_u *)NULL, PV_NONE,
12651333
{(char_u *)NULL, (char_u *)0L}
1266-
# endif
1267-
SCRIPTID_INIT},
12681334
#endif
1335+
SCRIPTID_INIT},
12691336
{"formatexpr", "fex", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
12701337
#ifdef FEAT_EVAL
12711338
(char_u *)&p_fex, PV_FEX,
@@ -1803,17 +1870,24 @@ static struct vimoption options[] =
18031870
{"loadplugins", "lpl", P_BOOL|P_VI_DEF,
18041871
(char_u *)&p_lpl, PV_NONE,
18051872
{(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
1806-
#if defined(DYNAMIC_LUA)
18071873
{"luadll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
1874+
#if defined(DYNAMIC_LUA)
18081875
(char_u *)&p_luadll, PV_NONE,
18091876
{(char_u *)DYNAMIC_LUA_DLL, (char_u *)0L}
1810-
SCRIPTID_INIT},
1877+
#else
1878+
(char_u *)NULL, PV_NONE,
1879+
{(char_u *)"", (char_u *)0L}
18111880
#endif
1812-
#ifdef FEAT_GUI_MAC
1881+
SCRIPTID_INIT},
18131882
{"macatsui", NULL, P_BOOL|P_VI_DEF|P_RCLR,
1883+
#ifdef FEAT_GUI_MAC
18141884
(char_u *)&p_macatsui, PV_NONE,
1815-
{(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
1885+
{(char_u *)TRUE, (char_u *)0L}
1886+
#else
1887+
(char_u *)NULL, PV_NONE,
1888+
{(char_u *)"", (char_u *)0L}
18161889
#endif
1890+
SCRIPTID_INIT},
18171891
{"magic", NULL, P_BOOL|P_VI_DEF,
18181892
(char_u *)&p_magic, PV_NONE,
18191893
{(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
@@ -2045,12 +2119,15 @@ static struct vimoption options[] =
20452119
(char_u *)".,/usr/include,,",
20462120
#endif
20472121
(char_u *)0L} SCRIPTID_INIT},
2048-
#if defined(DYNAMIC_PERL)
20492122
{"perldll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
2123+
#if defined(DYNAMIC_PERL)
20502124
(char_u *)&p_perldll, PV_NONE,
20512125
{(char_u *)DYNAMIC_PERL_DLL, (char_u *)0L}
2052-
SCRIPTID_INIT},
2126+
#else
2127+
(char_u *)NULL, PV_NONE,
2128+
{(char_u *)0L, (char_u *)0L}
20532129
#endif
2130+
SCRIPTID_INIT},
20542131
{"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM,
20552132
(char_u *)&p_pi, PV_PI,
20562133
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
@@ -2156,18 +2233,24 @@ static struct vimoption options[] =
21562233
(char_u *)NULL, PV_NONE,
21572234
#endif
21582235
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
2159-
#if defined(DYNAMIC_PYTHON3)
21602236
{"pythonthreedll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
2237+
#if defined(DYNAMIC_PYTHON3)
21612238
(char_u *)&p_py3dll, PV_NONE,
21622239
{(char_u *)DYNAMIC_PYTHON3_DLL, (char_u *)0L}
2163-
SCRIPTID_INIT},
2240+
#else
2241+
(char_u *)NULL, PV_NONE,
2242+
{(char_u *)NULL, (char_u *)0L}
21642243
#endif
2165-
#if defined(DYNAMIC_PYTHON)
2244+
SCRIPTID_INIT},
21662245
{"pythondll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
2246+
#if defined(DYNAMIC_PYTHON)
21672247
(char_u *)&p_pydll, PV_NONE,
21682248
{(char_u *)DYNAMIC_PYTHON_DLL, (char_u *)0L}
2169-
SCRIPTID_INIT},
2249+
#else
2250+
(char_u *)NULL, PV_NONE,
2251+
{(char_u *)NULL, (char_u *)0L}
21702252
#endif
2253+
SCRIPTID_INIT},
21712254
{"pyxversion", "pyx", P_NUM|P_VI_DEF|P_SECURE,
21722255
#if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3)
21732256
(char_u *)&p_pyx, PV_NONE,
@@ -2249,12 +2332,15 @@ static struct vimoption options[] =
22492332
{(char_u *)NULL, (char_u *)0L}
22502333
#endif
22512334
SCRIPTID_INIT},
2252-
#if defined(DYNAMIC_RUBY)
22532335
{"rubydll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
2336+
#if defined(DYNAMIC_RUBY)
22542337
(char_u *)&p_rubydll, PV_NONE,
22552338
{(char_u *)DYNAMIC_RUBY_DLL, (char_u *)0L}
2256-
SCRIPTID_INIT},
2339+
#else
2340+
(char_u *)NULL, PV_NONE,
2341+
{(char_u *)NULL, (char_u *)0L}
22572342
#endif
2343+
SCRIPTID_INIT},
22582344
{"ruler", "ru", P_BOOL|P_VI_DEF|P_VIM|P_RSTAT,
22592345
#ifdef FEAT_CMDL_INFO
22602346
(char_u *)&p_ru, PV_NONE,
@@ -2642,12 +2728,15 @@ static struct vimoption options[] =
26422728
{"tagstack", "tgst", P_BOOL|P_VI_DEF,
26432729
(char_u *)&p_tgst, PV_NONE,
26442730
{(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
2645-
#if defined(DYNAMIC_TCL)
26462731
{"tcldll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
2732+
#if defined(DYNAMIC_TCL)
26472733
(char_u *)&p_tcldll, PV_NONE,
26482734
{(char_u *)DYNAMIC_TCL_DLL, (char_u *)0L}
2649-
SCRIPTID_INIT},
2735+
#else
2736+
(char_u *)NULL, PV_NONE,
2737+
{(char_u *)0L, (char_u *)0L}
26502738
#endif
2739+
SCRIPTID_INIT},
26512740
{"term", NULL, P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
26522741
(char_u *)&T_NAME, PV_NONE,
26532742
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
@@ -2742,17 +2831,24 @@ static struct vimoption options[] =
27422831
(char_u *)NULL, PV_NONE,
27432832
#endif
27442833
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2745-
#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
27462834
{"toolbar", "tb", P_STRING|P_ONECOMMA|P_VI_DEF|P_NODUP,
2835+
#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
27472836
(char_u *)&p_toolbar, PV_NONE,
27482837
{(char_u *)"icons,tooltips", (char_u *)0L}
2749-
SCRIPTID_INIT},
2838+
#else
2839+
(char_u *)NULL, PV_NONE,
2840+
{(char_u *)0L, (char_u *)0L}
27502841
#endif
2751-
#if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK)
2842+
SCRIPTID_INIT},
27522843
{"toolbariconsize", "tbis", P_STRING|P_VI_DEF,
2844+
#if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK)
27532845
(char_u *)&p_tbis, PV_NONE,
2754-
{(char_u *)"small", (char_u *)0L} SCRIPTID_INIT},
2846+
{(char_u *)"small", (char_u *)0L}
2847+
#else
2848+
(char_u *)NULL, PV_NONE,
2849+
{(char_u *)0L, (char_u *)0L}
27552850
#endif
2851+
SCRIPTID_INIT},
27562852
{"ttimeout", NULL, P_BOOL|P_VI_DEF|P_VIM,
27572853
(char_u *)&p_ttimeout, PV_NONE,
27582854
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},

‎src/testdir/test_expand_dllpath.vim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func s:test_expand_dllpath(optname)
1414
endfunc
1515

1616
func s:generate_test_if_exists(optname)
17-
if exists('&' . a:optname)
17+
if exists('+' . a:optname)
1818
execute join([
1919
\ 'func Test_expand_' . a:optname . '()',
2020
\ ' call s:test_expand_dllpath("' . a:optname . '")',

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
372,
767769
/**/
768770
371,
769771
/**/

0 commit comments

Comments
 (0)