diff options
Diffstat (limited to 'src/optiondefs.h')
| -rw-r--r-- | src/optiondefs.h | 1239 |
1 files changed, 622 insertions, 617 deletions
diff --git a/src/optiondefs.h b/src/optiondefs.h index 4f3a1524a9..08de5bf406 100644 --- a/src/optiondefs.h +++ b/src/optiondefs.h @@ -272,6 +272,11 @@ struct vimoption // callback function to invoke after an option is modified to validate and // apply the new value. opt_did_set_cb_T opt_did_set_cb; + + // callback function to invoke when expanding possible values on the + // cmdline. Only useful for string options. + opt_expand_cb_T opt_expand_cb; + char_u *def_val[2]; // default values for variable (vi and vim) #ifdef FEAT_EVAL sctx_T script_ctx; // script context where the option was last set @@ -324,7 +329,7 @@ static struct vimoption options[] = #else (char_u *)NULL, PV_NONE, #endif - NULL, + NULL, NULL, { #if defined(MSWIN) && !defined(FEAT_GUI_MSWIN) (char_u *)128L, @@ -333,72 +338,72 @@ static struct vimoption options[] = #endif (char_u *)0L} SCTX_INIT}, {"antialias", "anti", P_BOOL|P_VI_DEF|P_VIM|P_RCLR, - (char_u *)NULL, PV_NONE, NULL, + (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, + (char_u *)VAR_WIN, PV_ARAB, did_set_arabic, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"arabicshape", "arshape", P_BOOL|P_VI_DEF|P_VIM|P_RCLR, #ifdef FEAT_ARABIC - (char_u *)&p_arshape, PV_NONE, NULL, + (char_u *)&p_arshape, PV_NONE, NULL, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, {"allowrevins", "ari", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_RIGHTLEFT - (char_u *)&p_ari, PV_NONE, NULL, + (char_u *)&p_ari, PV_NONE, NULL, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"altkeymap", "akm", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"ambiwidth", "ambw", P_STRING|P_VI_DEF|P_RCLR, - (char_u *)&p_ambw, PV_NONE, did_set_ambiwidth, + (char_u *)&p_ambw, PV_NONE, did_set_ambiwidth, expand_set_ambiwidth, {(char_u *)"single", (char_u *)0L} SCTX_INIT}, {"autochdir", "acd", P_BOOL|P_VI_DEF, #ifdef FEAT_AUTOCHDIR - (char_u *)&p_acd, PV_NONE, did_set_autochdir, + (char_u *)&p_acd, PV_NONE, did_set_autochdir, NULL, {(char_u *)FALSE, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"autoshelldir", "asd", P_BOOL|P_VI_DEF, #ifdef FEAT_AUTOSHELLDIR - (char_u *)&p_asd, PV_NONE, NULL, + (char_u *)&p_asd, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"autoindent", "ai", P_BOOL|P_VI_DEF, - (char_u *)&p_ai, PV_AI, NULL, + (char_u *)&p_ai, PV_AI, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"autoprint", "ap", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"autoread", "ar", P_BOOL|P_VI_DEF, - (char_u *)&p_ar, PV_AR, NULL, + (char_u *)&p_ar, PV_AR, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"autowrite", "aw", P_BOOL|P_VI_DEF, - (char_u *)&p_aw, PV_NONE, NULL, + (char_u *)&p_aw, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"autowriteall","awa", P_BOOL|P_VI_DEF, - (char_u *)&p_awa, PV_NONE, NULL, + (char_u *)&p_awa, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"background", "bg", P_STRING|P_VI_DEF|P_RCLR, - (char_u *)&p_bg, PV_NONE, did_set_background, + (char_u *)&p_bg, PV_NONE, did_set_background, expand_set_background, { #if (defined(MSWIN)) && !defined(FEAT_GUI) (char_u *)"dark", @@ -407,13 +412,13 @@ static struct vimoption options[] = #endif (char_u *)0L} SCTX_INIT}, {"backspace", "bs", P_STRING|P_VI_DEF|P_VIM|P_ONECOMMA|P_NODUP, - (char_u *)&p_bs, PV_NONE, did_set_backspace, + (char_u *)&p_bs, PV_NONE, did_set_backspace, expand_set_backspace, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"backup", "bk", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_bk, PV_NONE, NULL, + (char_u *)&p_bk, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"backupcopy", "bkc", P_STRING|P_VIM|P_ONECOMMA|P_NODUP, - (char_u *)&p_bkc, PV_BKC, did_set_backupcopy, + (char_u *)&p_bkc, PV_BKC, did_set_backupcopy, expand_set_backupcopy, #ifdef UNIX {(char_u *)"yes", (char_u *)"auto"} #else @@ -422,11 +427,11 @@ static struct vimoption options[] = SCTX_INIT}, {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA |P_NODUP|P_SECURE, - (char_u *)&p_bdir, PV_NONE, NULL, + (char_u *)&p_bdir, PV_NONE, NULL, NULL, {(char_u *)DFLT_BDIR, (char_u *)0L} SCTX_INIT}, {"backupext", "bex", P_STRING|P_VI_DEF|P_NFNAME, (char_u *)&p_bex, PV_NONE, - did_set_backupext_or_patchmode, + did_set_backupext_or_patchmode, NULL, { #ifdef VMS (char_u *)"_", @@ -435,77 +440,77 @@ static struct vimoption options[] = #endif (char_u *)0L} SCTX_INIT}, {"backupskip", "bsk", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_bsk, PV_NONE, NULL, + (char_u *)&p_bsk, PV_NONE, NULL, NULL, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"balloondelay","bdlay",P_NUM|P_VI_DEF, #ifdef FEAT_BEVAL - (char_u *)&p_bdlay, PV_NONE, NULL, + (char_u *)&p_bdlay, PV_NONE, NULL, NULL, {(char_u *)600L, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"ballooneval", "beval",P_BOOL|P_VI_DEF|P_NO_MKRC, #ifdef FEAT_BEVAL_GUI - (char_u *)&p_beval, PV_NONE, did_set_ballooneval, + (char_u *)&p_beval, PV_NONE, did_set_ballooneval, NULL, {(char_u *)FALSE, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"balloonevalterm", "bevalterm",P_BOOL|P_VI_DEF|P_NO_MKRC, #ifdef FEAT_BEVAL_TERM (char_u *)&p_bevalterm, PV_NONE, - did_set_balloonevalterm, + did_set_balloonevalterm, NULL, {(char_u *)FALSE, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM|P_MLE, #if defined(FEAT_BEVAL) && defined(FEAT_EVAL) - (char_u *)&p_bexpr, PV_BEXPR, did_set_optexpr, + (char_u *)&p_bexpr, PV_BEXPR, did_set_optexpr, NULL, {(char_u *)"", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"beautify", "bf", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"belloff", "bo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_bo, PV_NONE, did_set_belloff, + (char_u *)&p_bo, PV_NONE, did_set_belloff, expand_set_belloff, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"binary", "bin", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)&p_bin, PV_BIN, did_set_binary, + (char_u *)&p_bin, PV_BIN, did_set_binary, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"bioskey", "biosk",P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, {"bomb", NULL, P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, (char_u *)&p_bomb, PV_BOMB, - did_set_eof_eol_fixeol_bomb, + did_set_eof_eol_fixeol_bomb, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"breakat", "brk", P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST, #ifdef FEAT_LINEBREAK - (char_u *)&p_breakat, PV_NONE, did_set_breakat, + (char_u *)&p_breakat, PV_NONE, did_set_breakat, NULL, {(char_u *)" \t!@*-+;:,./?", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"breakindent", "bri", P_BOOL|P_VI_DEF|P_VIM|P_RWIN, #ifdef FEAT_LINEBREAK - (char_u *)VAR_WIN, PV_BRI, NULL, + (char_u *)VAR_WIN, PV_BRI, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, @@ -513,80 +518,80 @@ static struct vimoption options[] = |P_ONECOMMA|P_NODUP, #ifdef FEAT_LINEBREAK (char_u *)VAR_WIN, PV_BRIOPT, - did_set_breakindentopt, + did_set_breakindentopt, expand_set_breakindentopt, {(char_u *)"", (char_u *)NULL} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)"", (char_u *)NULL} #endif SCTX_INIT}, {"browsedir", "bsdir",P_STRING|P_VI_DEF, #ifdef FEAT_BROWSE - (char_u *)&p_bsdir, PV_NONE, did_set_browsedir, + (char_u *)&p_bsdir, PV_NONE, did_set_browsedir, expand_set_browsedir, {(char_u *)"last", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"bufhidden", "bh", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, - (char_u *)&p_bh, PV_BH, did_set_bufhidden, + (char_u *)&p_bh, PV_BH, did_set_bufhidden, expand_set_bufhidden, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"buflisted", "bl", P_BOOL|P_VI_DEF|P_NOGLOB, - (char_u *)&p_bl, PV_BL, did_set_buflisted, + (char_u *)&p_bl, PV_BL, did_set_buflisted, NULL, {(char_u *)1L, (char_u *)0L} SCTX_INIT}, {"buftype", "bt", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, - (char_u *)&p_bt, PV_BT, did_set_buftype, + (char_u *)&p_bt, PV_BT, did_set_buftype, expand_set_buftype, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"casemap", "cmp", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_cmp, PV_NONE, did_set_casemap, + (char_u *)&p_cmp, PV_NONE, did_set_casemap, expand_set_casemap, {(char_u *)"internal,keepascii", (char_u *)0L} SCTX_INIT}, {"cdhome", "cdh", P_BOOL|P_VI_DEF|P_VIM|P_SECURE, - (char_u *)&p_cdh, PV_NONE, NULL, + (char_u *)&p_cdh, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"cdpath", "cd", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE|P_COMMA|P_NODUP, - (char_u *)&p_cdpath, PV_NONE, NULL, + (char_u *)&p_cdpath, PV_NONE, NULL, NULL, {(char_u *)",,", (char_u *)0L} SCTX_INIT}, {"cedit", NULL, P_STRING, - (char_u *)&p_cedit, PV_NONE, did_set_cedit, + (char_u *)&p_cedit, PV_NONE, did_set_cedit, NULL, {(char_u *)"", (char_u *)CTRL_F_STR} SCTX_INIT}, {"charconvert", "ccv", P_STRING|P_VI_DEF|P_SECURE, #if defined(FEAT_EVAL) - (char_u *)&p_ccv, PV_NONE, did_set_optexpr, + (char_u *)&p_ccv, PV_NONE, did_set_optexpr, NULL, {(char_u *)"", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"cindent", "cin", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_cin, PV_CIN, NULL, + (char_u *)&p_cin, PV_CIN, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_cink, PV_CINK, NULL, + (char_u *)&p_cink, PV_CINK, NULL, NULL, {INDENTKEYS_DEFAULT, (char_u *)0L} SCTX_INIT}, {"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_cino, PV_CINO, did_set_cinoptions, + (char_u *)&p_cino, PV_CINO, did_set_cinoptions, NULL, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"cinscopedecls", "cinsd", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_cinsd, PV_CINSD, NULL, + (char_u *)&p_cinsd, PV_CINSD, NULL, NULL, {(char_u *)"public,protected,private", (char_u *)0L} SCTX_INIT}, {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_cinw, PV_CINW, NULL, + (char_u *)&p_cinw, PV_CINW, NULL, NULL, {(char_u *)"if,else,while,do,for,switch", (char_u *)0L} SCTX_INIT}, {"clipboard", "cb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, #ifdef FEAT_CLIPBOARD - (char_u *)&p_cb, PV_NONE, did_set_clipboard, + (char_u *)&p_cb, PV_NONE, did_set_clipboard, expand_set_clipboard, # ifdef FEAT_XCLIPBOARD {(char_u *)"autoselect,exclude:cons\\|linux", (char_u *)0L} @@ -594,343 +599,343 @@ static struct vimoption options[] = {(char_u *)"", (char_u *)0L} # endif #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)"", (char_u *)0L} #endif SCTX_INIT}, {"cmdheight", "ch", P_NUM|P_VI_DEF|P_RALL, - (char_u *)&p_ch, PV_NONE, did_set_cmdheight, + (char_u *)&p_ch, PV_NONE, did_set_cmdheight, NULL, {(char_u *)1L, (char_u *)0L} SCTX_INIT}, {"cmdwinheight", "cwh", P_NUM|P_VI_DEF, - (char_u *)&p_cwh, PV_NONE, NULL, + (char_u *)&p_cwh, PV_NONE, NULL, NULL, {(char_u *)7L, (char_u *)0L} SCTX_INIT}, {"colorcolumn", "cc", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN, #ifdef FEAT_SYN_HL - (char_u *)VAR_WIN, PV_CC, did_set_colorcolumn, + (char_u *)VAR_WIN, PV_CC, did_set_colorcolumn, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, - (char_u *)&Columns, PV_NONE, NULL, + (char_u *)&Columns, PV_NONE, NULL, NULL, {(char_u *)80L, (char_u *)0L} SCTX_INIT}, {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA |P_NODUP|P_CURSWANT, - (char_u *)&p_com, PV_COM, did_set_comments, + (char_u *)&p_com, PV_COM, did_set_comments, NULL, {(char_u *)"s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-", (char_u *)0L} SCTX_INIT}, {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF|P_CURSWANT, #ifdef FEAT_FOLDING - (char_u *)&p_cms, PV_CMS, did_set_commentstring, + (char_u *)&p_cms, PV_CMS, did_set_commentstring, NULL, {(char_u *)"/*%s*/", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, // P_PRI_MKRC isn't needed here, optval_default() // always returns TRUE for 'compatible' {"compatible", "cp", P_BOOL|P_RALL, - (char_u *)&p_cp, PV_NONE, did_set_compatible, + (char_u *)&p_cp, PV_NONE, did_set_compatible, NULL, {(char_u *)TRUE, (char_u *)FALSE} SCTX_INIT}, {"complete", "cpt", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_cpt, PV_CPT, did_set_complete, + (char_u *)&p_cpt, PV_CPT, did_set_complete, expand_set_complete, {(char_u *)".,w,b,u,t,i", (char_u *)0L} SCTX_INIT}, - {"concealcursor","cocu", P_STRING|P_ALLOCED|P_RWIN|P_VI_DEF, + {"concealcursor","cocu", P_STRING|P_ALLOCED|P_RWIN|P_VI_DEF|P_FLAGLIST, #ifdef FEAT_CONCEAL - (char_u *)VAR_WIN, PV_COCU, did_set_concealcursor, + (char_u *)VAR_WIN, PV_COCU, did_set_concealcursor, expand_set_concealcursor, {(char_u *)"", (char_u *)NULL} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"conceallevel","cole", P_NUM|P_RWIN|P_VI_DEF, #ifdef FEAT_CONCEAL - (char_u *)VAR_WIN, PV_COLE, did_set_conceallevel, + (char_u *)VAR_WIN, PV_COLE, did_set_conceallevel, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)0L, (char_u *)0L} SCTX_INIT}, {"completefunc", "cfu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE|P_FUNC, #ifdef FEAT_COMPL_FUNC - (char_u *)&p_cfu, PV_CFU, did_set_completefunc, + (char_u *)&p_cfu, PV_CFU, did_set_completefunc, NULL, {(char_u *)"", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"completeopt", "cot", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_cot, PV_NONE, did_set_completeopt, + (char_u *)&p_cot, PV_NONE, did_set_completeopt, expand_set_completeopt, {(char_u *)"menu,preview", (char_u *)0L} SCTX_INIT}, - {"completepopup", "cpp", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, + {"completepopup", "cpp", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_COLON, #if defined(FEAT_PROP_POPUP) && defined(FEAT_QUICKFIX) - (char_u *)&p_cpp, PV_NONE, did_set_completepopup, + (char_u *)&p_cpp, PV_NONE, did_set_completepopup, expand_set_popupoption, {(char_u *)"", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"completeslash", "csl", P_STRING|P_VI_DEF|P_VIM, #if defined(BACKSLASH_IN_FILENAME) - (char_u *)&p_csl, PV_CSL, did_set_completeslash, + (char_u *)&p_csl, PV_CSL, did_set_completeslash, expand_set_completeslash, {(char_u *)"", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"confirm", "cf", P_BOOL|P_VI_DEF, #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) - (char_u *)&p_confirm, PV_NONE, NULL, + (char_u *)&p_confirm, PV_NONE, NULL, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"conskey", "consk",P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"copyindent", "ci", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_ci, PV_CI, NULL, + (char_u *)&p_ci, PV_CI, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"cpoptions", "cpo", P_STRING|P_VIM|P_RALL|P_FLAGLIST, - (char_u *)&p_cpo, PV_NONE, did_set_cpoptions, + (char_u *)&p_cpo, PV_NONE, did_set_cpoptions, expand_set_cpoptions, {(char_u *)CPO_VI, (char_u *)CPO_VIM} SCTX_INIT}, {"cryptmethod", "cm", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_CRYPT - (char_u *)&p_cm, PV_CM, did_set_cryptmethod, + (char_u *)&p_cm, PV_CM, did_set_cryptmethod, expand_set_cryptmethod, {(char_u *)"blowfish2", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"cscopepathcomp", "cspc", P_NUM|P_VI_DEF|P_VIM, #ifdef FEAT_CSCOPE - (char_u *)&p_cspc, PV_NONE, NULL, + (char_u *)&p_cspc, PV_NONE, NULL, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)0L, (char_u *)0L} SCTX_INIT}, {"cscopeprg", "csprg", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, #ifdef FEAT_CSCOPE - (char_u *)&p_csprg, PV_NONE, NULL, + (char_u *)&p_csprg, PV_NONE, NULL, NULL, {(char_u *)"cscope", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"cscopequickfix", "csqf", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX) (char_u *)&p_csqf, PV_NONE, - did_set_cscopequickfix, + did_set_cscopequickfix, NULL, {(char_u *)"", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, {"cscoperelative", "csre", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_CSCOPE - (char_u *)&p_csre, PV_NONE, NULL, + (char_u *)&p_csre, PV_NONE, NULL, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)0L, (char_u *)0L} SCTX_INIT}, {"cscopetag", "cst", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_CSCOPE - (char_u *)&p_cst, PV_NONE, NULL, + (char_u *)&p_cst, PV_NONE, NULL, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)0L, (char_u *)0L} SCTX_INIT}, {"cscopetagorder", "csto", P_NUM|P_VI_DEF|P_VIM, #ifdef FEAT_CSCOPE - (char_u *)&p_csto, PV_NONE, NULL, + (char_u *)&p_csto, PV_NONE, NULL, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)0L, (char_u *)0L} SCTX_INIT}, {"cscopeverbose", "csverb", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_CSCOPE - (char_u *)&p_csverbose, PV_NONE, NULL, + (char_u *)&p_csverbose, PV_NONE, NULL, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)0L, (char_u *)0L} SCTX_INIT}, {"cursorbind", "crb", P_BOOL|P_VI_DEF, - (char_u *)VAR_WIN, PV_CRBIND, NULL, + (char_u *)VAR_WIN, PV_CRBIND, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWINONLY, #ifdef FEAT_SYN_HL - (char_u *)VAR_WIN, PV_CUC, NULL, + (char_u *)VAR_WIN, PV_CUC, NULL, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"cursorline", "cul", P_BOOL|P_VI_DEF|P_RWINONLY, #ifdef FEAT_SYN_HL - (char_u *)VAR_WIN, PV_CUL, NULL, + (char_u *)VAR_WIN, PV_CUL, NULL, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"cursorlineopt", "culopt", P_STRING|P_VI_DEF|P_RWIN|P_ONECOMMA|P_NODUP, #ifdef FEAT_SYN_HL (char_u *)VAR_WIN, PV_CULOPT, - did_set_cursorlineopt, + did_set_cursorlineopt, expand_set_cursorlineopt, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)"both", (char_u *)0L} SCTX_INIT}, {"debug", NULL, P_STRING|P_VI_DEF, - (char_u *)&p_debug, PV_NONE, did_set_debug, + (char_u *)&p_debug, PV_NONE, did_set_debug, expand_set_debug, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"define", "def", P_STRING|P_ALLOCED|P_VI_DEF|P_CURSWANT, #ifdef FEAT_FIND_ID - (char_u *)&p_def, PV_DEF, NULL, + (char_u *)&p_def, PV_DEF, NULL, NULL, {(char_u *)"^\\s*#\\s*define", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"delcombine", "deco", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_deco, PV_NONE, NULL, + (char_u *)&p_deco, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP|P_NDNAME, - (char_u *)&p_dict, PV_DICT, NULL, + (char_u *)&p_dict, PV_DICT, NULL, NULL, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"diff", NULL, P_BOOL|P_VI_DEF|P_RWIN|P_NOGLOB, #ifdef FEAT_DIFF - (char_u *)VAR_WIN, PV_DIFF, did_set_diff, + (char_u *)VAR_WIN, PV_DIFF, did_set_diff, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"diffexpr", "dex", P_STRING|P_VI_DEF|P_SECURE|P_CURSWANT, #if defined(FEAT_DIFF) && defined(FEAT_EVAL) - (char_u *)&p_dex, PV_NONE, did_set_optexpr, + (char_u *)&p_dex, PV_NONE, did_set_optexpr, NULL, {(char_u *)"", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, - {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_ONECOMMA + {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_ONECOMMA|P_COLON |P_NODUP, #ifdef FEAT_DIFF - (char_u *)&p_dip, PV_NONE, did_set_diffopt, + (char_u *)&p_dip, PV_NONE, did_set_diffopt, expand_set_diffopt, {(char_u *)"internal,filler,closeoff", (char_u *)NULL} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)"", (char_u *)NULL} #endif SCTX_INIT}, {"digraph", "dg", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_DIGRAPHS - (char_u *)&p_dg, PV_NONE, NULL, + (char_u *)&p_dg, PV_NONE, NULL, NULL, #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, #endif {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"directory", "dir", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA |P_NODUP|P_SECURE, - (char_u *)&p_dir, PV_NONE, NULL, + (char_u *)&p_dir, PV_NONE, NULL, NULL, {(char_u *)DFLT_DIR, (char_u *)0L} SCTX_INIT}, {"display", "dy", P_STRING|P_VI_DEF|P_ONECOMMA|P_RALL|P_NODUP, - (char_u *)&p_dy, PV_NONE, did_set_display, + (char_u *)&p_dy, PV_NONE, did_set_display, expand_set_display, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"eadirection", "ead", P_STRING|P_VI_DEF, - (char_u *)&p_ead, PV_NONE, did_set_eadirection, + (char_u *)&p_ead, PV_NONE, did_set_eadirection, expand_set_eadirection, {(char_u *)"both", (char_u *)0L} SCTX_INIT}, {"edcompatible","ed", P_BOOL|P_VI_DEF, - (char_u *)&p_ed, PV_NONE, NULL, + (char_u *)&p_ed, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"emoji", "emo", P_BOOL|P_VI_DEF|P_RCLR, - (char_u *)&p_emoji, PV_NONE, did_set_ambiwidth, + (char_u *)&p_emoji, PV_NONE, did_set_ambiwidth, NULL, {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, {"encoding", "enc", P_STRING|P_VI_DEF|P_RCLR|P_NO_ML, - (char_u *)&p_enc, PV_NONE, did_set_encoding, + (char_u *)&p_enc, PV_NONE, did_set_encoding, expand_set_encoding, {(char_u *)ENC_DFLT, (char_u *)0L} SCTX_INIT}, {"endoffile", "eof", P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, (char_u *)&p_eof, PV_EOF, - did_set_eof_eol_fixeol_bomb, + did_set_eof_eol_fixeol_bomb, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"endofline", "eol", P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, (char_u *)&p_eol, PV_EOL, - did_set_eof_eol_fixeol_bomb, + did_set_eof_eol_fixeol_bomb, NULL, {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, {"equalalways", "ea", P_BOOL|P_VI_DEF|P_RALL, - (char_u *)&p_ea, PV_NONE, did_set_equalalways, + (char_u *)&p_ea, PV_NONE, did_set_equalalways, NULL, {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, {"equalprg", "ep", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_ep, PV_EP, NULL, + (char_u *)&p_ep, PV_EP, NULL, NULL, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"errorbells", "eb", P_BOOL|P_VI_DEF, - (char_u *)&p_eb, PV_NONE, NULL, + (char_u *)&p_eb, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"errorfile", "ef", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, #ifdef FEAT_QUICKFIX - (char_u *)&p_ef, PV_NONE, NULL, + (char_u *)&p_ef, PV_NONE, NULL, NULL, {(char_u *)DFLT_ERRORFILE, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"errorformat", "efm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, #ifdef FEAT_QUICKFIX - (char_u *)&p_efm, PV_EFM, NULL, + (char_u *)&p_efm, PV_EFM, NULL, NULL, {(char_u *)DFLT_EFM, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"esckeys", "ek", P_BOOL|P_VIM, - (char_u *)&p_ek, PV_NONE, NULL, + (char_u *)&p_ek, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)TRUE} SCTX_INIT}, {"eventignore", "ei", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_ei, PV_NONE, did_set_eventignore, + (char_u *)&p_ei, PV_NONE, did_set_eventignore, expand_set_eventignore, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"expandtab", "et", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_et, PV_ET, NULL, + (char_u *)&p_et, PV_ET, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"exrc", "ex", P_BOOL|P_VI_DEF|P_SECURE, - (char_u *)&p_exrc, PV_NONE, NULL, + (char_u *)&p_exrc, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF |P_NO_MKRC, - (char_u *)&p_fenc, PV_FENC, did_set_encoding, + (char_u *)&p_fenc, PV_FENC, did_set_encoding, expand_set_encoding, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"fileencodings","fencs", P_STRING|P_VI_DEF|P_ONECOMMA, - (char_u *)&p_fencs, PV_NONE, NULL, + (char_u *)&p_fencs, PV_NONE, NULL, expand_set_encoding, {(char_u *)"ucs-bom", (char_u *)0L} SCTX_INIT}, {"fileformat", "ff", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC |P_CURSWANT, - (char_u *)&p_ff, PV_FF, did_set_fileformat, + (char_u *)&p_ff, PV_FF, did_set_fileformat, expand_set_fileformat, {(char_u *)DFLT_FF, (char_u *)0L} SCTX_INIT}, {"fileformats", "ffs", P_STRING|P_VIM|P_ONECOMMA|P_NODUP, - (char_u *)&p_ffs, PV_NONE, did_set_fileformats, + (char_u *)&p_ffs, PV_NONE, did_set_fileformats, expand_set_fileformat, {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM} SCTX_INIT}, {"fileignorecase", "fic", P_BOOL|P_VI_DEF, - (char_u *)&p_fic, PV_NONE, NULL, + (char_u *)&p_fic, PV_NONE, NULL, NULL, { #ifdef CASE_INSENSITIVE_FILENAME (char_u *)TRUE, @@ -940,190 +945,190 @@ static struct vimoption options[] = (char_u *)0L} SCTX_INIT}, {"filetype", "ft", P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, (char_u *)&p_ft, PV_FT, - did_set_filetype_or_syntax, + did_set_filetype_or_syntax, NULL, {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"fillchars", "fcs", P_STRING|P_VI_DEF|P_RALL|P_ONECOMMA|P_NODUP, - (char_u *)&p_fcs, PV_FCS, did_set_chars_option, + (char_u *)&p_fcs, PV_FCS, did_set_chars_option, expand_set_chars_option, {(char_u *)"vert:|,fold:-,eob:~,lastline:@", (char_u *)0L} SCTX_INIT}, {"fixendofline", "fixeol", P_BOOL|P_VI_DEF|P_RSTAT, (char_u *)&p_fixeol, PV_FIXEOL, - did_set_eof_eol_fixeol_bomb, + did_set_eof_eol_fixeol_bomb, NULL, {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, {"fkmap", "fk", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"flash", "fl", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"foldclose", "fcl", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN, #ifdef FEAT_FOLDING - (char_u *)&p_fcl, PV_NONE, did_set_foldclose, + (char_u *)&p_fcl, PV_NONE, did_set_foldclose, expand_set_foldclose, {(char_u *)"", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldcolumn", "fdc", P_NUM|P_VI_DEF|P_RWIN, #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FDC, did_set_foldcolumn, + (char_u *)VAR_WIN, PV_FDC, did_set_foldcolumn, NULL, {(char_u *)FALSE, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldenable", "fen", P_BOOL|P_VI_DEF|P_RWIN, #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FEN, NULL, + (char_u *)VAR_WIN, PV_FEN, NULL, NULL, {(char_u *)TRUE, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldexpr", "fde", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN|P_MLE, #if defined(FEAT_FOLDING) && defined(FEAT_EVAL) - (char_u *)VAR_WIN, PV_FDE, did_set_foldexpr, + (char_u *)VAR_WIN, PV_FDE, did_set_foldexpr, NULL, {(char_u *)"0", (char_u *)NULL} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldignore", "fdi", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FDI, did_set_foldignore, + (char_u *)VAR_WIN, PV_FDI, did_set_foldignore, NULL, {(char_u *)"#", (char_u *)NULL} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldlevel", "fdl", P_NUM|P_VI_DEF|P_RWIN, #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FDL, did_set_foldlevel, + (char_u *)VAR_WIN, PV_FDL, did_set_foldlevel, NULL, {(char_u *)0L, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldlevelstart","fdls", P_NUM|P_VI_DEF|P_CURSWANT, #ifdef FEAT_FOLDING - (char_u *)&p_fdls, PV_NONE, NULL, + (char_u *)&p_fdls, PV_NONE, NULL, NULL, {(char_u *)-1L, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF| P_RWIN|P_ONECOMMA|P_NODUP, #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FMR, did_set_foldmarker, + (char_u *)VAR_WIN, PV_FMR, did_set_foldmarker, NULL, {(char_u *)"{{{,}}}", (char_u *)NULL} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldmethod", "fdm", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FDM, did_set_foldmethod, + (char_u *)VAR_WIN, PV_FDM, did_set_foldmethod, expand_set_foldmethod, {(char_u *)"manual", (char_u *)NULL} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldminlines","fml", P_NUM|P_VI_DEF|P_RWIN, #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FML, did_set_foldminlines, + (char_u *)VAR_WIN, PV_FML, did_set_foldminlines, NULL, {(char_u *)1L, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldnestmax", "fdn", P_NUM|P_VI_DEF|P_RWIN, #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FDN, did_set_foldnestmax, + (char_u *)VAR_WIN, PV_FDN, did_set_foldnestmax, NULL, {(char_u *)20L, (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldopen", "fdo", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_CURSWANT, #ifdef FEAT_FOLDING - (char_u *)&p_fdo, PV_NONE, did_set_foldopen, + (char_u *)&p_fdo, PV_NONE, did_set_foldopen, expand_set_foldopen, {(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo", (char_u *)0L} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"foldtext", "fdt", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN|P_MLE, #if defined(FEAT_FOLDING) && defined(FEAT_EVAL) - (char_u *)VAR_WIN, PV_FDT, did_set_optexpr, + (char_u *)VAR_WIN, PV_FDT, did_set_optexpr, NULL, {(char_u *)"foldtext()", (char_u *)NULL} #else - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)NULL, (char_u *)0L} #endif SCTX_INIT}, {"formatexpr", "fex", P_STRING|P_ALLOCED|P_V |