diff options
Diffstat (limited to 'data/vim/patches/8.1.0362')
| -rw-r--r-- | data/vim/patches/8.1.0362 | 6943 |
1 files changed, 0 insertions, 6943 deletions
diff --git a/data/vim/patches/8.1.0362 b/data/vim/patches/8.1.0362 deleted file mode 100644 index a662ea322..000000000 --- a/data/vim/patches/8.1.0362 +++ /dev/null @@ -1,6943 +0,0 @@ -To: vim_dev@googlegroups.com -Subject: Patch 8.1.0362 -Fcc: outbox -From: Bram Moolenaar <Bram@moolenaar.net> -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit ------------- - -Patch 8.1.0362 -Problem: Cannot get the script line number when executing a function. -Solution: Store the line number besides the script ID. (Ozaki Kiichi, - closes #3362) Also display the line number with ":verbose set". -Files: runtime/doc/cmdline.txt, runtime/doc/eval.txt, src/Make_all.mak, - src/buffer.c, src/eval.c, src/evalfunc.c, src/ex_cmds2.c, - src/ex_docmd.c, src/ex_getln.c, src/fileio.c, src/getchar.c, - src/globals.h, src/main.c, src/menu.c, src/option.c, - src/proto/eval.pro, src/structs.h, src/syntax.c, - src/testdir/test_alot.vim, src/testdir/test_expand_func.vim, - src/testdir/test_maparg.vim, src/term.c src/userfunc.c - - -*** ../vim-8.1.0361/runtime/doc/cmdline.txt 2018-05-17 13:40:51.000000000 +0200 ---- runtime/doc/cmdline.txt 2018-09-10 19:56:54.871550345 +0200 -*************** -*** 832,842 **** - \\# \# - Also see |`=|. - -! *:<cword>* *:<cWORD>* *:<cfile>* *<cfile>* -! *:<sfile>* *<sfile>* *:<afile>* *<afile>* -! *:<abuf>* *<abuf>* *:<amatch>* *<amatch>* -! *:<cexpr>* *<cexpr>* -! *<slnum>* *E495* *E496* *E497* *E499* *E500* - Note: these are typed literally, they are not special keys! - <cword> is replaced with the word under the cursor (like |star|) - <cWORD> is replaced with the WORD under the cursor (see |WORD|) ---- 832,843 ---- - \\# \# - Also see |`=|. - -! *:<cword>* *<cword>* *:<cWORD>* *<cWORD>* -! *:<cexpr>* *<cexpr>* *:<cfile>* *<cfile>* -! *:<afile>* *<afile>* *:<abuf>* *<abuf>* -! *:<amatch>* *<amatch>* -! *:<sfile>* *<sfile>* *:<slnum>* *<slnum>* -! *:<sflnum>* *<sflnum>* *E499* *E500* - Note: these are typed literally, they are not special keys! - <cword> is replaced with the word under the cursor (like |star|) - <cWORD> is replaced with the WORD under the cursor (see |WORD|) -*************** -*** 849,863 **** - |gf| uses) - <afile> When executing autocommands, is replaced with the file name - of the buffer being manipulated, or the file for a read or -! write. - <abuf> When executing autocommands, is replaced with the currently - effective buffer number (for ":r file" and ":so file" it is - the current buffer, the file being read/sourced is not in a -! buffer). - <amatch> When executing autocommands, is replaced with the match for -! which this autocommand was executed. It differs from -! <afile> only when the file name isn't used to match with -! (for FileType, Syntax and SpellFileMissing events). - <sfile> When executing a ":source" command, is replaced with the - file name of the sourced file. *E498* - When executing a function, is replaced with: ---- 850,865 ---- - |gf| uses) - <afile> When executing autocommands, is replaced with the file name - of the buffer being manipulated, or the file for a read or -! write. *E495* - <abuf> When executing autocommands, is replaced with the currently - effective buffer number (for ":r file" and ":so file" it is - the current buffer, the file being read/sourced is not in a -! buffer). *E496* - <amatch> When executing autocommands, is replaced with the match for -! which this autocommand was executed. *E497* -! It differs from <afile> only when the file name isn't used -! to match with (for FileType, Syntax and SpellFileMissing -! events). - <sfile> When executing a ":source" command, is replaced with the - file name of the sourced file. *E498* - When executing a function, is replaced with: -*************** -*** 867,875 **** - Note that filename-modifiers are useless when <sfile> is - used inside a function. - <slnum> When executing a ":source" command, is replaced with the -! line number. *E842* - When executing a function it's the line number relative to - the start of the function. - - *filename-modifiers* - *:_%:* *::8* *::p* *::.* *::~* *::h* *::t* *::r* *::e* *::s* *::gs* *::S* ---- 869,880 ---- - Note that filename-modifiers are useless when <sfile> is - used inside a function. - <slnum> When executing a ":source" command, is replaced with the -! line number. *E842* - When executing a function it's the line number relative to - the start of the function. -+ <sflnum> When executing a script, is replaced with the line number. -+ It differs from <slnum> in that <sflnum> is replaced with -+ the script line number in any situation. *E961* - - *filename-modifiers* - *:_%:* *::8* *::p* *::.* *::~* *::h* *::t* *::r* *::e* *::s* *::gs* *::S* -*** ../vim-8.1.0361/runtime/doc/eval.txt 2018-09-06 13:14:39.148722497 +0200 ---- runtime/doc/eval.txt 2018-09-10 20:28:19.359384588 +0200 -*************** -*** 3790,3796 **** - <abuf> autocmd buffer number (as a String!) - <amatch> autocmd matched name - <sfile> sourced script file or function name -! <slnum> sourced script file line number - <cword> word under the cursor - <cWORD> WORD under the cursor - <client> the {clientid} of the last received ---- 3798,3807 ---- - <abuf> autocmd buffer number (as a String!) - <amatch> autocmd matched name - <sfile> sourced script file or function name -! <slnum> sourced script line number or function -! line number -! <sflnum> script file line number, also when in -! a function - <cword> word under the cursor - <cWORD> WORD under the cursor - <client> the {clientid} of the last received -*************** -*** 5923,5928 **** ---- 5934,5940 ---- - (|mapmode-ic|) - "sid" The script local ID, used for <sid> mappings - (|<SID>|). -+ "lnum" The line number in "sid", zero if unknown. - "nowait" Do not wait for other, longer mappings. - (|:map-<nowait>|). - -*** ../vim-8.1.0361/src/Make_all.mak 2018-08-07 21:39:09.251060096 +0200 ---- src/Make_all.mak 2018-09-10 19:45:33.372367473 +0200 -*************** -*** 2,8 **** - # Common Makefile, defines the list of tests to run. - # - -! # Individual tests, including the ones part of test_alot - NEW_TESTS = \ - test_arglist \ - test_arabic \ ---- 2,9 ---- - # Common Makefile, defines the list of tests to run. - # - -! # Individual tests, including the ones part of test_alot. -! # Please keep sorted up to test_alot. - NEW_TESTS = \ - test_arglist \ - test_arabic \ -*************** -*** 52,57 **** ---- 53,59 ---- - test_exists_autocmd \ - test_expand \ - test_expand_dllpath \ -+ test_expand_func \ - test_expr \ - test_expr_utf8 \ - test_farsi \ -*** ../vim-8.1.0361/src/buffer.c 2018-09-01 15:29:58.754429402 +0200 ---- src/buffer.c 2018-09-10 20:10:25.338295605 +0200 -*************** -*** 5412,5418 **** - char_u *save_sourcing_name; - linenr_T save_sourcing_lnum; - #ifdef FEAT_EVAL -! scid_T save_SID; - #endif - - prev = -1; ---- 5412,5418 ---- - char_u *save_sourcing_name; - linenr_T save_sourcing_lnum; - #ifdef FEAT_EVAL -! sctx_T save_current_sctx; - #endif - - prev = -1; -*************** -*** 5497,5508 **** - if (*s != NUL) /* skip over an empty "::" */ - { - #ifdef FEAT_EVAL -! save_SID = current_SID; -! current_SID = SID_MODELINE; - #endif - retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags); - #ifdef FEAT_EVAL -! current_SID = save_SID; - #endif - if (retval == FAIL) /* stop if error found */ - break; ---- 5497,5509 ---- - if (*s != NUL) /* skip over an empty "::" */ - { - #ifdef FEAT_EVAL -! save_current_sctx = current_sctx; -! current_sctx.sc_sid = SID_MODELINE; -! current_sctx.sc_lnum = 0; - #endif - retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags); - #ifdef FEAT_EVAL -! current_sctx = save_current_sctx; - #endif - if (retval == FAIL) /* stop if error found */ - break; -*** ../vim-8.1.0361/src/eval.c 2018-08-01 19:05:59.278223228 +0200 ---- src/eval.c 2018-09-10 20:26:11.396692124 +0200 -*************** -*** 1495,1502 **** - static void - list_script_vars(int *first) - { -! if (current_SID > 0 && current_SID <= ga_scripts.ga_len) -! list_hashtable_vars(&SCRIPT_VARS(current_SID), - (char_u *)"s:", FALSE, first); - } - ---- 1495,1502 ---- - static void - list_script_vars(int *first) - { -! if (current_sctx.sc_sid > 0 && current_sctx.sc_sid <= ga_scripts.ga_len) -! list_hashtable_vars(&SCRIPT_VARS(current_sctx.sc_sid), - (char_u *)"s:", FALSE, first); - } - -*************** -*** 7202,7208 **** - /* Must be something like "s:", otherwise "ht" would be NULL. */ - switch (htname) - { -! case 's': return &SCRIPT_SV(current_SID)->sv_var; - case 'g': return &globvars_var; - case 'v': return &vimvars_var; - case 'b': return &curbuf->b_bufvar; ---- 7202,7208 ---- - /* Must be something like "s:", otherwise "ht" would be NULL. */ - switch (htname) - { -! case 's': return &SCRIPT_SV(current_sctx.sc_sid)->sv_var; - case 'g': return &globvars_var; - case 'v': return &vimvars_var; - case 'b': return &curbuf->b_bufvar; -*************** -*** 7286,7293 **** - if (*name == 'l') /* l: local function variable */ - return get_funccal_local_ht(); - if (*name == 's' /* script variable */ -! && current_SID > 0 && current_SID <= ga_scripts.ga_len) -! return &SCRIPT_VARS(current_SID); - return NULL; - } - ---- 7286,7293 ---- - if (*name == 'l') /* l: local function variable */ - return get_funccal_local_ht(); - if (*name == 's' /* script variable */ -! && current_sctx.sc_sid > 0 && current_sctx.sc_sid <= ga_scripts.ga_len) -! return &SCRIPT_VARS(current_sctx.sc_sid); - return NULL; - } - -*************** -*** 8729,8748 **** - * Should only be invoked when 'verbose' is non-zero. - */ - void -! last_set_msg(scid_T scriptID) - { - char_u *p; - -! if (scriptID != 0) - { -! p = home_replace_save(NULL, get_scriptname(scriptID)); - if (p != NULL) - { - verbose_enter(); - MSG_PUTS(_("\n\tLast set from ")); - MSG_PUTS(p); -! vim_free(p); - verbose_leave(); - } - } - } ---- 8729,8753 ---- - * Should only be invoked when 'verbose' is non-zero. - */ - void -! last_set_msg(sctx_T script_ctx) - { - char_u *p; - -! if (script_ctx.sc_sid != 0) - { -! p = home_replace_save(NULL, get_scriptname(script_ctx.sc_sid)); - if (p != NULL) - { - verbose_enter(); - MSG_PUTS(_("\n\tLast set from ")); - MSG_PUTS(p); -! if (script_ctx.sc_lnum > 0) -! { -! MSG_PUTS(_(" line ")); -! msg_outnum((long)script_ctx.sc_lnum); -! } - verbose_leave(); -+ vim_free(p); - } - } - } -*** ../vim-8.1.0361/src/evalfunc.c 2018-09-06 13:14:39.144722527 +0200 ---- src/evalfunc.c 2018-09-10 20:28:30.243272684 +0200 -*************** -*** 4061,4067 **** - * also be called from another script. Using trans_function_name() - * would also work, but some plugins depend on the name being - * printable text. */ -! sprintf(sid_buf, "<SNR>%ld_", (long)current_SID); - name = alloc((int)(STRLEN(sid_buf) + STRLEN(s + off) + 1)); - if (name != NULL) - { ---- 4061,4067 ---- - * also be called from another script. Using trans_function_name() - * would also work, but some plugins depend on the name being - * printable text. */ -! sprintf(sid_buf, "<SNR>%ld_", (long)current_sctx.sc_sid); - name = alloc((int)(STRLEN(sid_buf) + STRLEN(s + off) + 1)); - if (name != NULL) - { -*************** -*** 7618,7624 **** - dict_add_number(dict, "noremap", mp->m_noremap ? 1L : 0L); - dict_add_number(dict, "expr", mp->m_expr ? 1L : 0L); - dict_add_number(dict, "silent", mp->m_silent ? 1L : 0L); -! dict_add_number(dict, "sid", (long)mp->m_script_ID); - dict_add_number(dict, "buffer", (long)buffer_local); - dict_add_number(dict, "nowait", mp->m_nowait ? 1L : 0L); - dict_add_string(dict, "mode", mapmode); ---- 7618,7625 ---- - dict_add_number(dict, "noremap", mp->m_noremap ? 1L : 0L); - dict_add_number(dict, "expr", mp->m_expr ? 1L : 0L); - dict_add_number(dict, "silent", mp->m_silent ? 1L : 0L); -! dict_add_number(dict, "sid", (long)mp->m_script_ctx.sc_sid); -! dict_add_number(dict, "lnum", (long)mp->m_script_ctx.sc_lnum); - dict_add_number(dict, "buffer", (long)buffer_local); - dict_add_number(dict, "nowait", mp->m_nowait ? 1L : 0L); - dict_add_string(dict, "mode", mapmode); -*** ../vim-8.1.0361/src/ex_cmds2.c 2018-09-08 18:21:10.438503190 +0200 ---- src/ex_cmds2.c 2018-09-10 20:30:57.913745458 +0200 -*************** -*** 1866,1874 **** - { - scriptitem_T *si; - -! if (current_SID > 0 && current_SID <= script_items.ga_len) - { -! si = &SCRIPT_ITEM(current_SID); - if (si->sn_prof_on && si->sn_pr_nest++ == 0) - profile_start(&si->sn_pr_child); - } ---- 1866,1874 ---- - { - scriptitem_T *si; - -! if (current_sctx.sc_sid > 0 && current_sctx.sc_sid <= script_items.ga_len) - { -! si = &SCRIPT_ITEM(current_sctx.sc_sid); - if (si->sn_prof_on && si->sn_pr_nest++ == 0) - profile_start(&si->sn_pr_child); - } -*************** -*** 1883,1891 **** - { - scriptitem_T *si; - -! if (current_SID > 0 && current_SID <= script_items.ga_len) - { -! si = &SCRIPT_ITEM(current_SID); - if (si->sn_prof_on && --si->sn_pr_nest == 0) - { - profile_end(&si->sn_pr_child); ---- 1883,1891 ---- - { - scriptitem_T *si; - -! if (current_sctx.sc_sid > 0 && current_sctx.sc_sid <= script_items.ga_len) - { -! si = &SCRIPT_ITEM(current_sctx.sc_sid); - if (si->sn_prof_on && --si->sn_pr_nest == 0) - { - profile_end(&si->sn_pr_child); -*************** -*** 2003,2010 **** - int - prof_def_func(void) - { -! if (current_SID > 0) -! return SCRIPT_ITEM(current_SID).sn_pr_force; - return FALSE; - } - ---- 2003,2010 ---- - int - prof_def_func(void) - { -! if (current_sctx.sc_sid > 0) -! return SCRIPT_ITEM(current_sctx.sc_sid).sn_pr_force; - return FALSE; - } - -*************** -*** 4351,4357 **** - char_u *firstline = NULL; - int retval = FAIL; - #ifdef FEAT_EVAL -! scid_T save_current_SID; - static scid_T last_current_SID = 0; - void *save_funccalp; - int save_debug_break_level = debug_break_level; ---- 4351,4357 ---- - char_u *firstline = NULL; - int retval = FAIL; - #ifdef FEAT_EVAL -! sctx_T save_current_sctx; - static scid_T last_current_SID = 0; - void *save_funccalp; - int save_debug_break_level = debug_break_level; -*************** -*** 4521,4533 **** - * Check if this script was sourced before to finds its SID. - * If it's new, generate a new SID. - */ -! save_current_SID = current_SID; - # ifdef UNIX - stat_ok = (mch_stat((char *)fname_exp, &st) >= 0); - # endif -! for (current_SID = script_items.ga_len; current_SID > 0; --current_SID) - { -! si = &SCRIPT_ITEM(current_SID); - if (si->sn_name != NULL - && ( - # ifdef UNIX ---- 4521,4535 ---- - * Check if this script was sourced before to finds its SID. - * If it's new, generate a new SID. - */ -! save_current_sctx = current_sctx; -! current_sctx.sc_lnum = 0; - # ifdef UNIX - stat_ok = (mch_stat((char *)fname_exp, &st) >= 0); - # endif -! for (current_sctx.sc_sid = script_items.ga_len; current_sctx.sc_sid > 0; -! --current_sctx.sc_sid) - { -! si = &SCRIPT_ITEM(current_sctx.sc_sid); - if (si->sn_name != NULL - && ( - # ifdef UNIX -*************** -*** 4541,4553 **** - fnamecmp(si->sn_name, fname_exp) == 0)) - break; - } -! if (current_SID == 0) - { -! current_SID = ++last_current_SID; -! if (ga_grow(&script_items, (int)(current_SID - script_items.ga_len)) -! == FAIL) - goto almosttheend; -! while (script_items.ga_len < current_SID) - { - ++script_items.ga_len; - SCRIPT_ITEM(script_items.ga_len).sn_name = NULL; ---- 4543,4555 ---- - fnamecmp(si->sn_name, fname_exp) == 0)) - break; - } -! if (current_sctx.sc_sid == 0) - { -! current_sctx.sc_sid = ++last_current_SID; -! if (ga_grow(&script_items, -! (int)(current_sctx.sc_sid - script_items.ga_len)) == FAIL) - goto almosttheend; -! while (script_items.ga_len < current_sctx.sc_sid) - { - ++script_items.ga_len; - SCRIPT_ITEM(script_items.ga_len).sn_name = NULL; -*************** -*** 4555,4561 **** - SCRIPT_ITEM(script_items.ga_len).sn_prof_on = FALSE; - # endif - } -! si = &SCRIPT_ITEM(current_SID); - si->sn_name = fname_exp; - fname_exp = NULL; - # ifdef UNIX ---- 4557,4563 ---- - SCRIPT_ITEM(script_items.ga_len).sn_prof_on = FALSE; - # endif - } -! si = &SCRIPT_ITEM(current_sctx.sc_sid); - si->sn_name = fname_exp; - fname_exp = NULL; - # ifdef UNIX -*************** -*** 4570,4576 **** - # endif - - /* Allocate the local script variables to use for this script. */ -! new_script_vars(current_SID); - } - - # ifdef FEAT_PROFILE ---- 4572,4578 ---- - # endif - - /* Allocate the local script variables to use for this script. */ -! new_script_vars(current_sctx.sc_sid); - } - - # ifdef FEAT_PROFILE -*************** -*** 4626,4632 **** - if (do_profiling == PROF_YES) - { - /* Get "si" again, "script_items" may have been reallocated. */ -! si = &SCRIPT_ITEM(current_SID); - if (si->sn_prof_on) - { - profile_end(&si->sn_pr_start); ---- 4628,4634 ---- - if (do_profiling == PROF_YES) - { - /* Get "si" again, "script_items" may have been reallocated. */ -! si = &SCRIPT_ITEM(current_sctx.sc_sid); - if (si->sn_prof_on) - { - profile_end(&si->sn_pr_start); -*************** -*** 4671,4677 **** - - #ifdef FEAT_EVAL - almosttheend: -! current_SID = save_current_SID; - restore_funccal(save_funccalp); - # ifdef FEAT_PROFILE - if (do_profiling == PROF_YES) ---- 4673,4679 ---- - - #ifdef FEAT_EVAL - almosttheend: -! current_sctx = save_current_sctx; - restore_funccal(save_funccalp); - # ifdef FEAT_PROFILE - if (do_profiling == PROF_YES) -*************** -*** 5090,5098 **** - scriptitem_T *si; - sn_prl_T *pp; - -! if (current_SID <= 0 || current_SID > script_items.ga_len) - return; -! si = &SCRIPT_ITEM(current_SID); - if (si->sn_prof_on && sourcing_lnum >= 1) - { - /* Grow the array before starting the timer, so that the time spent ---- 5092,5100 ---- - scriptitem_T *si; - sn_prl_T *pp; - -! if (current_sctx.sc_sid <= 0 || current_sctx.sc_sid > script_items.ga_len) - return; -! si = &SCRIPT_ITEM(current_sctx.sc_sid); - if (si->sn_prof_on && sourcing_lnum >= 1) - { - /* Grow the array before starting the timer, so that the time spent -*************** -*** 5125,5133 **** - { - scriptitem_T *si; - -! if (current_SID <= 0 || current_SID > script_items.ga_len) - return; -! si = &SCRIPT_ITEM(current_SID); - if (si->sn_prof_on && si->sn_prl_idx >= 0) - si->sn_prl_execed = TRUE; - } ---- 5127,5135 ---- - { - scriptitem_T *si; - -! if (current_sctx.sc_sid <= 0 || current_sctx.sc_sid > script_items.ga_len) - return; -! si = &SCRIPT_ITEM(current_sctx.sc_sid); - if (si->sn_prof_on && si->sn_prl_idx >= 0) - si->sn_prl_execed = TRUE; - } -*************** -*** 5141,5149 **** - scriptitem_T *si; - sn_prl_T *pp; - -! if (current_SID <= 0 || current_SID > script_items.ga_len) - return; -! si = &SCRIPT_ITEM(current_SID); - if (si->sn_prof_on && si->sn_prl_idx >= 0 - && si->sn_prl_idx < si->sn_prl_ga.ga_len) - { ---- 5143,5151 ---- - scriptitem_T *si; - sn_prl_T *pp; - -! if (current_sctx.sc_sid <= 0 || current_sctx.sc_sid > script_items.ga_len) - return; -! si = &SCRIPT_ITEM(current_sctx.sc_sid); - if (si->sn_prof_on && si->sn_prl_idx >= 0 - && si->sn_prl_idx < si->sn_prl_ga.ga_len) - { -*** ../vim-8.1.0361/src/ex_docmd.c 2018-09-06 21:44:13.660006996 +0200 ---- src/ex_docmd.c 2018-09-10 20:10:41.366117167 +0200 -*************** -*** 29,35 **** - int uc_compl; /* completion type */ - int uc_addr_type; /* The command's address type */ - # ifdef FEAT_EVAL -! scid_T uc_scriptID; /* SID where the command was defined */ - # ifdef FEAT_CMDL_COMPL - char_u *uc_compl_arg; /* completion argument if any */ - # endif ---- 29,35 ---- - int uc_compl; /* completion type */ - int uc_addr_type; /* The command's address type */ - # ifdef FEAT_EVAL -! sctx_T uc_script_ctx; /* SCTX where the command was defined */ - # ifdef FEAT_CMDL_COMPL - char_u *uc_compl_arg; /* completion argument if any */ - # endif -*************** -*** 3340,3346 **** - if (xp != NULL) - { - xp->xp_arg = uc->uc_compl_arg; -! xp->xp_scriptID = uc->uc_scriptID; - } - # endif - # endif ---- 3340,3347 ---- - if (xp != NULL) - { - xp->xp_arg = uc->uc_compl_arg; -! xp->xp_script_ctx = uc->uc_script_ctx; -! xp->xp_script_ctx.sc_lnum += sourcing_lnum; - } - # endif - # endif -*************** -*** 5920,5926 **** - cmd->uc_def = def; - cmd->uc_compl = compl; - #ifdef FEAT_EVAL -! cmd->uc_scriptID = current_SID; - # ifdef FEAT_CMDL_COMPL - cmd->uc_compl_arg = compl_arg; - # endif ---- 5921,5928 ---- - cmd->uc_def = def; - cmd->uc_compl = compl; - #ifdef FEAT_EVAL -! cmd->uc_script_ctx = current_sctx; -! cmd->uc_script_ctx.sc_lnum += sourcing_lnum; - # ifdef FEAT_CMDL_COMPL - cmd->uc_compl_arg = compl_arg; - # endif -*************** -*** 6141,6147 **** - msg_outtrans_special(cmd->uc_rep, FALSE); - #ifdef FEAT_EVAL - if (p_verbose > 0) -! last_set_msg(cmd->uc_scriptID); - #endif - out_flush(); - ui_breakcheck(); ---- 6143,6149 ---- - msg_outtrans_special(cmd->uc_rep, FALSE); - #ifdef FEAT_EVAL - if (p_verbose > 0) -! last_set_msg(cmd->uc_script_ctx); - #endif - out_flush(); - ui_breakcheck(); -*************** -*** 6906,6912 **** - char_u *split_buf = NULL; - ucmd_T *cmd; - #ifdef FEAT_EVAL -! scid_T save_current_SID = current_SID; - #endif - - if (eap->cmdidx == CMD_USER) ---- 6908,6914 ---- - char_u *split_buf = NULL; - ucmd_T *cmd; - #ifdef FEAT_EVAL -! sctx_T save_current_sctx = current_sctx; - #endif - - if (eap->cmdidx == CMD_USER) -*************** -*** 7007,7018 **** - } - - #ifdef FEAT_EVAL -! current_SID = cmd->uc_scriptID; - #endif - (void)do_cmdline(buf, eap->getline, eap->cookie, - DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_KEYTYPED); - #ifdef FEAT_EVAL -! current_SID = save_current_SID; - #endif - vim_free(buf); - vim_free(split_buf); ---- 7009,7020 ---- - } - - #ifdef FEAT_EVAL -! current_sctx.sc_sid = cmd->uc_script_ctx.sc_sid; - #endif - (void)do_cmdline(buf, eap->getline, eap->cookie, - DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_KEYTYPED); - #ifdef FEAT_EVAL -! current_sctx = save_current_sctx; - #endif - vim_free(buf); - vim_free(split_buf); -*************** -*** 10736,10749 **** - "<slnum>", /* ":so" file line number */ - #define SPEC_SLNUM (SPEC_SFILE + 1) - "<afile>", /* autocommand file name */ -! #define SPEC_AFILE (SPEC_SLNUM + 1) - "<abuf>", /* autocommand buffer number */ -! #define SPEC_ABUF (SPEC_AFILE + 1) - "<amatch>", /* autocommand match name */ - #define SPEC_AMATCH (SPEC_ABUF + 1) - #ifdef FEAT_CLIENTSERVER - "<client>" -! # define SPEC_CLIENT (SPEC_AMATCH + 1) - #endif - }; - ---- 10738,10753 ---- - "<slnum>", /* ":so" file line number */ - #define SPEC_SLNUM (SPEC_SFILE + 1) - "<afile>", /* autocommand file name */ -! #define SPEC_AFILE (SPEC_SLNUM + 1) - "<abuf>", /* autocommand buffer number */ -! #define SPEC_ABUF (SPEC_AFILE + 1) - "<amatch>", /* autocommand match name */ - #define SPEC_AMATCH (SPEC_ABUF + 1) -+ "<sflnum>", /* script file line number */ -+ #define SPEC_SFLNUM (SPEC_AMATCH + 1) - #ifdef FEAT_CLIENTSERVER - "<client>" -! # define SPEC_CLIENT (SPEC_SFLNUM + 1) - #endif - }; - -*************** -*** 10999,11004 **** ---- 11003,11009 ---- - return NULL; - } - break; -+ - case SPEC_SLNUM: /* line in file for ":so" command */ - if (sourcing_name == NULL || sourcing_lnum == 0) - { -*************** -*** 11008,11020 **** - sprintf((char *)strbuf, "%ld", (long)sourcing_lnum); - result = strbuf; - break; -! #if defined(FEAT_CLIENTSERVER) - case SPEC_CLIENT: /* Source of last submitted input */ - sprintf((char *)strbuf, PRINTF_HEX_LONG_U, - (long_u)clientWindow); - result = strbuf; - break; - #endif - default: - result = (char_u *)""; /* avoid gcc warning */ - break; ---- 11013,11040 ---- - sprintf((char *)strbuf, "%ld", (long)sourcing_lnum); - result = strbuf; - break; -! -! #ifdef FEAT_EVAL -! case SPEC_SFLNUM: /* line in script file */ -! if (current_sctx.sc_lnum + sourcing_lnum == 0) -! { -! *errormsg = (char_u *)_("E961: no line number to use for \"<sflnum>\""); -! return NULL; -! } -! sprintf((char *)strbuf, "%ld", -! (long)(current_sctx.sc_lnum + sourcing_lnum)); -! result = strbuf; -! break; -! #endif -! -! #ifdef FEAT_CLIENTSERVER - case SPEC_CLIENT: /* Source of last submitted input */ - sprintf((char *)strbuf, PRINTF_HEX_LONG_U, - (long_u)clientWindow); - result = strbuf; - break; - #endif -+ - default: - result = (char_u *)""; /* avoid gcc warning */ - break; -*** ../vim-8.1.0361/src/ex_getln.c 2018-09-09 15:54:11.232857907 +0200 ---- src/ex_getln.c 2018-09-10 19:45:33.376367415 +0200 -*************** -*** 5591,5597 **** - { - int keep = 0; - typval_T args[4]; -! int save_current_SID = current_SID; - char_u *pat = NULL; - void *ret; - struct cmdline_info save_ccline; ---- 5591,5597 ---- - { - int keep = 0; - typval_T args[4]; -! sctx_T save_current_sctx = current_sctx; - char_u *pat = NULL; - void *ret; - struct cmdline_info save_ccline; -*************** -*** 5621,5632 **** - save_ccline = ccline; - ccline.cmdbuff = NULL; - ccline.cmdprompt = NULL; -! current_SID = xp->xp_scriptID; - - ret = user_expand_func(xp->xp_arg, 3, args); - - ccline = save_ccline; -! current_SID = save_current_SID; - if (ccline.cmdbuff != NULL) - ccline.cmdbuff[ccline.cmdlen] = keep; - ---- 5621,5632 ---- - save_ccline = ccline; - ccline.cmdbuff = NULL; - ccline.cmdprompt = NULL; -! current_sctx = xp->xp_script_ctx; - - ret = user_expand_func(xp->xp_arg, 3, args); - - ccline = save_ccline; -! current_sctx = save_current_sctx; - if (ccline.cmdbuff != NULL) - ccline.cmdbuff[ccline.cmdlen] = keep; - -*** ../vim-8.1.0361/src/fileio.c 2018-08-21 15:12:10.839801647 +0200 ---- src/fileio.c 2018-09-10 19:45:33.376367415 +0200 -*************** -*** 7700,7706 **** - char nested; /* If autocommands nest here */ - char last; /* last command in list */ - #ifdef FEAT_EVAL -! scid_T scriptID; /* script ID where defined */ - #endif - struct AutoCmd *next; /* Next AutoCmd in list */ - } AutoCmd; ---- 7700,7706 ---- - char nested; /* If autocommands nest here */ - char last; /* last command in list */ - #ifdef FEAT_EVAL -! sctx_T script_ctx; /* script context where defined */ - #endif - struct AutoCmd *next; /* Next AutoCmd in list */ - } AutoCmd; -*************** -*** 7962,7968 **** - msg_outtrans(ac->cmd); - #ifdef FEAT_EVAL - if (p_verbose > 0) -! last_set_msg(ac->scriptID); - #endif - if (got_int) - return; ---- 7962,7968 ---- - msg_outtrans(ac->cmd); - #ifdef FEAT_EVAL - if (p_verbose > 0) -! last_set_msg(ac->script_ctx); - #endif - if (got_int) - return; -*************** -*** 8845,8851 **** - return FAIL; - ac->cmd = vim_strsave(cmd); - #ifdef FEAT_EVAL -! ac->scriptID = current_SID; - #endif - if (ac->cmd == NULL) - { ---- 8845,8852 ---- - return FAIL; - ac->cmd = vim_strsave(cmd); - #ifdef FEAT_EVAL -! ac->script_ctx = current_sctx; -! ac->script_ctx.sc_lnum += sourcing_lnum; - #endif - if (ac->cmd == NULL) - { -*************** -*** 9412,9418 **** - AutoPatCmd patcmd; - AutoPat *ap; - #ifdef FEAT_EVAL -! scid_T save_current_SID; - void *save_funccalp; - char_u *save_cmdarg; - long save_cmdbang; ---- 9413,9419 ---- - AutoPatCmd patcmd; - AutoPat *ap; - #ifdef FEAT_EVAL -! sctx_T save_current_sctx; - void *save_funccalp; - char_u *save_cmdarg; - long save_cmdbang; -*************** -*** 9621,9627 **** - sourcing_lnum = 0; /* no line number here */ - - #ifdef FEAT_EVAL -! save_current_SID = current_SID; - - # ifdef FEAT_PROFILE - if (do_profiling == PROF_YES) ---- 9622,9628 ---- - sourcing_lnum = 0; /* no line number here */ - - #ifdef FEAT_EVAL -! save_current_sctx = current_sctx; - - # ifdef FEAT_PROFILE - if (do_profiling == PROF_YES) -*************** -*** 9725,9731 **** - autocmd_bufnr = save_autocmd_bufnr; - autocmd_match = save_autocmd_match; - #ifdef FEAT_EVAL -! current_SID = save_current_SID; - restore_funccal(save_funccalp); - # ifdef FEAT_PROFILE - if (do_profiling == PROF_YES) ---- 9726,9732 ---- - autocmd_bufnr = save_autocmd_bufnr; - autocmd_match = save_autocmd_match; - #ifdef FEAT_EVAL -! current_sctx = save_current_sctx; - restore_funccal(save_funccalp); - # ifdef FEAT_PROFILE - if (do_profiling == PROF_YES) -*************** -*** 9949,9955 **** - retval = vim_strsave(ac->cmd); - autocmd_nested = ac->nested; - #ifdef FEAT_EVAL -! current_SID = ac->scriptID; - #endif - if (ac->last) - acp->nextcmd = NULL; ---- 9950,9956 ---- - retval = vim_strsave(ac->cmd); - autocmd_nested = ac->nested; - #ifdef FEAT_EVAL -! current_sctx = ac->script_ctx; - #endif - if (ac->last) - acp->nextcmd = NULL; -*** ../vim-8.1.0361/src/getchar.c 2018-07-27 23:16:40.922781670 +0200 ---- src/getchar.c 2018-09-10 19:45:33.376367415 +0200 -*************** -*** 3677,3683 **** - mp->m_mode = mode; - #ifdef FEAT_EVAL - mp->m_expr = expr; -! mp->m_script_ID = current_SID; - #endif - did_it = TRUE; - } ---- 3677,3684 ---- - mp->m_mode = mode; - #ifdef FEAT_EVAL - mp->m_expr = expr; -! mp->m_script_ctx = current_sctx; -! mp->m_script_ctx.sc_lnum += sourcing_lnum; - #endif - did_it = TRUE; - } -*************** -*** 3783,3789 **** - mp->m_mode = mode; - #ifdef FEAT_EVAL - mp->m_expr = expr; -! mp->m_script_ID = current_SID; - #endif - - /* add the new entry in front of the abbrlist or maphash[] list */ ---- 3784,3791 ---- - mp->m_mode = mode; - #ifdef FEAT_EVAL - mp->m_expr = expr; -! mp->m_script_ctx = current_sctx; -! mp->m_script_ctx.sc_lnum += sourcing_lnum; - #endif - - /* add the new entry in front of the abbrlist or maphash[] list */ -*************** -*** 4097,4103 **** - } - #ifdef FEAT_EVAL - if (p_verbose > 0) -! last_set_msg(mp->m_script_ID); - #endif - out_flush(); /* show one line at a time */ - } ---- 4099,4105 ---- - } - #ifdef FEAT_EVAL - if (p_verbose > 0) -! last_set_msg(mp->m_script_ctx); - #endif - out_flush(); /* show one line at a time */ - } -*** ../vim-8.1.0361/src/globals.h 2018-09-06 13:14:39.144722527 +0200 ---- src/globals.h 2018-09-10 20:12:24.344972850 +0200 -*************** -*** 325,332 **** - EXTERN int want_garbage_collect INIT(= FALSE); - EXTERN int garbage_collect_at_exit INIT(= FALSE); - -! /* ID of script being sourced or was sourced to define the current function. */ -! EXTERN scid_T current_SID INIT(= 0); - #endif - - EXTERN int did_source_packages INIT(= FALSE); ---- 325,332 ---- - EXTERN int want_garbage_collect INIT(= FALSE); - EXTERN int garbage_collect_at_exit INIT(= FALSE); - -! // Script CTX being sourced or was sourced to define the current function. -! EXTERN sctx_T current_sctx INIT(= {0 COMMA 0}); - #endif - - EXTERN int did_source_packages INIT(= FALSE); -*** ../vim-8.1.0361/src/main.c 2018-08-07 22:42:48.965416564 +0200 ---- src/main.c 2018-09-10 20:10:46.434060766 +0200 -*************** -*** 2912,2924 **** - curwin->w_cursor.lnum = 0; /* just in case.. */ - sourcing_name = (char_u *)_("pre-vimrc command line"); - # ifdef FEAT_EVAL -! current_SID = SID_CMDARG; - # endif - for (i = 0; i < cnt; ++i) - do_cmdline_cmd(cmds[i]); - sourcing_name = NULL; - # ifdef FEAT_EVAL -! current_SID = 0; - # endif - TIME_MSG("--cmd commands"); - } ---- 2912,2924 ---- - curwin->w_cursor.lnum = 0; /* just in case.. */ - sourcing_name = (char_u *)_("pre-vimrc command line"); - # ifdef FEAT_EVAL -! current_sctx.sc_sid = SID_CMDARG; - # endif - for (i = 0; i < cnt; ++i) - do_cmdline_cmd(cmds[i]); - sourcing_name = NULL; - # ifdef FEAT_EVAL -! current_sctx.sc_sid = 0; - # endif - TIME_MSG("--cmd commands"); - } -*************** -*** 2942,2948 **** - curwin->w_cursor.lnum = 0; - sourcing_name = (char_u *)"command line"; - #ifdef FEAT_EVAL -! current_SID = SID_CARG; - #endif - for (i = 0; i < parmp->n_commands; ++i) - { ---- 2942,2948 ---- - curwin->w_cursor.lnum = 0; - sourcing_name = (char_u *)"command line"; - #ifdef FEAT_EVAL -! current_sctx.sc_sid = SID_CARG; - #endif - for (i = 0; i < parmp->n_commands; ++i) - { -*************** -*** 2952,2958 **** - } - sourcing_name = NULL; - #ifdef FEAT_EVAL -! current_SID = 0; - #endif - if (curwin->w_cursor.lnum == 0) - curwin->w_cursor.lnum = 1; ---- 2952,2958 ---- - } - sourcing_name = NULL; - #ifdef FEAT_EVAL -! current_sctx.sc_sid = 0; - #endif - if (curwin->w_cursor.lnum == 0) - curwin->w_cursor.lnum = 1; -*************** -*** 3159,3165 **** - char_u *save_sourcing_name; - linenr_T save_sourcing_lnum; - #ifdef FEAT_EVAL -! scid_T save_sid; - #endif - - if ((initstr = mch_getenv(env)) != NULL && *initstr != NUL) ---- 3159,3165 ---- - char_u *save_sourcing_name; - linenr_T save_sourcing_lnum; - #ifdef FEAT_EVAL -! sctx_T save_current_sctx; - #endif - - if ((initstr = mch_getenv(env)) != NULL && *initstr != NUL) -*************** -*** 3171,3184 **** - sourcing_name = env; - sourcing_lnum = 0; - #ifdef FEAT_EVAL -! save_sid = current_SID; -! current_SID = SID_ENV; - #endif - do_cmdline_cmd(initstr); - sourcing_name = save_sourcing_name; - sourcing_lnum = save_sourcing_lnum; - #ifdef FEAT_EVAL -! current_SID = save_sid; - #endif - return OK; - } ---- 3171,3185 ---- - sourcing_name = env; - sourcing_lnum = 0; - #ifdef FEAT_EVAL -! save_current_sctx = current_sctx; -! current_sctx.sc_sid = SID_ENV; -! current_sctx.sc_lnum = 0; - #endif - do_cmdline_cmd(initstr); - sourcing_name = save_sourcing_name; - sourcing_lnum = save_sourcing_lnum; - #ifdef FEAT_EVAL -! current_sctx = save_current_sctx; - #endif - return OK; - } -*** ../vim-8.1.0361/src/menu.c 2018-03-05 21:31:09.000000000 +0100 ---- src/menu.c 2018-09-10 20:07:50.024030312 +0200 -*************** -*** 2259,2265 **** - /* Use the Insert mode entry when returning to Insert mode. */ - if (restart_edit - #ifdef FEAT_EVAL -! && !current_SID - #endif - ) - { ---- 2259,2265 ---- - /* Use the Insert mode entry when returning to Insert mode. */ - if (restart_edit - #ifdef FEAT_EVAL -! && !current_sctx.sc_sid - #endif - ) - { -*************** -*** 2333,2339 **** - * Otherwise put them in the typeahead buffer. */ - if (eap == NULL - #ifdef FEAT_EVAL -! || current_SID != 0 - #endif - ) - { ---- 2333,2339 ---- - * Otherwise put them in the typeahead buffer. */ - if (eap == NULL - #ifdef FEAT_EVAL -! || current_sctx.sc_sid != 0 - #endif - ) - { -*** ../vim-8.1.0361/src/option.c 2018-08-07 22:30:26.662240885 +0200 ---- src/option.c 2018-09-10 20:43:49.293609932 +0200 -*************** -*** 404,423 **** - - struct vimoption - { -! char *fullname; /* full option name */ -! char *shortname; /* permissible abbreviation */ -! long_u flags; /* see below */ -! char_u *var; /* global option: pointer to variable; -! * window-local option: VAR_WIN; -! * buffer-local option: global value */ -! idopt_T indir; /* global option: PV_NONE; -! * local option: indirect option index */ -! char_u *def_val[2]; /* default values for variable (vi and vim) */ - #ifdef FEAT_EVAL -! scid_T scriptID; /* script in which the option was last set */ -! # define SCRIPTID_INIT , 0 - #else -! # define SCRIPTID_INIT - #endif - }; - ---- 404,423 ---- - - struct vimoption - { -! char *fullname; // full option name -! char *shortname; // permissible abbreviation -! long_u flags; // see below -! char_u *var; // global option: pointer to variable; -! // window-local option: VAR_WIN; -! // buffer-local option: global value -! idopt_T indir; // global option: PV_NONE; -! // local option: indirect option index -! 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 -! # define SCTX_INIT , {0, 0} - #else -! # define SCTX_INIT - #endif - }; - -*************** -*** 515,521 **** - #else - (char_u *)224L, - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"antialias", "anti", P_BOOL|P_VI_DEF|P_VIM|P_RCLR, - #if defined(FEAT_GUI_MAC) - (char_u *)&p_antialias, PV_NONE, ---- 515,521 ---- - #else - (char_u *)224L, - #endif -! (char_u *)0L} SCTX_INIT}, - {"antialias", "anti", P_BOOL|P_VI_DEF|P_VIM|P_RCLR, - #if defined(FEAT_GUI_MAC) - (char_u *)&p_antialias, PV_NONE, -*************** -*** 524,558 **** - (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)FALSE} - #endif -! SCRIPTID_INIT}, - {"arabic", "arab", P_BOOL|P_VI_DEF|P_VIM|P_CURSWANT, - #ifdef FEAT_ARABIC - (char_u *)VAR_WIN, PV_ARAB, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"arabicshape", "arshape", P_BOOL|P_VI_DEF|P_VIM|P_RCLR, - #ifdef FEAT_ARABIC - (char_u *)&p_arshape, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"allowrevins", "ari", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_RIGHTLEFT - (char_u *)&p_ari, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"altkeymap", "akm", P_BOOL|P_VI_DEF, - #ifdef FEAT_FKMAP - (char_u *)&p_altkeymap, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"ambiwidth", "ambw", P_STRING|P_VI_DEF|P_RCLR, - #if defined(FEAT_MBYTE) - (char_u *)&p_ambw, PV_NONE, ---- 524,558 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)FALSE} - #endif -! SCTX_INIT}, - {"arabic", "arab", P_BOOL|P_VI_DEF|P_VIM|P_CURSWANT, - #ifdef FEAT_ARABIC - (char_u *)VAR_WIN, PV_ARAB, - #else - (char_u *)NULL, PV_NONE, - #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, - #else - (char_u *)NULL, PV_NONE, - #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, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"altkeymap", "akm", P_BOOL|P_VI_DEF, - #ifdef FEAT_FKMAP - (char_u *)&p_altkeymap, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"ambiwidth", "ambw", P_STRING|P_VI_DEF|P_RCLR, - #if defined(FEAT_MBYTE) - (char_u *)&p_ambw, PV_NONE, -*************** -*** 561,567 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"autochdir", "acd", P_BOOL|P_VI_DEF, - #ifdef FEAT_AUTOCHDIR - (char_u *)&p_acd, PV_NONE, ---- 561,567 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"autochdir", "acd", P_BOOL|P_VI_DEF, - #ifdef FEAT_AUTOCHDIR - (char_u *)&p_acd, PV_NONE, -*************** -*** 570,591 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"autoindent", "ai", P_BOOL|P_VI_DEF, - (char_u *)&p_ai, PV_AI, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"autoprint", "ap", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"autoread", "ar", P_BOOL|P_VI_DEF, - (char_u *)&p_ar, PV_AR, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"autowrite", "aw", P_BOOL|P_VI_DEF, - (char_u *)&p_aw, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"autowriteall","awa", P_BOOL|P_VI_DEF, - (char_u *)&p_awa, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"background", "bg", P_STRING|P_VI_DEF|P_RCLR, - (char_u *)&p_bg, PV_NONE, - { ---- 570,591 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"autoindent", "ai", P_BOOL|P_VI_DEF, - (char_u *)&p_ai, PV_AI, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"autoprint", "ap", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"autoread", "ar", P_BOOL|P_VI_DEF, - (char_u *)&p_ar, PV_AR, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"autowrite", "aw", P_BOOL|P_VI_DEF, - (char_u *)&p_aw, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"autowriteall","awa", P_BOOL|P_VI_DEF, - (char_u *)&p_awa, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"background", "bg", P_STRING|P_VI_DEF|P_RCLR, - (char_u *)&p_bg, PV_NONE, - { -*************** -*** 594,606 **** - #else - (char_u *)"light", - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"backspace", "bs", P_STRING|P_VI_DEF|P_VIM|P_ONECOMMA|P_NODUP, - (char_u *)&p_bs, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"backup", "bk", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_bk, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"backupcopy", "bkc", P_STRING|P_VIM|P_ONECOMMA|P_NODUP, - (char_u *)&p_bkc, PV_BKC, - #ifdef UNIX ---- 594,606 ---- - #else - (char_u *)"light", - #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, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"backup", "bk", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_bk, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"backupcopy", "bkc", P_STRING|P_VIM|P_ONECOMMA|P_NODUP, - (char_u *)&p_bkc, PV_BKC, - #ifdef UNIX -*************** -*** 608,618 **** - #else - {(char_u *)"auto", (char_u *)"auto"} - #endif -! SCRIPTID_INIT}, - {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA - |P_NODUP|P_SECURE, - (char_u *)&p_bdir, PV_NONE, -! {(char_u *)DFLT_BDIR, (char_u *)0L} SCRIPTID_INIT}, - {"backupext", "bex", P_STRING|P_VI_DEF|P_NFNAME, - (char_u *)&p_bex, PV_NONE, - { ---- 608,618 ---- - #else - {(char_u *)"auto", (char_u *)"auto"} - #endif -! SCTX_INIT}, - {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA - |P_NODUP|P_SECURE, - (char_u *)&p_bdir, PV_NONE, -! {(char_u *)DFLT_BDIR, (char_u *)0L} SCTX_INIT}, - {"backupext", "bex", P_STRING|P_VI_DEF|P_NFNAME, - (char_u *)&p_bex, PV_NONE, - { -*************** -*** 621,627 **** - #else - (char_u *)"~", - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"backupskip", "bsk", P_STRING|P_VI_DEF|P_ONECOMMA, - #ifdef FEAT_WILDIGN - (char_u *)&p_bsk, PV_NONE, ---- 621,627 ---- - #else - (char_u *)"~", - #endif -! (char_u *)0L} SCTX_INIT}, - {"backupskip", "bsk", P_STRING|P_VI_DEF|P_ONECOMMA, - #ifdef FEAT_WILDIGN - (char_u *)&p_bsk, PV_NONE, -*************** -*** 630,636 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"balloondelay","bdlay",P_NUM|P_VI_DEF, - #ifdef FEAT_BEVAL - (char_u *)&p_bdlay, PV_NONE, ---- 630,636 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"balloondelay","bdlay",P_NUM|P_VI_DEF, - #ifdef FEAT_BEVAL - (char_u *)&p_bdlay, PV_NONE, -*************** -*** 639,645 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"ballooneval", "beval",P_BOOL|P_VI_DEF|P_NO_MKRC, - #ifdef FEAT_BEVAL_GUI - (char_u *)&p_beval, PV_NONE, ---- 639,645 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 648,654 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"balloonevalterm", "bevalterm",P_BOOL|P_VI_DEF|P_NO_MKRC, - #ifdef FEAT_BEVAL_TERM - (char_u *)&p_bevalterm, PV_NONE, ---- 648,654 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 657,663 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, - #if defined(FEAT_BEVAL) && defined(FEAT_EVAL) - (char_u *)&p_bexpr, PV_BEXPR, ---- 657,663 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, - #if defined(FEAT_BEVAL) && defined(FEAT_EVAL) - (char_u *)&p_bexpr, PV_BEXPR, -*************** -*** 666,691 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"beautify", "bf", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"belloff", "bo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_bo, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"binary", "bin", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)&p_bin, PV_BIN, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"bioskey", "biosk",P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"bomb", NULL, P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, - #ifdef FEAT_MBYTE - (char_u *)&p_bomb, PV_BOMB, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"breakat", "brk", P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST, - #ifdef FEAT_LINEBREAK - (char_u *)&p_breakat, PV_NONE, ---- 666,691 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"beautify", "bf", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(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, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"binary", "bin", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)&p_bin, PV_BIN, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"bioskey", "biosk",P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"bomb", NULL, P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, - #ifdef FEAT_MBYTE - (char_u *)&p_bomb, PV_BOMB, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(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, -*************** -*** 694,700 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"breakindent", "bri", P_BOOL|P_VI_DEF|P_VIM|P_RWIN, - #ifdef FEAT_LINEBREAK - (char_u *)VAR_WIN, PV_BRI, ---- 694,700 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 703,709 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"breakindentopt", "briopt", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF - |P_ONECOMMA|P_NODUP, - #ifdef FEAT_LINEBREAK ---- 703,709 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"breakindentopt", "briopt", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF - |P_ONECOMMA|P_NODUP, - #ifdef FEAT_LINEBREAK -*************** -*** 713,719 **** - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)NULL} - #endif -! SCRIPTID_INIT}, - {"browsedir", "bsdir",P_STRING|P_VI_DEF, - #ifdef FEAT_BROWSE - (char_u *)&p_bsdir, PV_NONE, ---- 713,719 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)NULL} - #endif -! SCTX_INIT}, - {"browsedir", "bsdir",P_STRING|P_VI_DEF, - #ifdef FEAT_BROWSE - (char_u *)&p_bsdir, PV_NONE, -*************** -*** 722,740 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"bufhidden", "bh", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, - (char_u *)&p_bh, PV_BH, - {(char_u *)"", (char_u *)0L} -! SCRIPTID_INIT}, - {"buflisted", "bl", P_BOOL|P_VI_DEF|P_NOGLOB, - (char_u *)&p_bl, PV_BL, - {(char_u *)1L, (char_u *)0L} -! SCRIPTID_INIT}, - {"buftype", "bt", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, - (char_u *)&p_bt, PV_BT, - {(char_u *)"", (char_u *)0L} -! SCRIPTID_INIT}, - {"casemap", "cmp", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_MBYTE - (char_u *)&p_cmp, PV_NONE, ---- 722,740 ---- - (char_u *)NULL, PV_NONE, - {(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, - {(char_u *)"", (char_u *)0L} -! SCTX_INIT}, - {"buflisted", "bl", P_BOOL|P_VI_DEF|P_NOGLOB, - (char_u *)&p_bl, PV_BL, - {(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, - {(char_u *)"", (char_u *)0L} -! SCTX_INIT}, - {"casemap", "cmp", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_MBYTE - (char_u *)&p_cmp, PV_NONE, -*************** -*** 743,749 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"cdpath", "cd", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_SEARCHPATH - (char_u *)&p_cdpath, PV_NONE, ---- 743,749 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"cdpath", "cd", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_SEARCHPATH - (char_u *)&p_cdpath, PV_NONE, -*************** -*** 752,758 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"cedit", NULL, P_STRING, - #ifdef FEAT_CMDWIN - (char_u *)&p_cedit, PV_NONE, ---- 752,758 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"cedit", NULL, P_STRING, - #ifdef FEAT_CMDWIN - (char_u *)&p_cedit, PV_NONE, -*************** -*** 761,767 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"charconvert", "ccv", P_STRING|P_VI_DEF|P_SECURE, - #if defined(FEAT_MBYTE) && defined(FEAT_EVAL) - (char_u *)&p_ccv, PV_NONE, ---- 761,767 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"charconvert", "ccv", P_STRING|P_VI_DEF|P_SECURE, - #if defined(FEAT_MBYTE) && defined(FEAT_EVAL) - (char_u *)&p_ccv, PV_NONE, -*************** -*** 770,783 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"cindent", "cin", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_CINDENT - (char_u *)&p_cin, PV_CIN, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_CINDENT - (char_u *)&p_cink, PV_CINK, ---- 770,783 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"cindent", "cin", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_CINDENT - (char_u *)&p_cin, PV_CIN, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_CINDENT - (char_u *)&p_cink, PV_CINK, -*************** -*** 786,799 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_CINDENT - (char_u *)&p_cino, PV_CINO, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) - (char_u *)&p_cinw, PV_CINW, ---- 786,799 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_CINDENT - (char_u *)&p_cino, PV_CINO, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) - (char_u *)&p_cinw, PV_CINW, -*************** -*** 803,809 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"clipboard", "cb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_CLIPBOARD - (char_u *)&p_cb, PV_NONE, ---- 803,809 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"clipboard", "cb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_CLIPBOARD - (char_u *)&p_cb, PV_NONE, -*************** -*** 817,843 **** - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"cmdheight", "ch", P_NUM|P_VI_DEF|P_RALL, - (char_u *)&p_ch, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"cmdwinheight", "cwh", P_NUM|P_VI_DEF, - #ifdef FEAT_CMDWIN - (char_u *)&p_cwh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)7L, (char_u *)0L} SCRIPTID_INIT}, - {"colorcolumn", "cc", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN, - #ifdef FEAT_SYN_HL - (char_u *)VAR_WIN, PV_CC, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, - (char_u *)&Columns, PV_NONE, -! {(char_u *)80L, (char_u *)0L} SCRIPTID_INIT}, - {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA - |P_NODUP|P_CURSWANT, - #ifdef FEAT_COMMENTS ---- 817,843 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCTX_INIT}, - {"cmdheight", "ch", P_NUM|P_VI_DEF|P_RALL, - (char_u *)&p_ch, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCTX_INIT}, - {"cmdwinheight", "cwh", P_NUM|P_VI_DEF, - #ifdef FEAT_CMDWIN - (char_u *)&p_cwh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(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, - #else - (char_u *)NULL, PV_NONE, - #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, -! {(char_u *)80L, (char_u *)0L} SCTX_INIT}, - {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA - |P_NODUP|P_CURSWANT, - #ifdef FEAT_COMMENTS -*************** -*** 848,854 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF|P_CURSWANT, - #ifdef FEAT_FOLDING - (char_u *)&p_cms, PV_CMS, ---- 848,854 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF|P_CURSWANT, - #ifdef FEAT_FOLDING - (char_u *)&p_cms, PV_CMS, -*************** -*** 857,868 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_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, -! {(char_u *)TRUE, (char_u *)FALSE} SCRIPTID_INIT}, - {"complete", "cpt", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_cpt, PV_CPT, ---- 857,868 ---- - (char_u *)NULL, PV_NONE, - {(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, -! {(char_u *)TRUE, (char_u *)FALSE} SCTX_INIT}, - {"complete", "cpt", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_cpt, PV_CPT, -*************** -*** 871,877 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"concealcursor","cocu", P_STRING|P_ALLOCED|P_RWIN|P_VI_DEF, - #ifdef FEAT_CONCEAL - (char_u *)VAR_WIN, PV_COCU, ---- 871,877 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"concealcursor","cocu", P_STRING|P_ALLOCED|P_RWIN|P_VI_DEF, - #ifdef FEAT_CONCEAL - (char_u *)VAR_WIN, PV_COCU, -*************** -*** 880,886 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"conceallevel","cole", P_NUM|P_RWIN|P_VI_DEF, - #ifdef FEAT_CONCEAL - (char_u *)VAR_WIN, PV_COLE, ---- 880,886 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 888,894 **** - (char_u *)NULL, PV_NONE, - #endif - {(char_u *)0L, (char_u *)0L} -! SCRIPTID_INIT}, - {"completefunc", "cfu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE, - #ifdef FEAT_COMPL_FUNC - (char_u *)&p_cfu, PV_CFU, ---- 888,894 ---- - (char_u *)NULL, PV_NONE, - #endif - {(char_u *)0L, (char_u *)0L} -! SCTX_INIT}, - {"completefunc", "cfu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE, - #ifdef FEAT_COMPL_FUNC - (char_u *)&p_cfu, PV_CFU, -*************** -*** 897,903 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"completeopt", "cot", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_cot, PV_NONE, ---- 897,903 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"completeopt", "cot", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_cot, PV_NONE, -*************** -*** 906,929 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"confirm", "cf", P_BOOL|P_VI_DEF, - #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) - (char_u *)&p_confirm, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"conskey", "consk",P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"copyindent", "ci", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_ci, PV_CI, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"cpoptions", "cpo", P_STRING|P_VIM|P_RALL|P_FLAGLIST, - (char_u *)&p_cpo, PV_NONE, - {(char_u *)CPO_VI, (char_u *)CPO_VIM} -! SCRIPTID_INIT}, - {"cryptmethod", "cm", P_STRING|P_ALLOCED|P_VI_DEF, - #ifdef FEAT_CRYPT - (char_u *)&p_cm, PV_CM, ---- 906,929 ---- - (char_u *)NULL, PV_NONE, - {(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, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"conskey", "consk",P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"copyindent", "ci", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_ci, PV_CI, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"cpoptions", "cpo", P_STRING|P_VIM|P_RALL|P_FLAGLIST, - (char_u *)&p_cpo, PV_NONE, - {(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, -*************** -*** 932,945 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"cscopepathcomp", "cspc", P_NUM|P_VI_DEF|P_VIM, - #ifdef FEAT_CSCOPE - (char_u *)&p_cspc, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"cscopeprg", "csprg", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_CSCOPE - (char_u *)&p_csprg, PV_NONE, ---- 932,945 ---- - (char_u *)NULL, PV_NONE, - {(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, - #else - (char_u *)NULL, PV_NONE, - #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, -*************** -*** 948,954 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_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, ---- 948,954 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 957,1011 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"cscoperelative", "csre", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_CSCOPE - (char_u *)&p_csre, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"cscopetag", "cst", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_CSCOPE - (char_u *)&p_cst, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"cscopetagorder", "csto", P_NUM|P_VI_DEF|P_VIM, - #ifdef FEAT_CSCOPE - (char_u *)&p_csto, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"cscopeverbose", "csverb", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_CSCOPE - (char_u *)&p_csverbose, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"cursorbind", "crb", P_BOOL|P_VI_DEF, - (char_u *)VAR_WIN, PV_CRBIND, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_SYN_HL - (char_u *)VAR_WIN, PV_CUC, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"cursorline", "cul", P_BOOL|P_VI_DEF|P_RWINONLY, - #ifdef FEAT_SYN_HL - (char_u *)VAR_WIN, PV_CUL, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"debug", NULL, P_STRING|P_VI_DEF, - (char_u *)&p_debug, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"define", "def", P_STRING|P_ALLOCED|P_VI_DEF|P_CURSWANT, - #ifdef FEAT_FIND_ID - (char_u *)&p_def, PV_DEF, ---- 957,1011 ---- - (char_u *)NULL, PV_NONE, - {(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, - #else - (char_u *)NULL, PV_NONE, - #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, - #else - (char_u *)NULL, PV_NONE, - #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, - #else - (char_u *)NULL, PV_NONE, - #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, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"cursorbind", "crb", P_BOOL|P_VI_DEF, - (char_u *)VAR_WIN, PV_CRBIND, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_SYN_HL - (char_u *)VAR_WIN, PV_CUC, - #else - (char_u *)NULL, PV_NONE, - #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, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"debug", NULL, P_STRING|P_VI_DEF, - (char_u *)&p_debug, PV_NONE, -! {(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, -*************** -*** 1014,1041 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"delcombine", "deco", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_MBYTE - (char_u *)&p_deco, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP|P_NDNAME, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_dict, PV_DICT, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"diff", NULL, P_BOOL|P_VI_DEF|P_RWIN|P_NOGLOB, - #ifdef FEAT_DIFF - (char_u *)VAR_WIN, PV_DIFF, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_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, ---- 1014,1041 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"delcombine", "deco", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_MBYTE - (char_u *)&p_deco, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP|P_NDNAME, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_dict, PV_DICT, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(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, - #else - (char_u *)NULL, PV_NONE, - #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, -*************** -*** 1044,1050 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_ONECOMMA - |P_NODUP, - #ifdef FEAT_DIFF ---- 1044,1050 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_ONECOMMA - |P_NODUP, - #ifdef FEAT_DIFF -*************** -*** 1054,1081 **** - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)NULL} - #endif -! SCRIPTID_INIT}, - {"digraph", "dg", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_DIGRAPHS - (char_u *)&p_dg, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"directory", "dir", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA - |P_NODUP|P_SECURE, - (char_u *)&p_dir, PV_NONE, -! {(char_u *)DFLT_DIR, (char_u *)0L} SCRIPTID_INIT}, - {"display", "dy", P_STRING|P_VI_DEF|P_ONECOMMA|P_RALL|P_NODUP, - (char_u *)&p_dy, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"eadirection", "ead", P_STRING|P_VI_DEF, - (char_u *)&p_ead, PV_NONE, - {(char_u *)"both", (char_u *)0L} -! SCRIPTID_INIT}, - {"edcompatible","ed", P_BOOL|P_VI_DEF, - (char_u *)&p_ed, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"emoji", "emo", P_BOOL|P_VI_DEF|P_RCLR, - #if defined(FEAT_MBYTE) - (char_u *)&p_emoji, PV_NONE, ---- 1054,1081 ---- - (char_u *)NULL, PV_NONE, - {(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, - #else - (char_u *)NULL, PV_NONE, - #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, -! {(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, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"eadirection", "ead", P_STRING|P_VI_DEF, - (char_u *)&p_ead, PV_NONE, - {(char_u *)"both", (char_u *)0L} -! SCTX_INIT}, - {"edcompatible","ed", P_BOOL|P_VI_DEF, - (char_u *)&p_ed, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"emoji", "emo", P_BOOL|P_VI_DEF|P_RCLR, - #if defined(FEAT_MBYTE) - (char_u *)&p_emoji, PV_NONE, -*************** -*** 1084,1090 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"encoding", "enc", P_STRING|P_VI_DEF|P_RCLR|P_NO_ML, - #ifdef FEAT_MBYTE - (char_u *)&p_enc, PV_NONE, ---- 1084,1090 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"encoding", "enc", P_STRING|P_VI_DEF|P_RCLR|P_NO_ML, - #ifdef FEAT_MBYTE - (char_u *)&p_enc, PV_NONE, -*************** -*** 1093,1111 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"endofline", "eol", P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, - (char_u *)&p_eol, PV_EOL, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"equalalways", "ea", P_BOOL|P_VI_DEF|P_RALL, - (char_u *)&p_ea, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"equalprg", "ep", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_ep, PV_EP, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"errorbells", "eb", P_BOOL|P_VI_DEF, - (char_u *)&p_eb, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"errorfile", "ef", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_ef, PV_NONE, ---- 1093,1111 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"endofline", "eol", P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, - (char_u *)&p_eol, PV_EOL, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"equalalways", "ea", P_BOOL|P_VI_DEF|P_RALL, - (char_u *)&p_ea, PV_NONE, -! {(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, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"errorbells", "eb", P_BOOL|P_VI_DEF, - (char_u *)&p_eb, PV_NONE, -! {(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, -*************** -*** 1114,1120 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"errorformat", "efm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_QUICKFIX - (char_u *)&p_efm, PV_EFM, ---- 1114,1120 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 1123,1141 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"esckeys", "ek", P_BOOL|P_VIM, - (char_u *)&p_ek, PV_NONE, -! {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"eventignore", "ei", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_ei, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"expandtab", "et", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_et, PV_ET, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"exrc", "ex", P_BOOL|P_VI_DEF|P_SECURE, - (char_u *)&p_exrc, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF - |P_NO_MKRC, - #ifdef FEAT_MBYTE ---- 1123,1141 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"esckeys", "ek", P_BOOL|P_VIM, - (char_u *)&p_ek, PV_NONE, -! {(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, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"expandtab", "et", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_et, PV_ET, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"exrc", "ex", P_BOOL|P_VI_DEF|P_SECURE, - (char_u *)&p_exrc, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF - |P_NO_MKRC, - #ifdef FEAT_MBYTE -*************** -*** 1145,1151 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"fileencodings","fencs", P_STRING|P_VI_DEF|P_ONECOMMA, - #ifdef FEAT_MBYTE - (char_u *)&p_fencs, PV_NONE, ---- 1145,1151 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"fileencodings","fencs", P_STRING|P_VI_DEF|P_ONECOMMA, - #ifdef FEAT_MBYTE - (char_u *)&p_fencs, PV_NONE, -*************** -*** 1154,1168 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"fileformat", "ff", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC - |P_CURSWANT, - (char_u *)&p_ff, PV_FF, -! {(char_u *)DFLT_FF, (char_u *)0L} SCRIPTID_INIT}, - {"fileformats", "ffs", P_STRING|P_VIM|P_ONECOMMA|P_NODUP, - (char_u *)&p_ffs, PV_NONE, - {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM} -! SCRIPTID_INIT}, - {"fileignorecase", "fic", P_BOOL|P_VI_DEF, - (char_u *)&p_fic, PV_NONE, - { ---- 1154,1168 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"fileformat", "ff", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC - |P_CURSWANT, - (char_u *)&p_ff, PV_FF, -! {(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, - {(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, - { -*************** -*** 1171,1198 **** - #else - (char_u *)FALSE, - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"filetype", "ft", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, - (char_u *)&p_ft, PV_FT, - {(char_u *)"", (char_u *)0L} -! SCRIPTID_INIT}, - {"fillchars", "fcs", P_STRING|P_VI_DEF|P_RALL|P_ONECOMMA|P_NODUP, - (char_u *)&p_fcs, PV_NONE, - {(char_u *)"vert:|,fold:-", (char_u *)0L} -! SCRIPTID_INIT}, - {"fixendofline", "fixeol", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)&p_fixeol, PV_FIXEOL, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"fkmap", "fk", P_BOOL|P_VI_DEF, - #ifdef FEAT_FKMAP - (char_u *)&p_fkmap, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"flash", "fl", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"foldclose", "fcl", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN, - #ifdef FEAT_FOLDING - (char_u *)&p_fcl, PV_NONE, ---- 1171,1198 ---- - #else - (char_u *)FALSE, - #endif -! (char_u *)0L} SCTX_INIT}, - {"filetype", "ft", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, - (char_u *)&p_ft, PV_FT, - {(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_NONE, - {(char_u *)"vert:|,fold:-", (char_u *)0L} -! SCTX_INIT}, - {"fixendofline", "fixeol", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)&p_fixeol, PV_FIXEOL, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"fkmap", "fk", P_BOOL|P_VI_DEF, - #ifdef FEAT_FKMAP - (char_u *)&p_fkmap, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"flash", "fl", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(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, -*************** -*** 1201,1207 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldcolumn", "fdc", P_NUM|P_VI_DEF|P_RWIN, - #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FDC, ---- 1201,1207 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 1210,1216 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldenable", "fen", P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FEN, ---- 1210,1216 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 1219,1225 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldexpr", "fde", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, - #if defined(FEAT_FOLDING) && defined(FEAT_EVAL) - (char_u *)VAR_WIN, PV_FDE, ---- 1219,1225 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"foldexpr", "fde", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, - #if defined(FEAT_FOLDING) && defined(FEAT_EVAL) - (char_u *)VAR_WIN, PV_FDE, -*************** -*** 1228,1234 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldignore", "fdi", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, - #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FDI, ---- 1228,1234 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 1237,1243 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldlevel", "fdl", P_NUM|P_VI_DEF|P_RWIN, - #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FDL, ---- 1237,1243 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 1246,1252 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldlevelstart","fdls", P_NUM|P_VI_DEF|P_CURSWANT, - #ifdef FEAT_FOLDING - (char_u *)&p_fdls, PV_NONE, ---- 1246,1252 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 1255,1261 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF| - P_RWIN|P_ONECOMMA|P_NODUP, - #ifdef FEAT_FOLDING ---- 1255,1261 ---- - (char_u *)NULL, PV_NONE, - {(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 -*************** -*** 1265,1271 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldmethod", "fdm", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, - #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FDM, ---- 1265,1271 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 1274,1280 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldminlines","fml", P_NUM|P_VI_DEF|P_RWIN, - #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FML, ---- 1274,1280 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 1283,1289 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldnestmax", "fdn", P_NUM|P_VI_DEF|P_RWIN, - #ifdef FEAT_FOLDING - (char_u *)VAR_WIN, PV_FDN, ---- 1283,1289 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 1292,1298 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldopen", "fdo", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_CURSWANT, - #ifdef FEAT_FOLDING - (char_u *)&p_fdo, PV_NONE, ---- 1292,1298 ---- - (char_u *)NULL, PV_NONE, - {(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, -*************** -*** 1302,1308 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"foldtext", "fdt", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, - #if defined(FEAT_FOLDING) && defined(FEAT_EVAL) - (char_u *)VAR_WIN, PV_FDT, ---- 1302,1308 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"foldtext", "fdt", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, - #if defined(FEAT_FOLDING) && defined(FEAT_EVAL) - (char_u *)VAR_WIN, PV_FDT, -*************** -*** 1311,1317 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"formatexpr", "fex", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, - #ifdef FEAT_EVAL - (char_u *)&p_fex, PV_FEX, ---- 1311,1317 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"formatexpr", "fex", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, - #ifdef FEAT_EVAL - (char_u *)&p_fex, PV_FEX, -*************** -*** 1320,1337 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"formatoptions","fo", P_STRING|P_ALLOCED|P_VIM|P_FLAGLIST, - (char_u *)&p_fo, PV_FO, - {(char_u *)DFLT_FO_VI, (char_u *)DFLT_FO_VIM} -! SCRIPTID_INIT}, - {"formatlistpat","flp", P_STRING|P_ALLOCED|P_VI_DEF, - (char_u *)&p_flp, PV_FLP, - {(char_u *)"^\\s*\\d\\+[\\]:.)}\\t ]\\s*", -! (char_u *)0L} SCRIPTID_INIT}, - {"formatprg", "fp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_fp, PV_FP, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"fsync", "fs", P_BOOL|P_SECURE|P_VI_DEF, - #ifdef HAVE_FSYNC - (char_u *)&p_fs, PV_NONE, ---- 1320,1337 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"formatoptions","fo", P_STRING|P_ALLOCED|P_VIM|P_FLAGLIST, - (char_u *)&p_fo, PV_FO, - {(char_u *)DFLT_FO_VI, (char_u *)DFLT_FO_VIM} -! SCTX_INIT}, - {"formatlistpat","flp", P_STRING|P_ALLOCED|P_VI_DEF, - (char_u *)&p_flp, PV_FLP, - {(char_u *)"^\\s*\\d\\+[\\]:.)}\\t ]\\s*", -! (char_u *)0L} SCTX_INIT}, - {"formatprg", "fp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_fp, PV_FP, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"fsync", "fs", P_BOOL|P_SECURE|P_VI_DEF, - #ifdef HAVE_FSYNC - (char_u *)&p_fs, PV_NONE, -*************** -*** 1340,1352 **** - (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"gdefault", "gd", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_gd, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"graphic", "gr", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"grepformat", "gfm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_QUICKFIX - (char_u *)&p_gefm, PV_NONE, ---- 1340,1352 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L} - #endif -! SCTX_INIT}, - {"gdefault", "gd", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_gd, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"graphic", "gr", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"grepformat", "gfm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_QUICKFIX - (char_u *)&p_gefm, PV_NONE, -*************** -*** 1355,1361 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"grepprg", "gp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_gp, PV_GP, ---- 1355,1361 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"grepprg", "gp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_gp, PV_GP, -*************** -*** 1381,1387 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"guicursor", "gcr", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef CURSOR_SHAPE - (char_u *)&p_guicursor, PV_NONE, ---- 1381,1387 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"guicursor", "gcr", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef CURSOR_SHAPE - (char_u *)&p_guicursor, PV_NONE, -*************** -*** 1396,1402 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"guifont", "gfn", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP, - #ifdef FEAT_GUI - (char_u *)&p_guifont, PV_NONE, ---- 1396,1402 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"guifont", "gfn", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP, - #ifdef FEAT_GUI - (char_u *)&p_guifont, PV_NONE, -*************** -*** 1405,1411 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"guifontset", "gfs", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA, - #if defined(FEAT_GUI) && defined(FEAT_XFONTSET) - (char_u *)&p_guifontset, PV_NONE, ---- 1405,1411 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"guifontset", "gfs", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA, - #if defined(FEAT_GUI) && defined(FEAT_XFONTSET) - (char_u *)&p_guifontset, PV_NONE, -*************** -*** 1414,1420 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"guifontwide", "gfw", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP, - #if defined(FEAT_GUI) && defined(FEAT_MBYTE) - (char_u *)&p_guifontwide, PV_NONE, ---- 1414,1420 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"guifontwide", "gfw", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP, - #if defined(FEAT_GUI) && defined(FEAT_MBYTE) - (char_u *)&p_guifontwide, PV_NONE, -*************** -*** 1423,1436 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"guiheadroom", "ghr", P_NUM|P_VI_DEF, - #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) - (char_u *)&p_ghr, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)50L, (char_u *)0L} SCRIPTID_INIT}, - {"guioptions", "go", P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST, - #if defined(FEAT_GUI) - (char_u *)&p_go, PV_NONE, ---- 1423,1436 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"guiheadroom", "ghr", P_NUM|P_VI_DEF, - #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) - (char_u *)&p_ghr, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)50L, (char_u *)0L} SCTX_INIT}, - {"guioptions", "go", P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST, - #if defined(FEAT_GUI) - (char_u *)&p_go, PV_NONE, -*************** -*** 1443,1456 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"guipty", NULL, P_BOOL|P_VI_DEF, - #if defined(FEAT_GUI) - (char_u *)&p_guipty, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"guitablabel", "gtl", P_STRING|P_VI_DEF|P_RWIN, - #if defined(FEAT_GUI_TABLINE) - (char_u *)&p_gtl, PV_NONE, ---- 1443,1456 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"guipty", NULL, P_BOOL|P_VI_DEF, - #if defined(FEAT_GUI) - (char_u *)&p_guipty, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"guitablabel", "gtl", P_STRING|P_VI_DEF|P_RWIN, - #if defined(FEAT_GUI_TABLINE) - (char_u *)&p_gtl, PV_NONE, -*************** -*** 1459,1465 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"guitabtooltip", "gtt", P_STRING|P_VI_DEF|P_RWIN, - #if defined(FEAT_GUI_TABLINE) - (char_u *)&p_gtt, PV_NONE, ---- 1459,1465 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"guitabtooltip", "gtt", P_STRING|P_VI_DEF|P_RWIN, - #if defined(FEAT_GUI_TABLINE) - (char_u *)&p_gtt, PV_NONE, -*************** -*** 1468,1484 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"hardtabs", "ht", P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"helpfile", "hf", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_hf, PV_NONE, - {(char_u *)DFLT_HELPFILE, (char_u *)0L} -! SCRIPTID_INIT}, - {"helpheight", "hh", P_NUM|P_VI_DEF, - (char_u *)&p_hh, PV_NONE, -! {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT}, - {"helplang", "hlg", P_STRING|P_VI_DEF|P_ONECOMMA, - #ifdef FEAT_MULTI_LANG - (char_u *)&p_hlg, PV_NONE, ---- 1468,1484 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"hardtabs", "ht", P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"helpfile", "hf", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_hf, PV_NONE, - {(char_u *)DFLT_HELPFILE, (char_u *)0L} -! SCTX_INIT}, - {"helpheight", "hh", P_NUM|P_VI_DEF, - (char_u *)&p_hh, PV_NONE, -! {(char_u *)20L, (char_u *)0L} SCTX_INIT}, - {"helplang", "hlg", P_STRING|P_VI_DEF|P_ONECOMMA, - #ifdef FEAT_MULTI_LANG - (char_u *)&p_hlg, PV_NONE, -*************** -*** 1487,1537 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"hidden", "hid", P_BOOL|P_VI_DEF, - (char_u *)&p_hid, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"highlight", "hl", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP, - (char_u *)&p_hl, PV_NONE, - {(char_u *)HIGHLIGHT_INIT, (char_u *)0L} -! SCRIPTID_INIT}, - {"history", "hi", P_NUM|P_VIM, - (char_u *)&p_hi, PV_NONE, -! {(char_u *)0L, (char_u *)50L} SCRIPTID_INIT}, - {"hkmap", "hk", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_RIGHTLEFT - (char_u *)&p_hkmap, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"hkmapp", "hkp", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_RIGHTLEFT - (char_u *)&p_hkmapp, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"hlsearch", "hls", P_BOOL|P_VI_DEF|P_VIM|P_RALL, - (char_u *)&p_hls, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"icon", NULL, P_BOOL|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_icon, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"iconstring", NULL, P_STRING|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_iconstring, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"ignorecase", "ic", P_BOOL|P_VI_DEF, - (char_u *)&p_ic, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"imactivatefunc","imaf",P_STRING|P_VI_DEF|P_SECURE, - #if defined(FEAT_EVAL) && defined(FEAT_MBYTE) - (char_u *)&p_imaf, PV_NONE, ---- 1487,1537 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"hidden", "hid", P_BOOL|P_VI_DEF, - (char_u *)&p_hid, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"highlight", "hl", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP, - (char_u *)&p_hl, PV_NONE, - {(char_u *)HIGHLIGHT_INIT, (char_u *)0L} -! SCTX_INIT}, - {"history", "hi", P_NUM|P_VIM, - (char_u *)&p_hi, PV_NONE, -! {(char_u *)0L, (char_u *)50L} SCTX_INIT}, - {"hkmap", "hk", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_RIGHTLEFT - (char_u *)&p_hkmap, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"hkmapp", "hkp", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_RIGHTLEFT - (char_u *)&p_hkmapp, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"hlsearch", "hls", P_BOOL|P_VI_DEF|P_VIM|P_RALL, - (char_u *)&p_hls, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"icon", NULL, P_BOOL|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_icon, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"iconstring", NULL, P_STRING|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_iconstring, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"ignorecase", "ic", P_BOOL|P_VI_DEF, - (char_u *)&p_ic, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"imactivatefunc","imaf",P_STRING|P_VI_DEF|P_SECURE, - #if defined(FEAT_EVAL) && defined(FEAT_MBYTE) - (char_u *)&p_imaf, PV_NONE, -*************** -*** 1540,1560 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - # endif -! SCRIPTID_INIT}, - {"imactivatekey","imak",P_STRING|P_VI_DEF, - #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) - (char_u *)&p_imak, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"imcmdline", "imc", P_BOOL|P_VI_DEF, - #ifdef FEAT_MBYTE - (char_u *)&p_imcmdline, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"imdisable", "imd", P_BOOL|P_VI_DEF, - #ifdef FEAT_MBYTE - (char_u *)&p_imdisable, PV_NONE, ---- 1540,1560 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - # endif -! SCTX_INIT}, - {"imactivatekey","imak",P_STRING|P_VI_DEF, - #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) - (char_u *)&p_imak, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"imcmdline", "imc", P_BOOL|P_VI_DEF, - #ifdef FEAT_MBYTE - (char_u *)&p_imcmdline, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"imdisable", "imd", P_BOOL|P_VI_DEF, - #ifdef FEAT_MBYTE - (char_u *)&p_imdisable, PV_NONE, -*************** -*** 1566,1580 **** - #else - {(char_u *)FALSE, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"iminsert", "imi", P_NUM|P_VI_DEF, - (char_u *)&p_iminsert, PV_IMI, - {(char_u *)B_IMODE_NONE, (char_u *)0L} -! SCRIPTID_INIT}, - {"imsearch", "ims", P_NUM|P_VI_DEF, - (char_u *)&p_imsearch, PV_IMS, - {(char_u *)B_IMODE_USE_INSERT, (char_u *)0L} -! SCRIPTID_INIT}, - {"imstatusfunc","imsf",P_STRING|P_VI_DEF|P_SECURE, - #if defined(FEAT_EVAL) && defined(FEAT_MBYTE) - (char_u *)&p_imsf, PV_NONE, ---- 1566,1580 ---- - #else - {(char_u *)FALSE, (char_u *)0L} - #endif -! SCTX_INIT}, - {"iminsert", "imi", P_NUM|P_VI_DEF, - (char_u *)&p_iminsert, PV_IMI, - {(char_u *)B_IMODE_NONE, (char_u *)0L} -! SCTX_INIT}, - {"imsearch", "ims", P_NUM|P_VI_DEF, - (char_u *)&p_imsearch, PV_IMS, - {(char_u *)B_IMODE_USE_INSERT, (char_u *)0L} -! SCTX_INIT}, - {"imstatusfunc","imsf",P_STRING|P_VI_DEF|P_SECURE, - #if defined(FEAT_EVAL) && defined(FEAT_MBYTE) - (char_u *)&p_imsf, PV_NONE, -*************** -*** 1583,1589 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"imstyle", "imst", P_NUM|P_VI_DEF|P_SECURE, - #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) - (char_u *)&p_imst, PV_NONE, ---- 1583,1589 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"imstyle", "imst", P_NUM|P_VI_DEF|P_SECURE, - #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) - (char_u *)&p_imst, PV_NONE, -*************** -*** 1592,1598 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"include", "inc", P_STRING|P_ALLOCED|P_VI_DEF, - #ifdef FEAT_FIND_ID - (char_u *)&p_inc, PV_INC, ---- 1592,1598 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"include", "inc", P_STRING|P_ALLOCED|P_VI_DEF, - #ifdef FEAT_FIND_ID - (char_u *)&p_inc, PV_INC, -*************** -*** 1601,1607 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"includeexpr", "inex", P_STRING|P_ALLOCED|P_VI_DEF, - #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL) - (char_u *)&p_inex, PV_INEX, ---- 1601,1607 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"includeexpr", "inex", P_STRING|P_ALLOCED|P_VI_DEF, - #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL) - (char_u *)&p_inex, PV_INEX, -*************** -*** 1610,1619 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"incsearch", "is", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_is, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"indentexpr", "inde", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, - #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) - (char_u *)&p_inde, PV_INDE, ---- 1610,1619 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"incsearch", "is", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_is, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"indentexpr", "inde", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, - #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) - (char_u *)&p_inde, PV_INDE, -*************** -*** 1622,1628 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) - (char_u *)&p_indk, PV_INDK, ---- 1622,1628 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) - (char_u *)&p_indk, PV_INDK, -*************** -*** 1631,1643 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"infercase", "inf", P_BOOL|P_VI_DEF, - (char_u *)&p_inf, PV_INF, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"insertmode", "im", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_im, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"isfname", "isf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_isf, PV_NONE, - { ---- 1631,1643 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"infercase", "inf", P_BOOL|P_VI_DEF, - (char_u *)&p_inf, PV_INF, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"insertmode", "im", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_im, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"isfname", "isf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_isf, PV_NONE, - { -*************** -*** 1660,1666 **** - # endif - # endif - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"isident", "isi", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_isi, PV_NONE, - { ---- 1660,1666 ---- - # endif - # endif - #endif -! (char_u *)0L} SCTX_INIT}, - {"isident", "isi", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_isi, PV_NONE, - { -*************** -*** 1677,1683 **** - (char_u *)"@,48-57,_,192-255", - # endif - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"iskeyword", "isk", P_STRING|P_ALLOCED|P_VIM|P_COMMA|P_NODUP, - (char_u *)&p_isk, PV_ISK, - { ---- 1677,1683 ---- - (char_u *)"@,48-57,_,192-255", - # endif - #endif -! (char_u *)0L} SCTX_INIT}, - {"iskeyword", "isk", P_STRING|P_ALLOCED|P_VIM|P_COMMA|P_NODUP, - (char_u *)&p_isk, PV_ISK, - { -*************** -*** 1696,1702 **** - ISK_LATIN1 - # endif - #endif -! } SCRIPTID_INIT}, - {"isprint", "isp", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP, - (char_u *)&p_isp, PV_NONE, - { ---- 1696,1702 ---- - ISK_LATIN1 - # endif - #endif -! } SCTX_INIT}, - {"isprint", "isp", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP, - (char_u *)&p_isp, PV_NONE, - { -*************** -*** 1710,1719 **** - ISP_LATIN1, - # endif - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"joinspaces", "js", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_js, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"key", NULL, P_STRING|P_ALLOCED|P_VI_DEF|P_NO_MKRC, - #ifdef FEAT_CRYPT - (char_u *)&p_key, PV_KEY, ---- 1710,1719 ---- - ISP_LATIN1, - # endif - #endif -! (char_u *)0L} SCTX_INIT}, - {"joinspaces", "js", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_js, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"key", NULL, P_STRING|P_ALLOCED|P_VI_DEF|P_NO_MKRC, - #ifdef FEAT_CRYPT - (char_u *)&p_key, PV_KEY, -*************** -*** 1722,1728 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"keymap", "kmp", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME|P_PRI_MKRC, - #ifdef FEAT_KEYMAP - (char_u *)&p_keymap, PV_KMAP, ---- 1722,1728 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"keymap", "kmp", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME|P_PRI_MKRC, - #ifdef FEAT_KEYMAP - (char_u *)&p_keymap, PV_KMAP, -*************** -*** 1731,1740 **** - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"keymodel", "km", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_km, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_kp, PV_KP, - { ---- 1731,1740 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCTX_INIT}, - {"keymodel", "km", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_km, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_kp, PV_KP, - { -*************** -*** 1751,1757 **** - # endif - # endif - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"langmap", "lmap", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_SECURE, - #ifdef FEAT_LANGMAP - (char_u *)&p_langmap, PV_NONE, ---- 1751,1757 ---- - # endif - # endif - #endif -! (char_u *)0L} SCTX_INIT}, - {"langmap", "lmap", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_SECURE, - #ifdef FEAT_LANGMAP - (char_u *)&p_langmap, PV_NONE, -*************** -*** 1760,1800 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"langmenu", "lm", P_STRING|P_VI_DEF|P_NFNAME, - #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG) - (char_u *)&p_lm, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"langnoremap", "lnr", P_BOOL|P_VI_DEF, - #ifdef FEAT_LANGMAP - (char_u *)&p_lnr, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"langremap", "lrm", P_BOOL|P_VI_DEF, - #ifdef FEAT_LANGMAP - (char_u *)&p_lrm, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"laststatus", "ls", P_NUM|P_VI_DEF|P_RALL, - (char_u *)&p_ls, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"lazyredraw", "lz", P_BOOL|P_VI_DEF, - (char_u *)&p_lz, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"linebreak", "lbr", P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_LINEBREAK - (char_u *)VAR_WIN, PV_LBR, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"lines", NULL, P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, - (char_u *)&Rows, PV_NONE, - { ---- 1760,1800 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, - #endif -! (char_u *)0L} SCTX_INIT}, - {"langmenu", "lm", P_STRING|P_VI_DEF|P_NFNAME, - #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG) - (char_u *)&p_lm, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"langnoremap", "lnr", P_BOOL|P_VI_DEF, - #ifdef FEAT_LANGMAP - (char_u *)&p_lnr, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"langremap", "lrm", P_BOOL|P_VI_DEF, - #ifdef FEAT_LANGMAP - (char_u *)&p_lrm, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"laststatus", "ls", P_NUM|P_VI_DEF|P_RALL, - (char_u *)&p_ls, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCTX_INIT}, - {"lazyredraw", "lz", P_BOOL|P_VI_DEF, - (char_u *)&p_lz, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"linebreak", "lbr", P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_LINEBREAK - (char_u *)VAR_WIN, PV_LBR, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"lines", NULL, P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, - (char_u *)&Rows, PV_NONE, - { -*************** -*** 1803,1809 **** - #else - (char_u *)24L, - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"linespace", "lsp", P_NUM|P_VI_DEF|P_RCLR, - #ifdef FEAT_GUI - (char_u *)&p_linespace, PV_NONE, ---- 1803,1809 ---- - #else - (char_u *)24L, - #endif -! (char_u *)0L} SCTX_INIT}, - {"linespace", "lsp", P_NUM|P_VI_DEF|P_RCLR, - #ifdef FEAT_GUI - (char_u *)&p_linespace, PV_NONE, -*************** -*** 1815,1828 **** - #else - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"lisp", NULL, P_BOOL|P_VI_DEF, - #ifdef FEAT_LISP - (char_u *)&p_lisp, PV_LISP, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"lispwords", "lw", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_LISP - (char_u *)&p_lispwords, PV_LW, ---- 1815,1828 ---- - #else - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"lisp", NULL, P_BOOL|P_VI_DEF, - #ifdef FEAT_LISP - (char_u *)&p_lisp, PV_LISP, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"lispwords", "lw", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_LISP - (char_u *)&p_lispwords, PV_LW, -*************** -*** 1831,1846 **** - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"list", NULL, P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_LIST, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"listchars", "lcs", P_STRING|P_VI_DEF|P_RALL|P_ONECOMMA|P_NODUP, - (char_u *)&p_lcs, PV_NONE, -! {(char_u *)"eol:$", (char_u *)0L} SCRIPTID_INIT}, - {"loadplugins", "lpl", P_BOOL|P_VI_DEF, - (char_u *)&p_lpl, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"luadll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_LUA) - (char_u *)&p_luadll, PV_NONE, ---- 1831,1846 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCTX_INIT}, - {"list", NULL, P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_LIST, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"listchars", "lcs", P_STRING|P_VI_DEF|P_RALL|P_ONECOMMA|P_NODUP, - (char_u *)&p_lcs, PV_NONE, -! {(char_u *)"eol:$", (char_u *)0L} SCTX_INIT}, - {"loadplugins", "lpl", P_BOOL|P_VI_DEF, - (char_u *)&p_lpl, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"luadll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_LUA) - (char_u *)&p_luadll, PV_NONE, -*************** -*** 1849,1855 **** - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"macatsui", NULL, P_BOOL|P_VI_DEF|P_RCLR, - #ifdef FEAT_GUI_MAC - (char_u *)&p_macatsui, PV_NONE, ---- 1849,1855 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCTX_INIT}, - {"macatsui", NULL, P_BOOL|P_VI_DEF|P_RCLR, - #ifdef FEAT_GUI_MAC - (char_u *)&p_macatsui, PV_NONE, -*************** -*** 1858,1867 **** - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"magic", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_magic, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"makeef", "mef", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_mef, PV_NONE, ---- 1858,1867 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCTX_INIT}, - {"magic", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_magic, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"makeef", "mef", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_mef, PV_NONE, -*************** -*** 1870,1876 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"makeencoding","menc", P_STRING|P_VI_DEF, - #ifdef FEAT_MBYTE - (char_u *)&p_menc, PV_MENC, ---- 1870,1876 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"makeencoding","menc", P_STRING|P_VI_DEF, - #ifdef FEAT_MBYTE - (char_u *)&p_menc, PV_MENC, -*************** -*** 1879,1885 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"makeprg", "mp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_mp, PV_MP, ---- 1879,1885 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"makeprg", "mp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_mp, PV_MP, -*************** -*** 1892,1943 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"matchpairs", "mps", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_mps, PV_MPS, - {(char_u *)"(:),{:},[:]", (char_u *)0L} -! SCRIPTID_INIT}, - {"matchtime", "mat", P_NUM|P_VI_DEF, - (char_u *)&p_mat, PV_NONE, -! {(char_u *)5L, (char_u *)0L} SCRIPTID_INIT}, - {"maxcombine", "mco", P_NUM|P_VI_DEF|P_CURSWANT, - #ifdef FEAT_MBYTE - (char_u *)&p_mco, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)2, (char_u *)0L} SCRIPTID_INIT}, - {"maxfuncdepth", "mfd", P_NUM|P_VI_DEF, - #ifdef FEAT_EVAL - (char_u *)&p_mfd, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)100L, (char_u *)0L} SCRIPTID_INIT}, - {"maxmapdepth", "mmd", P_NUM|P_VI_DEF, - (char_u *)&p_mmd, PV_NONE, -! {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT}, - {"maxmem", "mm", P_NUM|P_VI_DEF, - (char_u *)&p_mm, PV_NONE, - {(char_u *)DFLT_MAXMEM, (char_u *)0L} -! SCRIPTID_INIT}, - {"maxmempattern","mmp", P_NUM|P_VI_DEF, - (char_u *)&p_mmp, PV_NONE, -! {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT}, - {"maxmemtot", "mmt", P_NUM|P_VI_DEF, - (char_u *)&p_mmt, PV_NONE, - {(char_u *)DFLT_MAXMEMTOT, (char_u *)0L} -! SCRIPTID_INIT}, - {"menuitems", "mis", P_NUM|P_VI_DEF, - #ifdef FEAT_MENU - (char_u *)&p_mis, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)25L, (char_u *)0L} SCRIPTID_INIT}, - {"mesg", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"mkspellmem", "msm", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE, - #ifdef FEAT_SPELL - (char_u *)&p_msm, PV_NONE, ---- 1892,1943 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"matchpairs", "mps", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_mps, PV_MPS, - {(char_u *)"(:),{:},[:]", (char_u *)0L} -! SCTX_INIT}, - {"matchtime", "mat", P_NUM|P_VI_DEF, - (char_u *)&p_mat, PV_NONE, -! {(char_u *)5L, (char_u *)0L} SCTX_INIT}, - {"maxcombine", "mco", P_NUM|P_VI_DEF|P_CURSWANT, - #ifdef FEAT_MBYTE - (char_u *)&p_mco, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)2, (char_u *)0L} SCTX_INIT}, - {"maxfuncdepth", "mfd", P_NUM|P_VI_DEF, - #ifdef FEAT_EVAL - (char_u *)&p_mfd, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)100L, (char_u *)0L} SCTX_INIT}, - {"maxmapdepth", "mmd", P_NUM|P_VI_DEF, - (char_u *)&p_mmd, PV_NONE, -! {(char_u *)1000L, (char_u *)0L} SCTX_INIT}, - {"maxmem", "mm", P_NUM|P_VI_DEF, - (char_u *)&p_mm, PV_NONE, - {(char_u *)DFLT_MAXMEM, (char_u *)0L} -! SCTX_INIT}, - {"maxmempattern","mmp", P_NUM|P_VI_DEF, - (char_u *)&p_mmp, PV_NONE, -! {(char_u *)1000L, (char_u *)0L} SCTX_INIT}, - {"maxmemtot", "mmt", P_NUM|P_VI_DEF, - (char_u *)&p_mmt, PV_NONE, - {(char_u *)DFLT_MAXMEMTOT, (char_u *)0L} -! SCTX_INIT}, - {"menuitems", "mis", P_NUM|P_VI_DEF, - #ifdef FEAT_MENU - (char_u *)&p_mis, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)25L, (char_u *)0L} SCTX_INIT}, - {"mesg", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"mkspellmem", "msm", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE, - #ifdef FEAT_SPELL - (char_u *)&p_msm, PV_NONE, -*************** -*** 1946,1967 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"modeline", "ml", P_BOOL|P_VIM, - (char_u *)&p_ml, PV_ML, -! {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"modelines", "mls", P_NUM|P_VI_DEF, - (char_u *)&p_mls, PV_NONE, -! {(char_u *)5L, (char_u *)0L} SCRIPTID_INIT}, - {"modifiable", "ma", P_BOOL|P_VI_DEF|P_NOGLOB, - (char_u *)&p_ma, PV_MA, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"modified", "mod", P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, - (char_u *)&p_mod, PV_MOD, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"more", NULL, P_BOOL|P_VIM, - (char_u *)&p_more, PV_NONE, -! {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"mouse", NULL, P_STRING|P_VI_DEF|P_FLAGLIST, - (char_u *)&p_mouse, PV_NONE, - { ---- 1946,1967 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"modeline", "ml", P_BOOL|P_VIM, - (char_u *)&p_ml, PV_ML, -! {(char_u *)FALSE, (char_u *)TRUE} SCTX_INIT}, - {"modelines", "mls", P_NUM|P_VI_DEF, - (char_u *)&p_mls, PV_NONE, -! {(char_u *)5L, (char_u *)0L} SCTX_INIT}, - {"modifiable", "ma", P_BOOL|P_VI_DEF|P_NOGLOB, - (char_u *)&p_ma, PV_MA, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"modified", "mod", P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, - (char_u *)&p_mod, PV_MOD, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"more", NULL, P_BOOL|P_VIM, - (char_u *)&p_more, PV_NONE, -! {(char_u *)FALSE, (char_u *)TRUE} SCTX_INIT}, - {"mouse", NULL, P_STRING|P_VI_DEF|P_FLAGLIST, - (char_u *)&p_mouse, PV_NONE, - { -*************** -*** 1970,1990 **** - #else - (char_u *)"", - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"mousefocus", "mousef", P_BOOL|P_VI_DEF, - #ifdef FEAT_GUI - (char_u *)&p_mousef, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"mousehide", "mh", P_BOOL|P_VI_DEF, - #ifdef FEAT_GUI - (char_u *)&p_mh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"mousemodel", "mousem", P_STRING|P_VI_DEF, - (char_u *)&p_mousem, PV_NONE, - { ---- 1970,1990 ---- - #else - (char_u *)"", - #endif -! (char_u *)0L} SCTX_INIT}, - {"mousefocus", "mousef", P_BOOL|P_VI_DEF, - #ifdef FEAT_GUI - (char_u *)&p_mousef, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"mousehide", "mh", P_BOOL|P_VI_DEF, - #ifdef FEAT_GUI - (char_u *)&p_mh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"mousemodel", "mousem", P_STRING|P_VI_DEF, - (char_u *)&p_mousem, PV_NONE, - { -*************** -*** 1997,2003 **** - (char_u *)"extend", - # endif - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"mouseshape", "mouses", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_MOUSESHAPE - (char_u *)&p_mouseshape, PV_NONE, ---- 1997,2003 ---- - (char_u *)"extend", - # endif - #endif -! (char_u *)0L} SCTX_INIT}, - {"mouseshape", "mouses", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_MOUSESHAPE - (char_u *)&p_mouseshape, PV_NONE, -*************** -*** 2006,2015 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"mousetime", "mouset", P_NUM|P_VI_DEF, - (char_u *)&p_mouset, PV_NONE, -! {(char_u *)500L, (char_u *)0L} SCRIPTID_INIT}, - {"mzschemedll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_MZSCHEME) - (char_u *)&p_mzschemedll, PV_NONE, ---- 2006,2015 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"mousetime", "mouset", P_NUM|P_VI_DEF, - (char_u *)&p_mouset, PV_NONE, -! {(char_u *)500L, (char_u *)0L} SCTX_INIT}, - {"mzschemedll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_MZSCHEME) - (char_u *)&p_mzschemedll, PV_NONE, -*************** -*** 2018,2024 **** - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"mzschemegcdll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_MZSCHEME) - (char_u *)&p_mzschemegcdll, PV_NONE, ---- 2018,2024 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCTX_INIT}, - {"mzschemegcdll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_MZSCHEME) - (char_u *)&p_mzschemegcdll, PV_NONE, -*************** -*** 2027,2057 **** - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"mzquantum", "mzq", P_NUM, - #ifdef FEAT_MZSCHEME - (char_u *)&p_mzq, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)100L, (char_u *)100L} SCRIPTID_INIT}, - {"novice", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"nrformats", "nf", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_nf, PV_NF, - {(char_u *)"bin,octal,hex", (char_u *)0L} -! SCRIPTID_INIT}, - {"number", "nu", P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_NU, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"numberwidth", "nuw", P_NUM|P_RWIN|P_VIM, - #ifdef FEAT_LINEBREAK - (char_u *)VAR_WIN, PV_NUW, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)8L, (char_u *)4L} SCRIPTID_INIT}, - {"omnifunc", "ofu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE, - #ifdef FEAT_COMPL_FUNC - (char_u *)&p_ofu, PV_OFU, ---- 2027,2057 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -! SCTX_INIT}, - {"mzquantum", "mzq", P_NUM, - #ifdef FEAT_MZSCHEME - (char_u *)&p_mzq, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)100L, (char_u *)100L} SCTX_INIT}, - {"novice", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"nrformats", "nf", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_nf, PV_NF, - {(char_u *)"bin,octal,hex", (char_u *)0L} -! SCTX_INIT}, - {"number", "nu", P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_NU, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"numberwidth", "nuw", P_NUM|P_RWIN|P_VIM, - #ifdef FEAT_LINEBREAK - (char_u *)VAR_WIN, PV_NUW, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)8L, (char_u *)4L} SCTX_INIT}, - {"omnifunc", "ofu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE, - #ifdef FEAT_COMPL_FUNC - (char_u *)&p_ofu, PV_OFU, -*************** -*** 2060,2069 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"open", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"opendevice", "odev", P_BOOL|P_VI_DEF, - #if defined(MSWIN) - (char_u *)&p_odev, PV_NONE, ---- 2060,2069 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"open", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"opendevice", "odev", P_BOOL|P_VI_DEF, - #if defined(MSWIN) - (char_u *)&p_odev, PV_NONE, -*************** -*** 2071,2101 **** - (char_u *)NULL, PV_NONE, - #endif - {(char_u *)FALSE, (char_u *)FALSE} -! SCRIPTID_INIT}, - {"operatorfunc", "opfunc", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_opfunc, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"optimize", "opt", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"osfiletype", "oft", P_STRING|P_ALLOCED|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"packpath", "pp", P_STRING|P_VI_DEF|P_EXPAND|P_ONECOMMA|P_NODUP - |P_SECURE, - (char_u *)&p_pp, PV_NONE, - {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L} -! SCRIPTID_INIT}, - {"paragraphs", "para", P_STRING|P_VI_DEF, - (char_u *)&p_para, PV_NONE, - {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp", -! (char_u *)0L} SCRIPTID_INIT}, - {"paste", NULL, P_BOOL|P_VI_DEF|P_PRI_MKRC, - (char_u *)&p_paste, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"pastetoggle", "pt", P_STRING|P_VI_DEF, - (char_u *)&p_pt, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"patchexpr", "pex", P_STRING|P_VI_DEF|P_SECURE, - #if defined(FEAT_DIFF) && defined(FEAT_EVAL) - (char_u *)&p_pex, PV_NONE, ---- 2071,2101 ---- - (char_u *)NULL, PV_NONE, - #endif - {(char_u *)FALSE, (char_u *)FALSE} -! SCTX_INIT}, - {"operatorfunc", "opfunc", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_opfunc, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"optimize", "opt", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"osfiletype", "oft", P_STRING|P_ALLOCED|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"packpath", "pp", P_STRING|P_VI_DEF|P_EXPAND|P_ONECOMMA|P_NODUP - |P_SECURE, - (char_u *)&p_pp, PV_NONE, - {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L} -! SCTX_INIT}, - {"paragraphs", "para", P_STRING|P_VI_DEF, - (char_u *)&p_para, PV_NONE, - {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp", -! (char_u *)0L} SCTX_INIT}, - {"paste", NULL, P_BOOL|P_VI_DEF|P_PRI_MKRC, - (char_u *)&p_paste, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"pastetoggle", "pt", P_STRING|P_VI_DEF, - (char_u *)&p_pt, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"patchexpr", "pex", P_STRING|P_VI_DEF|P_SECURE, - #if defined(FEAT_DIFF) && defined(FEAT_EVAL) - (char_u *)&p_pex, PV_NONE, -*************** -*** 2104,2113 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"patchmode", "pm", P_STRING|P_VI_DEF|P_NFNAME, - (char_u *)&p_pm, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"path", "pa", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_path, PV_PATH, - { ---- 2104,2113 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"patchmode", "pm", P_STRING|P_VI_DEF|P_NFNAME, - (char_u *)&p_pm, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"path", "pa", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_path, PV_PATH, - { -*************** -*** 2116,2122 **** - #else - (char_u *)".,/usr/include,,", - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"perldll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_PERL) - (char_u *)&p_perldll, PV_NONE, ---- 2116,2122 ---- - #else - (char_u *)".,/usr/include,,", - #endif -! (char_u *)0L} SCTX_INIT}, - {"perldll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_PERL) - (char_u *)&p_perldll, PV_NONE, -*************** -*** 2125,2148 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_pi, PV_PI, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"previewheight", "pvh", P_NUM|P_VI_DEF, - #if defined(FEAT_QUICKFIX) - (char_u *)&p_pvh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)12L, (char_u *)0L} SCRIPTID_INIT}, - {"previewwindow", "pvw", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB, - #if defined(FEAT_QUICKFIX) - (char_u *)VAR_WIN, PV_PVW, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"printdevice", "pdev", P_STRING|P_VI_DEF|P_SECURE, - #ifdef FEAT_PRINTER - (char_u *)&p_pdev, PV_NONE, ---- 2125,2148 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_pi, PV_PI, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"previewheight", "pvh", P_NUM|P_VI_DEF, - #if defined(FEAT_QUICKFIX) - (char_u *)&p_pvh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)12L, (char_u *)0L} SCTX_INIT}, - {"previewwindow", "pvw", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB, - #if defined(FEAT_QUICKFIX) - (char_u *)VAR_WIN, PV_PVW, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"printdevice", "pdev", P_STRING|P_VI_DEF|P_SECURE, - #ifdef FEAT_PRINTER - (char_u *)&p_pdev, PV_NONE, -*************** -*** 2151,2157 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"printencoding", "penc", P_STRING|P_VI_DEF, - #ifdef FEAT_POSTSCRIPT - (char_u *)&p_penc, PV_NONE, ---- 2151,2157 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"printencoding", "penc", P_STRING|P_VI_DEF, - #ifdef FEAT_POSTSCRIPT - (char_u *)&p_penc, PV_NONE, -*************** -*** 2160,2166 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"printexpr", "pexpr", P_STRING|P_VI_DEF|P_SECURE, - #ifdef FEAT_POSTSCRIPT - (char_u *)&p_pexpr, PV_NONE, ---- 2160,2166 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"printexpr", "pexpr", P_STRING|P_VI_DEF|P_SECURE, - #ifdef FEAT_POSTSCRIPT - (char_u *)&p_pexpr, PV_NONE, -*************** -*** 2169,2175 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"printfont", "pfn", P_STRING|P_VI_DEF, - #ifdef FEAT_PRINTER - (char_u *)&p_pfn, PV_NONE, ---- 2169,2175 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"printfont", "pfn", P_STRING|P_VI_DEF, - #ifdef FEAT_PRINTER - (char_u *)&p_pfn, PV_NONE, -*************** -*** 2184,2190 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"printheader", "pheader", P_STRING|P_VI_DEF|P_GETTEXT, - #ifdef FEAT_PRINTER - (char_u *)&p_header, PV_NONE, ---- 2184,2190 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"printheader", "pheader", P_STRING|P_VI_DEF|P_GETTEXT, - #ifdef FEAT_PRINTER - (char_u *)&p_header, PV_NONE, -*************** -*** 2195,2201 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"printmbcharset", "pmbcs", P_STRING|P_VI_DEF, - #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE) - (char_u *)&p_pmcs, PV_NONE, ---- 2195,2201 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"printmbcharset", "pmbcs", P_STRING|P_VI_DEF, - #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE) - (char_u *)&p_pmcs, PV_NONE, -*************** -*** 2204,2210 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"printmbfont", "pmbfn", P_STRING|P_VI_DEF, - #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE) - (char_u *)&p_pmfn, PV_NONE, ---- 2204,2210 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"printmbfont", "pmbfn", P_STRING|P_VI_DEF, - #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE) - (char_u *)&p_pmfn, PV_NONE, -*************** -*** 2213,2219 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"printoptions", "popt", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_PRINTER - (char_u *)&p_popt, PV_NONE, ---- 2213,2219 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"printoptions", "popt", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_PRINTER - (char_u *)&p_popt, PV_NONE, -*************** -*** 2222,2245 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"prompt", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_prompt, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"pumheight", "ph", P_NUM|P_VI_DEF, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_ph, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"pumwidth", "pw", P_NUM|P_VI_DEF, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_pw, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)15L, (char_u *)15L} SCRIPTID_INIT}, - {"pythonthreedll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_PYTHON3) - (char_u *)&p_py3dll, PV_NONE, ---- 2222,2245 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"prompt", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_prompt, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"pumheight", "ph", P_NUM|P_VI_DEF, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_ph, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"pumwidth", "pw", P_NUM|P_VI_DEF, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_pw, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)15L, (char_u *)15L} SCTX_INIT}, - {"pythonthreedll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_PYTHON3) - (char_u *)&p_py3dll, PV_NONE, -*************** -*** 2248,2254 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"pythonthreehome", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(FEAT_PYTHON3) - (char_u *)&p_py3home, PV_NONE, ---- 2248,2254 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"pythonthreehome", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(FEAT_PYTHON3) - (char_u *)&p_py3home, PV_NONE, -*************** -*** 2257,2263 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"pythondll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_PYTHON) - (char_u *)&p_pydll, PV_NONE, ---- 2257,2263 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"pythondll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_PYTHON) - (char_u *)&p_pydll, PV_NONE, -*************** -*** 2266,2272 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"pythonhome", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(FEAT_PYTHON) - (char_u *)&p_pyhome, PV_NONE, ---- 2266,2272 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"pythonhome", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(FEAT_PYTHON) - (char_u *)&p_pyhome, PV_NONE, -*************** -*** 2275,2281 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"pyxversion", "pyx", P_NUM|P_VI_DEF|P_SECURE, - #if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) - (char_u *)&p_pyx, PV_NONE, ---- 2275,2281 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"pyxversion", "pyx", P_NUM|P_VI_DEF|P_SECURE, - #if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) - (char_u *)&p_pyx, PV_NONE, -*************** -*** 2283,2289 **** - (char_u *)NULL, PV_NONE, - #endif - {(char_u *)DEFAULT_PYTHON_VER, (char_u *)0L} -! SCRIPTID_INIT}, - {"quoteescape", "qe", P_STRING|P_ALLOCED|P_VI_DEF, - #ifdef FEAT_TEXTOBJ - (char_u *)&p_qe, PV_QE, ---- 2283,2289 ---- - (char_u *)NULL, PV_NONE, - #endif - {(char_u *)DEFAULT_PYTHON_VER, (char_u *)0L} -! SCTX_INIT}, - {"quoteescape", "qe", P_STRING|P_ALLOCED|P_VI_DEF, - #ifdef FEAT_TEXTOBJ - (char_u *)&p_qe, PV_QE, -*************** -*** 2292,2320 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"readonly", "ro", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB, - (char_u *)&p_ro, PV_RO, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"redraw", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"redrawtime", "rdt", P_NUM|P_VI_DEF, - #ifdef FEAT_RELTIME - (char_u *)&p_rdt, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)2000L, (char_u *)0L} SCRIPTID_INIT}, - {"regexpengine", "re", P_NUM|P_VI_DEF, - (char_u *)&p_re, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"relativenumber", "rnu", P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_RNU, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"remap", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_remap, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"renderoptions", "rop", P_STRING|P_ONECOMMA|P_RCLR|P_VI_DEF, - #ifdef FEAT_RENDER_OPTIONS - (char_u *)&p_rop, PV_NONE, ---- 2292,2320 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"readonly", "ro", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB, - (char_u *)&p_ro, PV_RO, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"redraw", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"redrawtime", "rdt", P_NUM|P_VI_DEF, - #ifdef FEAT_RELTIME - (char_u *)&p_rdt, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)2000L, (char_u *)0L} SCTX_INIT}, - {"regexpengine", "re", P_NUM|P_VI_DEF, - (char_u *)&p_re, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"relativenumber", "rnu", P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_RNU, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"remap", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_remap, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"renderoptions", "rop", P_STRING|P_ONECOMMA|P_RCLR|P_VI_DEF, - #ifdef FEAT_RENDER_OPTIONS - (char_u *)&p_rop, PV_NONE, -*************** -*** 2323,2353 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"report", NULL, P_NUM|P_VI_DEF, - (char_u *)&p_report, PV_NONE, -! {(char_u *)2L, (char_u *)0L} SCRIPTID_INIT}, - {"restorescreen", "rs", P_BOOL|P_VI_DEF, - #ifdef WIN3264 - (char_u *)&p_rs, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"revins", "ri", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_RIGHTLEFT - (char_u *)&p_ri, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"rightleft", "rl", P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_RIGHTLEFT - (char_u *)VAR_WIN, PV_RL, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"rightleftcmd", "rlc", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN, - #ifdef FEAT_RIGHTLEFT - (char_u *)VAR_WIN, PV_RLC, ---- 2323,2353 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"report", NULL, P_NUM|P_VI_DEF, - (char_u *)&p_report, PV_NONE, -! {(char_u *)2L, (char_u *)0L} SCTX_INIT}, - {"restorescreen", "rs", P_BOOL|P_VI_DEF, - #ifdef WIN3264 - (char_u *)&p_rs, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"revins", "ri", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_RIGHTLEFT - (char_u *)&p_ri, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"rightleft", "rl", P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_RIGHTLEFT - (char_u *)VAR_WIN, PV_RL, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"rightleftcmd", "rlc", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN, - #ifdef FEAT_RIGHTLEFT - (char_u *)VAR_WIN, PV_RLC, -*************** -*** 2356,2362 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"rubydll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_RUBY) - (char_u *)&p_rubydll, PV_NONE, ---- 2356,2362 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"rubydll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_RUBY) - (char_u *)&p_rubydll, PV_NONE, -*************** -*** 2365,2420 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"ruler", "ru", P_BOOL|P_VI_DEF|P_VIM|P_RSTAT, - #ifdef FEAT_CMDL_INFO - (char_u *)&p_ru, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"rulerformat", "ruf", P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT, - #ifdef FEAT_STL_OPT - (char_u *)&p_ruf, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"runtimepath", "rtp", P_STRING|P_VI_DEF|P_EXPAND|P_ONECOMMA|P_NODUP - |P_SECURE, - (char_u *)&p_rtp, PV_NONE, - {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L} -! SCRIPTID_INIT}, - {"scroll", "scr", P_NUM|P_NO_MKRC|P_VI_DEF, - (char_u *)VAR_WIN, PV_SCROLL, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"scrollbind", "scb", P_BOOL|P_VI_DEF, - (char_u *)VAR_WIN, PV_SCBIND, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"scrolljump", "sj", P_NUM|P_VI_DEF|P_VIM, - (char_u *)&p_sj, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"scrolloff", "so", P_NUM|P_VI_DEF|P_VIM|P_RALL, - (char_u *)&p_so, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"scrollopt", "sbo", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_sbo, PV_NONE, - {(char_u *)"ver,jump", (char_u *)0L} -! SCRIPTID_INIT}, - {"sections", "sect", P_STRING|P_VI_DEF, - (char_u *)&p_sections, PV_NONE, - {(char_u *)"SHNHH HUnhsh", (char_u *)0L} -! SCRIPTID_INIT}, - {"secure", NULL, P_BOOL|P_VI_DEF|P_SECURE, - (char_u *)&p_secure, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"selection", "sel", P_STRING|P_VI_DEF, - (char_u *)&p_sel, PV_NONE, - {(char_u *)"inclusive", (char_u *)0L} -! SCRIPTID_INIT}, - {"selectmode", "slm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_slm, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_SESSION - (char_u *)&p_ssop, PV_NONE, ---- 2365,2420 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"ruler", "ru", P_BOOL|P_VI_DEF|P_VIM|P_RSTAT, - #ifdef FEAT_CMDL_INFO - (char_u *)&p_ru, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"rulerformat", "ruf", P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT, - #ifdef FEAT_STL_OPT - (char_u *)&p_ruf, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"runtimepath", "rtp", P_STRING|P_VI_DEF|P_EXPAND|P_ONECOMMA|P_NODUP - |P_SECURE, - (char_u *)&p_rtp, PV_NONE, - {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L} -! SCTX_INIT}, - {"scroll", "scr", P_NUM|P_NO_MKRC|P_VI_DEF, - (char_u *)VAR_WIN, PV_SCROLL, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"scrollbind", "scb", P_BOOL|P_VI_DEF, - (char_u *)VAR_WIN, PV_SCBIND, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"scrolljump", "sj", P_NUM|P_VI_DEF|P_VIM, - (char_u *)&p_sj, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCTX_INIT}, - {"scrolloff", "so", P_NUM|P_VI_DEF|P_VIM|P_RALL, - (char_u *)&p_so, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"scrollopt", "sbo", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_sbo, PV_NONE, - {(char_u *)"ver,jump", (char_u *)0L} -! SCTX_INIT}, - {"sections", "sect", P_STRING|P_VI_DEF, - (char_u *)&p_sections, PV_NONE, - {(char_u *)"SHNHH HUnhsh", (char_u *)0L} -! SCTX_INIT}, - {"secure", NULL, P_BOOL|P_VI_DEF|P_SECURE, - (char_u *)&p_secure, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"selection", "sel", P_STRING|P_VI_DEF, - (char_u *)&p_sel, PV_NONE, - {(char_u *)"inclusive", (char_u *)0L} -! SCTX_INIT}, - {"selectmode", "slm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_slm, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_SESSION - (char_u *)&p_ssop, PV_NONE, -*************** -*** 2424,2430 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"shell", "sh", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_sh, PV_NONE, - { ---- 2424,2430 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"shell", "sh", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_sh, PV_NONE, - { -*************** -*** 2437,2443 **** - (char_u *)"sh", - # endif - #endif /* VMS */ -! (char_u *)0L} SCRIPTID_INIT}, - {"shellcmdflag","shcf", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_shcf, PV_NONE, - { ---- 2437,2443 ---- - (char_u *)"sh", - # endif - #endif /* VMS */ -! (char_u *)0L} SCTX_INIT}, - {"shellcmdflag","shcf", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_shcf, PV_NONE, - { -*************** -*** 2446,2452 **** - #else - (char_u *)"-c", - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"shellpipe", "sp", P_STRING|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_sp, PV_NONE, ---- 2446,2452 ---- - #else - (char_u *)"-c", - #endif -! (char_u *)0L} SCTX_INIT}, - {"shellpipe", "sp", P_STRING|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_sp, PV_NONE, -*************** -*** 2461,2490 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"shellquote", "shq", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_shq, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"shellredir", "srr", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_srr, PV_NONE, -! {(char_u *)">", (char_u *)0L} SCRIPTID_INIT}, - {"shellslash", "ssl", P_BOOL|P_VI_DEF, - #ifdef BACKSLASH_IN_FILENAME - (char_u *)&p_ssl, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"shelltemp", "stmp", P_BOOL, - (char_u *)&p_stmp, PV_NONE, -! {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"shelltype", "st", P_NUM|P_VI_DEF, - #ifdef AMIGA - (char_u *)&p_st, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"shellxquote", "sxq", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_sxq, PV_NONE, - { ---- 2461,2490 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"shellquote", "shq", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_shq, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"shellredir", "srr", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_srr, PV_NONE, -! {(char_u *)">", (char_u *)0L} SCTX_INIT}, - {"shellslash", "ssl", P_BOOL|P_VI_DEF, - #ifdef BACKSLASH_IN_FILENAME - (char_u *)&p_ssl, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"shelltemp", "stmp", P_BOOL, - (char_u *)&p_stmp, PV_NONE, -! {(char_u *)FALSE, (char_u *)TRUE} SCTX_INIT}, - {"shelltype", "st", P_NUM|P_VI_DEF, - #ifdef AMIGA - (char_u *)&p_st, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"shellxquote", "sxq", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_sxq, PV_NONE, - { -*************** -*** 2493,2499 **** - #else - (char_u *)"", - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"shellxescape", "sxe", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_sxe, PV_NONE, - { ---- 2493,2499 ---- - #else - (char_u *)"", - #endif -! (char_u *)0L} SCTX_INIT}, - {"shellxescape", "sxe", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_sxe, PV_NONE, - { -*************** -*** 2502,2528 **** - #else - (char_u *)"", - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"shiftround", "sr", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_sr, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"shiftwidth", "sw", P_NUM|P_VI_DEF, - (char_u *)&p_sw, PV_SW, -! {(char_u *)8L, (char_u *)0L} SCRIPTID_INIT}, - {"shortmess", "shm", P_STRING|P_VIM|P_FLAGLIST, - (char_u *)&p_shm, PV_NONE, - {(char_u *)"", (char_u *)"filnxtToO"} -! SCRIPTID_INIT}, - {"shortname", "sn", P_BOOL|P_VI_DEF, - (char_u *)&p_sn, PV_SN, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"showbreak", "sbr", P_STRING|P_VI_DEF|P_RALL, - #ifdef FEAT_LINEBREAK - (char_u *)&p_sbr, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"showcmd", "sc", P_BOOL|P_VIM, - #ifdef FEAT_CMDL_INFO - (char_u *)&p_sc, PV_NONE, ---- 2502,2528 ---- - #else - (char_u *)"", - #endif -! (char_u *)0L} SCTX_INIT}, - {"shiftround", "sr", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_sr, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"shiftwidth", "sw", P_NUM|P_VI_DEF, - (char_u *)&p_sw, PV_SW, -! {(char_u *)8L, (char_u *)0L} SCTX_INIT}, - {"shortmess", "shm", P_STRING|P_VIM|P_FLAGLIST, - (char_u *)&p_shm, PV_NONE, - {(char_u *)"", (char_u *)"filnxtToO"} -! SCTX_INIT}, - {"shortname", "sn", P_BOOL|P_VI_DEF, - (char_u *)&p_sn, PV_SN, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"showbreak", "sbr", P_STRING|P_VI_DEF|P_RALL, - #ifdef FEAT_LINEBREAK - (char_u *)&p_sbr, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"showcmd", "sc", P_BOOL|P_VIM, - #ifdef FEAT_CMDL_INFO - (char_u *)&p_sc, PV_NONE, -*************** -*** 2535,2559 **** - #else - (char_u *)TRUE - #endif -! } SCRIPTID_INIT}, - {"showfulltag", "sft", P_BOOL|P_VI_DEF, - (char_u *)&p_sft, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"showmatch", "sm", P_BOOL|P_VI_DEF, - (char_u *)&p_sm, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"showmode", "smd", P_BOOL|P_VIM, - (char_u *)&p_smd, PV_NONE, -! {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"showtabline", "stal", P_NUM|P_VI_DEF|P_RALL, - (char_u *)&p_stal, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"sidescroll", "ss", P_NUM|P_VI_DEF, - (char_u *)&p_ss, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"sidescrolloff", "siso", P_NUM|P_VI_DEF|P_VIM|P_RBUF, - (char_u *)&p_siso, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"signcolumn", "scl", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN, - #ifdef FEAT_SIGNS - (char_u *)VAR_WIN, PV_SCL, ---- 2535,2559 ---- - #else - (char_u *)TRUE - #endif -! } SCTX_INIT}, - {"showfulltag", "sft", P_BOOL|P_VI_DEF, - (char_u *)&p_sft, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"showmatch", "sm", P_BOOL|P_VI_DEF, - (char_u *)&p_sm, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"showmode", "smd", P_BOOL|P_VIM, - (char_u *)&p_smd, PV_NONE, -! {(char_u *)FALSE, (char_u *)TRUE} SCTX_INIT}, - {"showtabline", "stal", P_NUM|P_VI_DEF|P_RALL, - (char_u *)&p_stal, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCTX_INIT}, - {"sidescroll", "ss", P_NUM|P_VI_DEF, - (char_u *)&p_ss, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"sidescrolloff", "siso", P_NUM|P_VI_DEF|P_VIM|P_RBUF, - (char_u *)&p_siso, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"signcolumn", "scl", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN, - #ifdef FEAT_SIGNS - (char_u *)VAR_WIN, PV_SCL, -*************** -*** 2562,2597 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"slowopen", "slow", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"smartcase", "scs", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_scs, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"smartindent", "si", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_SMARTINDENT - (char_u *)&p_si, PV_SI, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"smarttab", "sta", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_sta, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"softtabstop", "sts", P_NUM|P_VI_DEF|P_VIM, - (char_u *)&p_sts, PV_STS, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"sourceany", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"spell", NULL, P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_SPELL - (char_u *)VAR_WIN, PV_SPELL, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"spellcapcheck", "spc", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF, - #ifdef FEAT_SPELL - (char_u *)&p_spc, PV_SPC, ---- 2562,2597 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"slowopen", "slow", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"smartcase", "scs", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_scs, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"smartindent", "si", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_SMARTINDENT - (char_u *)&p_si, PV_SI, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"smarttab", "sta", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_sta, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"softtabstop", "sts", P_NUM|P_VI_DEF|P_VIM, - (char_u *)&p_sts, PV_STS, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"sourceany", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"spell", NULL, P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_SPELL - (char_u *)VAR_WIN, PV_SPELL, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"spellcapcheck", "spc", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF, - #ifdef FEAT_SPELL - (char_u *)&p_spc, PV_SPC, -*************** -*** 2600,2606 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"spellfile", "spf", P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE - |P_ONECOMMA, - #ifdef FEAT_SPELL ---- 2600,2606 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"spellfile", "spf", P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE - |P_ONECOMMA, - #ifdef FEAT_SPELL -*************** -*** 2610,2616 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"spelllang", "spl", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA - |P_RBUF|P_EXPAND, - #ifdef FEAT_SPELL ---- 2610,2616 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"spelllang", "spl", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA - |P_RBUF|P_EXPAND, - #ifdef FEAT_SPELL -*************** -*** 2620,2626 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_ONECOMMA, - #ifdef FEAT_SPELL - (char_u *)&p_sps, PV_NONE, ---- 2620,2626 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_ONECOMMA, - #ifdef FEAT_SPELL - (char_u *)&p_sps, PV_NONE, -*************** -*** 2629,2655 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"splitbelow", "sb", P_BOOL|P_VI_DEF, - (char_u *)&p_sb, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"splitright", "spr", P_BOOL|P_VI_DEF, - (char_u *)&p_spr, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"startofline", "sol", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_sol, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"statusline" ,"stl", P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT, - #ifdef FEAT_STL_OPT - (char_u *)&p_stl, PV_STL, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"suffixes", "su", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_su, PV_NONE, - {(char_u *)".bak,~,.o,.h,.info,.swp,.obj", -! (char_u *)0L} SCRIPTID_INIT}, - {"suffixesadd", "sua", P_STRING|P_VI_DEF|P_ALLOCED|P_ONECOMMA|P_NODUP, - #ifdef FEAT_SEARCHPATH - (char_u *)&p_sua, PV_SUA, ---- 2629,2655 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"splitbelow", "sb", P_BOOL|P_VI_DEF, - (char_u *)&p_sb, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"splitright", "spr", P_BOOL|P_VI_DEF, - (char_u *)&p_spr, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"startofline", "sol", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_sol, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"statusline" ,"stl", P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT, - #ifdef FEAT_STL_OPT - (char_u *)&p_stl, PV_STL, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"suffixes", "su", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_su, PV_NONE, - {(char_u *)".bak,~,.o,.h,.info,.swp,.obj", -! (char_u *)0L} SCTX_INIT}, - {"suffixesadd", "sua", P_STRING|P_VI_DEF|P_ALLOCED|P_ONECOMMA|P_NODUP, - #ifdef FEAT_SEARCHPATH - (char_u *)&p_sua, PV_SUA, -*************** -*** 2658,2673 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"swapfile", "swf", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)&p_swf, PV_SWF, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"swapsync", "sws", P_STRING|P_VI_DEF, - (char_u *)&p_sws, PV_NONE, -! {(char_u *)"fsync", (char_u *)0L} SCRIPTID_INIT}, - {"switchbuf", "swb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_swb, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"synmaxcol", "smc", P_NUM|P_VI_DEF|P_RBUF, - #ifdef FEAT_SYN_HL - (char_u *)&p_smc, PV_SMC, ---- 2658,2673 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"swapfile", "swf", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)&p_swf, PV_SWF, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"swapsync", "sws", P_STRING|P_VI_DEF, - (char_u *)&p_sws, PV_NONE, -! {(char_u *)"fsync", (char_u *)0L} SCTX_INIT}, - {"switchbuf", "swb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_swb, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"synmaxcol", "smc", P_NUM|P_VI_DEF|P_RBUF, - #ifdef FEAT_SYN_HL - (char_u *)&p_smc, PV_SMC, -*************** -*** 2676,2682 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"syntax", "syn", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, - #ifdef FEAT_SYN_HL - (char_u *)&p_syn, PV_SYN, ---- 2676,2682 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"syntax", "syn", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, - #ifdef FEAT_SYN_HL - (char_u *)&p_syn, PV_SYN, -*************** -*** 2685,2704 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"tabline", "tal", P_STRING|P_VI_DEF|P_RALL, - #ifdef FEAT_STL_OPT - (char_u *)&p_tal, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"tabpagemax", "tpm", P_NUM|P_VI_DEF, - (char_u *)&p_tpm, PV_NONE, -! {(char_u *)10L, (char_u *)0L} SCRIPTID_INIT}, - {"tabstop", "ts", P_NUM|P_VI_DEF|P_RBUF, - (char_u *)&p_ts, PV_TS, -! {(char_u *)8L, (char_u *)0L} SCRIPTID_INIT}, - {"tagbsearch", "tbs", P_BOOL|P_VI_DEF, - (char_u *)&p_tbs, PV_NONE, - #ifdef VMS /* binary searching doesn't appear to work on VMS */ ---- 2685,2704 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"tabline", "tal", P_STRING|P_VI_DEF|P_RALL, - #ifdef FEAT_STL_OPT - (char_u *)&p_tal, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"tabpagemax", "tpm", P_NUM|P_VI_DEF, - (char_u *)&p_tpm, PV_NONE, -! {(char_u *)10L, (char_u *)0L} SCTX_INIT}, - {"tabstop", "ts", P_NUM|P_VI_DEF|P_RBUF, - (char_u *)&p_ts, PV_TS, -! {(char_u *)8L, (char_u *)0L} SCTX_INIT}, - {"tagbsearch", "tbs", P_BOOL|P_VI_DEF, - (char_u *)&p_tbs, PV_NONE, - #ifdef VMS /* binary searching doesn't appear to work on VMS */ -*************** -*** 2706,2721 **** - #else - {(char_u *)TRUE, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"tagcase", "tc", P_STRING|P_VIM, - (char_u *)&p_tc, PV_TC, -! {(char_u *)"followic", (char_u *)"followic"} SCRIPTID_INIT}, - {"taglength", "tl", P_NUM|P_VI_DEF, - (char_u *)&p_tl, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"tagrelative", "tr", P_BOOL|P_VIM, - (char_u *)&p_tr, PV_NONE, -! {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"tags", "tag", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_tags, PV_TAGS, - { ---- 2706,2721 ---- - #else - {(char_u *)TRUE, (char_u *)0L} - #endif -! SCTX_INIT}, - {"tagcase", "tc", P_STRING|P_VIM, - (char_u *)&p_tc, PV_TC, -! {(char_u *)"followic", (char_u *)"followic"} SCTX_INIT}, - {"taglength", "tl", P_NUM|P_VI_DEF, - (char_u *)&p_tl, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"tagrelative", "tr", P_BOOL|P_VIM, - (char_u *)&p_tr, PV_NONE, -! {(char_u *)FALSE, (char_u *)TRUE} SCTX_INIT}, - {"tags", "tag", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_tags, PV_TAGS, - { -*************** -*** 2724,2733 **** - #else - (char_u *)"./tags,tags", - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"tagstack", "tgst", P_BOOL|P_VI_DEF, - (char_u *)&p_tgst, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"tcldll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_TCL) - (char_u *)&p_tcldll, PV_NONE, ---- 2724,2733 ---- - #else - (char_u *)"./tags,tags", - #endif -! (char_u *)0L} SCTX_INIT}, - {"tagstack", "tgst", P_BOOL|P_VI_DEF, - (char_u *)&p_tgst, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"tcldll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(DYNAMIC_TCL) - (char_u *)&p_tcldll, PV_NONE, -*************** -*** 2736,2752 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"term", NULL, P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL, - (char_u *)&T_NAME, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"termbidi", "tbidi", P_BOOL|P_VI_DEF, - #ifdef FEAT_ARABIC - (char_u *)&p_tbidi, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"termencoding", "tenc", P_STRING|P_VI_DEF|P_RCLR, - #ifdef FEAT_MBYTE - (char_u *)&p_tenc, PV_NONE, ---- 2736,2752 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"term", NULL, P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL, - (char_u *)&T_NAME, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"termbidi", "tbidi", P_BOOL|P_VI_DEF, - #ifdef FEAT_ARABIC - (char_u *)&p_tbidi, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"termencoding", "tenc", P_STRING|P_VI_DEF|P_RCLR, - #ifdef FEAT_MBYTE - (char_u *)&p_tenc, PV_NONE, -*************** -*** 2755,2761 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"termguicolors", "tgc", P_BOOL|P_VI_DEF|P_VIM|P_RCLR, - #ifdef FEAT_TERMGUICOLORS - (char_u *)&p_tgc, PV_NONE, ---- 2755,2761 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"termguicolors", "tgc", P_BOOL|P_VI_DEF|P_VIM|P_RCLR, - #ifdef FEAT_TERMGUICOLORS - (char_u *)&p_tgc, PV_NONE, -*************** -*** 2764,2770 **** - (char_u*)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)FALSE} - #endif -! SCRIPTID_INIT}, - {"termwinkey", "twk", P_STRING|P_ALLOCED|P_RWIN|P_VI_DEF, - #ifdef FEAT_TERMINAL - (char_u *)VAR_WIN, PV_TWK, ---- 2764,2770 ---- - (char_u*)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)FALSE} - #endif -! SCTX_INIT}, - {"termwinkey", "twk", P_STRING|P_ALLOCED|P_RWIN|P_VI_DEF, - #ifdef FEAT_TERMINAL - (char_u *)VAR_WIN, PV_TWK, -*************** -*** 2773,2779 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"termwinscroll", "twsl", P_NUM|P_VI_DEF|P_VIM|P_RBUF, - #ifdef FEAT_TERMINAL - (char_u *)&p_twsl, PV_TWSL, ---- 2773,2779 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"termwinscroll", "twsl", P_NUM|P_VI_DEF|P_VIM|P_RBUF, - #ifdef FEAT_TERMINAL - (char_u *)&p_twsl, PV_TWSL, -*************** -*** 2782,2788 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"termwinsize", "tws", P_STRING|P_ALLOCED|P_RWIN|P_VI_DEF, - #ifdef FEAT_TERMINAL - (char_u *)VAR_WIN, PV_TWS, ---- 2782,2788 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"termwinsize", "tws", P_STRING|P_ALLOCED|P_RWIN|P_VI_DEF, - #ifdef FEAT_TERMINAL - (char_u *)VAR_WIN, PV_TWS, -*************** -*** 2791,2804 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"terse", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_terse, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"textauto", "ta", P_BOOL|P_VIM, - (char_u *)&p_ta, PV_NONE, - {(char_u *)DFLT_TEXTAUTO, (char_u *)TRUE} -! SCRIPTID_INIT}, - {"textmode", "tx", P_BOOL|P_VI_DEF|P_NO_MKRC, - (char_u *)&p_tx, PV_TX, - { ---- 2791,2804 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"terse", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_terse, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"textauto", "ta", P_BOOL|P_VIM, - (char_u *)&p_ta, PV_NONE, - {(char_u *)DFLT_TEXTAUTO, (char_u *)TRUE} -! SCTX_INIT}, - {"textmode", "tx", P_BOOL|P_VI_DEF|P_NO_MKRC, - (char_u *)&p_tx, PV_TX, - { -*************** -*** 2807,2846 **** - #else - (char_u *)FALSE, - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM|P_RBUF, - (char_u *)&p_tw, PV_TW, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP|P_NDNAME, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_tsr, PV_TSR, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"tildeop", "top", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_to, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"timeout", "to", P_BOOL|P_VI_DEF, - (char_u *)&p_timeout, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"timeoutlen", "tm", P_NUM|P_VI_DEF, - (char_u *)&p_tm, PV_NONE, -! {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT}, - {"title", NULL, P_BOOL|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_title, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"titlelen", NULL, P_NUM|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_titlelen, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)85L, (char_u *)0L} SCRIPTID_INIT}, - {"titleold", NULL, P_STRING|P_VI_DEF|P_GETTEXT|P_SECURE|P_NO_MKRC, - #ifdef FEAT_TITLE - (char_u *)&p_titleold, PV_NONE, ---- 2807,2846 ---- - #else - (char_u *)FALSE, - #endif -! (char_u *)0L} SCTX_INIT}, - {"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM|P_RBUF, - (char_u *)&p_tw, PV_TW, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP|P_NDNAME, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_tsr, PV_TSR, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"tildeop", "top", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_to, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"timeout", "to", P_BOOL|P_VI_DEF, - (char_u *)&p_timeout, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"timeoutlen", "tm", P_NUM|P_VI_DEF, - (char_u *)&p_tm, PV_NONE, -! {(char_u *)1000L, (char_u *)0L} SCTX_INIT}, - {"title", NULL, P_BOOL|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_title, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"titlelen", NULL, P_NUM|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_titlelen, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)85L, (char_u *)0L} SCTX_INIT}, - {"titleold", NULL, P_STRING|P_VI_DEF|P_GETTEXT|P_SECURE|P_NO_MKRC, - #ifdef FEAT_TITLE - (char_u *)&p_titleold, PV_NONE, -*************** -*** 2850,2863 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"titlestring", NULL, P_STRING|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_titlestring, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"toolbar", "tb", P_STRING|P_ONECOMMA|P_VI_DEF|P_NODUP, - #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) - (char_u *)&p_toolbar, PV_NONE, ---- 2850,2863 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"titlestring", NULL, P_STRING|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_titlestring, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"toolbar", "tb", P_STRING|P_ONECOMMA|P_VI_DEF|P_NODUP, - #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) - (char_u *)&p_toolbar, PV_NONE, -*************** -*** 2866,2872 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"toolbariconsize", "tbis", P_STRING|P_VI_DEF, - #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) - (char_u *)&p_tbis, PV_NONE, ---- 2866,2872 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"toolbariconsize", "tbis", P_STRING|P_VI_DEF, - #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) - (char_u *)&p_tbis, PV_NONE, -*************** -*** 2875,2906 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"ttimeout", NULL, P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_ttimeout, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"ttimeoutlen", "ttm", P_NUM|P_VI_DEF, - (char_u *)&p_ttm, PV_NONE, -! {(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT}, - {"ttybuiltin", "tbi", P_BOOL|P_VI_DEF, - (char_u *)&p_tbi, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"ttyfast", "tf", P_BOOL|P_NO_MKRC|P_VI_DEF, - (char_u *)&p_tf, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"ttymouse", "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF, - #if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS)) - (char_u *)&p_ttym, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"ttyscroll", "tsl", P_NUM|P_VI_DEF, - (char_u *)&p_ttyscroll, PV_NONE, -! {(char_u *)999L, (char_u *)0L} SCRIPTID_INIT}, - {"ttytype", "tty", P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL, - (char_u *)&T_NAME, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"undodir", "udir", P_STRING|P_EXPAND|P_ONECOMMA|P_NODUP|P_SECURE - |P_VI_DEF, - #ifdef FEAT_PERSISTENT_UNDO ---- 2875,2906 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"ttimeout", NULL, P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_ttimeout, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"ttimeoutlen", "ttm", P_NUM|P_VI_DEF, - (char_u *)&p_ttm, PV_NONE, -! {(char_u *)-1L, (char_u *)0L} SCTX_INIT}, - {"ttybuiltin", "tbi", P_BOOL|P_VI_DEF, - (char_u *)&p_tbi, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"ttyfast", "tf", P_BOOL|P_NO_MKRC|P_VI_DEF, - (char_u *)&p_tf, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"ttymouse", "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF, - #if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS)) - (char_u *)&p_ttym, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"ttyscroll", "tsl", P_NUM|P_VI_DEF, - (char_u *)&p_ttyscroll, PV_NONE, -! {(char_u *)999L, (char_u *)0L} SCTX_INIT}, - {"ttytype", "tty", P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL, - (char_u *)&T_NAME, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"undodir", "udir", P_STRING|P_EXPAND|P_ONECOMMA|P_NODUP|P_SECURE - |P_VI_DEF, - #ifdef FEAT_PERSISTENT_UNDO -*************** -*** 2910,2923 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"undofile", "udf", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_PERSISTENT_UNDO - (char_u *)&p_udf, PV_UDF, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"undolevels", "ul", P_NUM|P_VI_DEF, - (char_u *)&p_ul, PV_UL, - { ---- 2910,2923 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"undofile", "udf", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_PERSISTENT_UNDO - (char_u *)&p_udf, PV_UDF, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"undolevels", "ul", P_NUM|P_VI_DEF, - (char_u *)&p_ul, PV_UL, - { -*************** -*** 2926,2941 **** - #else - (char_u *)100L, - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"undoreload", "ur", P_NUM|P_VI_DEF, - (char_u *)&p_ur, PV_NONE, -! { (char_u *)10000L, (char_u *)0L} SCRIPTID_INIT}, - {"updatecount", "uc", P_NUM|P_VI_DEF, - (char_u *)&p_uc, PV_NONE, -! {(char_u *)200L, (char_u *)0L} SCRIPTID_INIT}, - {"updatetime", "ut", P_NUM|P_VI_DEF, - (char_u *)&p_ut, PV_NONE, -! {(char_u *)4000L, (char_u *)0L} SCRIPTID_INIT}, - {"varsofttabstop", "vsts", P_STRING|P_VI_DEF|P_VIM|P_COMMA, - #ifdef FEAT_VARTABS - (char_u *)&p_vsts, PV_VSTS, ---- 2926,2941 ---- - #else - (char_u *)100L, - #endif -! (char_u *)0L} SCTX_INIT}, - {"undoreload", "ur", P_NUM|P_VI_DEF, - (char_u *)&p_ur, PV_NONE, -! { (char_u *)10000L, (char_u *)0L} SCTX_INIT}, - {"updatecount", "uc", P_NUM|P_VI_DEF, - (char_u *)&p_uc, PV_NONE, -! {(char_u *)200L, (char_u *)0L} SCTX_INIT}, - {"updatetime", "ut", P_NUM|P_VI_DEF, - (char_u *)&p_ut, PV_NONE, -! {(char_u *)4000L, (char_u *)0L} SCTX_INIT}, - {"varsofttabstop", "vsts", P_STRING|P_VI_DEF|P_VIM|P_COMMA, - #ifdef FEAT_VARTABS - (char_u *)&p_vsts, PV_VSTS, -*************** -*** 2944,2950 **** - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)NULL} - #endif -! SCRIPTID_INIT}, - {"vartabstop", "vts", P_STRING|P_VI_DEF|P_VIM|P_RBUF|P_COMMA, - #ifdef FEAT_VARTABS - (char_u *)&p_vts, PV_VTS, ---- 2944,2950 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)NULL} - #endif -! SCTX_INIT}, - {"vartabstop", "vts", P_STRING|P_VI_DEF|P_VIM|P_RBUF|P_COMMA, - #ifdef FEAT_VARTABS - (char_u *)&p_vts, PV_VTS, -*************** -*** 2953,2965 **** - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)NULL} - #endif -! SCRIPTID_INIT}, - {"verbose", "vbs", P_NUM|P_VI_DEF, - (char_u *)&p_verbose, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"verbosefile", "vfile", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_vfile, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"viewdir", "vdir", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_SESSION - (char_u *)&p_vdir, PV_NONE, ---- 2953,2965 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)NULL} - #endif -! SCTX_INIT}, - {"verbose", "vbs", P_NUM|P_VI_DEF, - (char_u *)&p_verbose, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"verbosefile", "vfile", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_vfile, PV_NONE, -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"viewdir", "vdir", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_SESSION - (char_u *)&p_vdir, PV_NONE, -*************** -*** 2968,2974 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"viewoptions", "vop", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_SESSION - (char_u *)&p_vop, PV_NONE, ---- 2968,2974 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"viewoptions", "vop", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_SESSION - (char_u *)&p_vop, PV_NONE, -*************** -*** 2978,2984 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"viminfo", "vi", P_STRING|P_ONECOMMA|P_NODUP|P_SECURE, - #ifdef FEAT_VIMINFO - (char_u *)&p_viminfo, PV_NONE, ---- 2978,2984 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"viminfo", "vi", P_STRING|P_ONECOMMA|P_NODUP|P_SECURE, - #ifdef FEAT_VIMINFO - (char_u *)&p_viminfo, PV_NONE, -*************** -*** 2996,3002 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"viminfofile", "vif", P_STRING|P_EXPAND|P_ONECOMMA|P_NODUP - |P_SECURE|P_VI_DEF, - #ifdef FEAT_VIMINFO ---- 2996,3002 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"viminfofile", "vif", P_STRING|P_EXPAND|P_ONECOMMA|P_NODUP - |P_SECURE|P_VI_DEF, - #ifdef FEAT_VIMINFO -*************** -*** 3006,3012 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"virtualedit", "ve", P_STRING|P_ONECOMMA|P_NODUP|P_VI_DEF - |P_VIM|P_CURSWANT, - #ifdef FEAT_VIRTUALEDIT ---- 3006,3012 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"virtualedit", "ve", P_STRING|P_ONECOMMA|P_NODUP|P_VI_DEF - |P_VIM|P_CURSWANT, - #ifdef FEAT_VIRTUALEDIT -*************** -*** 3016,3070 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"visualbell", "vb", P_BOOL|P_VI_DEF, - (char_u *)&p_vb, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"w300", NULL, P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"w1200", NULL, P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"w9600", NULL, P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"warn", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_warn, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"weirdinvert", "wiv", P_BOOL|P_VI_DEF|P_RCLR, - (char_u *)&p_wiv, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"whichwrap", "ww", P_STRING|P_VIM|P_ONECOMMA|P_FLAGLIST, - (char_u *)&p_ww, PV_NONE, -! {(char_u *)"", (char_u *)"b,s"} SCRIPTID_INIT}, - {"wildchar", "wc", P_NUM|P_VIM, - (char_u *)&p_wc, PV_NONE, - {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB} -! SCRIPTID_INIT}, - {"wildcharm", "wcm", P_NUM|P_VI_DEF, - (char_u *)&p_wcm, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"wildignore", "wig", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_WILDIGN - (char_u *)&p_wig, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"wildignorecase", "wic", P_BOOL|P_VI_DEF, - (char_u *)&p_wic, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"wildmenu", "wmnu", P_BOOL|P_VI_DEF, - #ifdef FEAT_WILDMENU - (char_u *)&p_wmnu, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"wildmode", "wim", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_wim, PV_NONE, -! {(char_u *)"full", (char_u *)0L} SCRIPTID_INIT}, - {"wildoptions", "wop", P_STRING|P_VI_DEF, - #ifdef FEAT_CMDL_COMPL - (char_u *)&p_wop, PV_NONE, ---- 3016,3070 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"visualbell", "vb", P_BOOL|P_VI_DEF, - (char_u *)&p_vb, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"w300", NULL, P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"w1200", NULL, P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"w9600", NULL, P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"warn", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_warn, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"weirdinvert", "wiv", P_BOOL|P_VI_DEF|P_RCLR, - (char_u *)&p_wiv, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"whichwrap", "ww", P_STRING|P_VIM|P_ONECOMMA|P_FLAGLIST, - (char_u *)&p_ww, PV_NONE, -! {(char_u *)"", (char_u *)"b,s"} SCTX_INIT}, - {"wildchar", "wc", P_NUM|P_VIM, - (char_u *)&p_wc, PV_NONE, - {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB} -! SCTX_INIT}, - {"wildcharm", "wcm", P_NUM|P_VI_DEF, - (char_u *)&p_wcm, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"wildignore", "wig", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - #ifdef FEAT_WILDIGN - (char_u *)&p_wig, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"wildignorecase", "wic", P_BOOL|P_VI_DEF, - (char_u *)&p_wic, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"wildmenu", "wmnu", P_BOOL|P_VI_DEF, - #ifdef FEAT_WILDMENU - (char_u *)&p_wmnu, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"wildmode", "wim", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, - (char_u *)&p_wim, PV_NONE, -! {(char_u *)"full", (char_u *)0L} SCTX_INIT}, - {"wildoptions", "wop", P_STRING|P_VI_DEF, - #ifdef FEAT_CMDL_COMPL - (char_u *)&p_wop, PV_NONE, -*************** -*** 3073,3079 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"winaltkeys", "wak", P_STRING|P_VI_DEF, - #ifdef FEAT_WAK - (char_u *)&p_wak, PV_NONE, ---- 3073,3079 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"winaltkeys", "wak", P_STRING|P_VI_DEF, - #ifdef FEAT_WAK - (char_u *)&p_wak, PV_NONE, -*************** -*** 3082,3106 **** - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"window", "wi", P_NUM|P_VI_DEF, - (char_u *)&p_window, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"winheight", "wh", P_NUM|P_VI_DEF, - (char_u *)&p_wh, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"winfixheight", "wfh", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)VAR_WIN, PV_WFH, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)VAR_WIN, PV_WFW, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"winminheight", "wmh", P_NUM|P_VI_DEF, - (char_u *)&p_wmh, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"winminwidth", "wmw", P_NUM|P_VI_DEF, - (char_u *)&p_wmw, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"winptydll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(WIN3264) && defined(FEAT_TERMINAL) - (char_u *)&p_winptydll, PV_NONE, { ---- 3082,3106 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -! SCTX_INIT}, - {"window", "wi", P_NUM|P_VI_DEF, - (char_u *)&p_window, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"winheight", "wh", P_NUM|P_VI_DEF, - (char_u *)&p_wh, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCTX_INIT}, - {"winfixheight", "wfh", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)VAR_WIN, PV_WFH, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)VAR_WIN, PV_WFW, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"winminheight", "wmh", P_NUM|P_VI_DEF, - (char_u *)&p_wmh, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCTX_INIT}, - {"winminwidth", "wmw", P_NUM|P_VI_DEF, - (char_u *)&p_wmw, PV_NONE, -! {(char_u *)1L, (char_u *)0L} SCTX_INIT}, - {"winptydll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #if defined(WIN3264) && defined(FEAT_TERMINAL) - (char_u *)&p_winptydll, PV_NONE, { -*************** -*** 3114,3138 **** - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCRIPTID_INIT}, - {"winwidth", "wiw", P_NUM|P_VI_DEF, - (char_u *)&p_wiw, PV_NONE, -! {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT}, - {"wrap", NULL, P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_WRAP, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"wrapmargin", "wm", P_NUM|P_VI_DEF, - (char_u *)&p_wm, PV_WM, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"wrapscan", "ws", P_BOOL|P_VI_DEF, - (char_u *)&p_ws, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"write", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_write, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"writeany", "wa", P_BOOL|P_VI_DEF, - (char_u *)&p_wa, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"writebackup", "wb", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_wb, PV_NONE, - { ---- 3114,3138 ---- - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -! SCTX_INIT}, - {"winwidth", "wiw", P_NUM|P_VI_DEF, - (char_u *)&p_wiw, PV_NONE, -! {(char_u *)20L, (char_u *)0L} SCTX_INIT}, - {"wrap", NULL, P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_WRAP, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"wrapmargin", "wm", P_NUM|P_VI_DEF, - (char_u *)&p_wm, PV_WM, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - {"wrapscan", "ws", P_BOOL|P_VI_DEF, - (char_u *)&p_ws, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"write", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_write, PV_NONE, -! {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, - {"writeany", "wa", P_BOOL|P_VI_DEF, - (char_u *)&p_wa, PV_NONE, -! {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"writebackup", "wb", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_wb, PV_NONE, - { -*************** -*** 3141,3155 **** - #else - (char_u *)FALSE, - #endif -! (char_u *)0L} SCRIPTID_INIT}, - {"writedelay", "wd", P_NUM|P_VI_DEF, - (char_u *)&p_wd, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - - /* terminal output codes */ - #define p_term(sss, vvv) {sss, NULL, P_STRING|P_VI_DEF|P_RALL|P_SECURE, \ - (char_u *)&vvv, PV_NONE, \ -! {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - - p_term("t_AB", T_CAB) - p_term("t_AF", T_CAF) ---- 3141,3155 ---- - #else - (char_u *)FALSE, - #endif -! (char_u *)0L} SCTX_INIT}, - {"writedelay", "wd", P_NUM|P_VI_DEF, - (char_u *)&p_wd, PV_NONE, -! {(char_u *)0L, (char_u *)0L} SCTX_INIT}, - - /* terminal output codes */ - #define p_term(sss, vvv) {sss, NULL, P_STRING|P_VI_DEF|P_RALL|P_SECURE, \ - (char_u *)&vvv, PV_NONE, \ -! {(char_u *)"", (char_u *)0L} SCTX_INIT}, - - p_term("t_AB", T_CAB) - p_term("t_AF", T_CAF) -*************** -*** 3233,3239 **** - /* terminal key codes are not in here */ - - /* end marker */ -! {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL} SCRIPTID_INIT} - }; - - #define PARAM_COUNT (sizeof(options) / sizeof(struct vimoption)) ---- 3233,3239 ---- - /* terminal key codes are not in here */ - - /* end marker */ -! {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL} SCTX_INIT} - }; - - #define PARAM_COUNT (sizeof(options) / sizeof(struct vimoption)) -*************** -*** 3314,3320 **** - static char_u *compile_cap_prog(synblock_T *synblock); - #endif - #ifdef FEAT_EVAL -! static void set_option_scriptID_idx(int opt_idx, int opt_flags, int id); - #endif - static char_u *set_bool_option(int opt_idx, char_u *varp, int value, int opt_flags); - static char_u *set_num_option(int opt_idx, char_u *varp, long value, char_u *errbuf, size_t errbuflen, int opt_flags); ---- 3314,3320 ---- - static char_u *compile_cap_prog(synblock_T *synblock); - #endif - #ifdef FEAT_EVAL -! static void set_option_sctx_idx(int opt_idx, int opt_flags, sctx_T script_ctx); - #endif - static char_u *set_bool_option(int opt_idx, char_u *varp, int value, int opt_flags); - static char_u *set_num_option(int opt_idx, char_u *varp, long value, char_u *errbuf, size_t errbuflen, int opt_flags); -*************** -*** 3854,3860 **** - } - - #ifdef FEAT_EVAL -! set_option_scriptID_idx(opt_idx, opt_flags, current_SID); - #endif - } - ---- 3854,3860 ---- - } - - #ifdef FEAT_EVAL -! set_option_sctx_idx(opt_idx, opt_flags, current_sctx); - #endif - } - -*************** -*** 4679,4690 **** - { - /* Mention where the option was last set. */ - if (varp == options[opt_idx].var) -! last_set_msg(options[opt_idx].scriptID); - else if ((int)options[opt_idx].indir & PV_WIN) -! last_set_msg(curwin->w_p_scriptID[ - (int)options[opt_idx].indir & PV_MASK]); - else if ((int)options[opt_idx].indir & PV_BUF) -! last_set_msg(curbuf->b_p_scriptID[ - (int)options[opt_idx].indir & PV_MASK]); - } - #endif ---- 4679,4690 ---- - { - /* Mention where the option was last set. */ - if (varp == options[opt_idx].var) -! last_set_msg(options[opt_idx].script_ctx); - else if ((int)options[opt_idx].indir & PV_WIN) -! last_set_msg(curwin->w_p_script_ctx[ - (int)options[opt_idx].indir & PV_MASK]); - else if ((int)options[opt_idx].indir & PV_BUF) -! last_set_msg(curbuf->b_p_script_ctx[ - (int)options[opt_idx].indir & PV_MASK]); - } - #endif -*************** -*** 5889,5896 **** - * Set a string option to a new value (without checking the effect). - * The string is copied into allocated memory. - * if ("opt_idx" == -1) "name" is used, otherwise "opt_idx" is used. -! * When "set_sid" is zero set the scriptID to current_SID. When "set_sid" is -! * SID_NONE don't set the scriptID. Otherwise set the scriptID to "set_sid". - */ - void - set_string_option_direct( ---- 5889,5897 ---- - * Set a string option to a new value (without checking the effect). - * The string is copied into allocated memory. - * if ("opt_idx" == -1) "name" is used, otherwise "opt_idx" is used. -! * When "set_sid" is zero set the scriptID to current_sctx.sc_sid. When -! * "set_sid" is SID_NONE don't set the scriptID. Otherwise set the scriptID to -! * "set_sid". - */ - void - set_string_option_direct( -*************** -*** 5943,5950 **** - } - # ifdef FEAT_EVAL - if (set_sid != SID_NONE) -! set_option_scriptID_idx(idx, opt_flags, -! set_sid == 0 ? current_SID : set_sid); - # endif - } - } ---- 5944,5961 ---- - } - # ifdef FEAT_EVAL - if (set_sid != SID_NONE) -! { -! sctx_T script_ctx; -! -! if (set_sid == 0) -! script_ctx = current_sctx; -! else -! { -! script_ctx.sc_sid = set_sid; -! script_ctx.sc_lnum = 0; -! } -! set_option_sctx_idx(idx, opt_flags, script_ctx); -! } - # endif - } - } -*************** -*** 7656,7662 **** - { - #ifdef FEAT_EVAL - /* Remember where the option was set. */ -! set_option_scriptID_idx(opt_idx, opt_flags, current_SID); - #endif - /* - * Free string options that are in allocated memory. ---- 7667,7673 ---- - { - #ifdef FEAT_EVAL - /* Remember where the option was set. */ -! set_option_sctx_idx(opt_idx, opt_flags, current_sctx); - #endif - /* - * Free string options that are in allocated memory. -*************** -*** 8215,8239 **** - - #if defined(FEAT_EVAL) || defined(PROTO) - /* -! * Set the scriptID for an option, taking care of setting the buffer- or - * window-local value. - */ - static void -! set_option_scriptID_idx(int opt_idx, int opt_flags, int id) - { - int both = (opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0; - int indir = (int)options[opt_idx].indir; - - /* Remember where the option was set. For local options need to do that - * in the buffer or window structure. */ - if (both || (opt_flags & OPT_GLOBAL) || (indir & (PV_BUF|PV_WIN)) == 0) -! options[opt_idx].scriptID = id; - if (both || (opt_flags & OPT_LOCAL)) - { - if (indir & PV_BUF) -! curbuf->b_p_scriptID[indir & PV_MASK] = id; - else if (indir & PV_WIN) -! curwin->w_p_scriptID[indir & PV_MASK] = id; - } - } - #endif ---- 8226,8253 ---- - - #if defined(FEAT_EVAL) || defined(PROTO) - /* -! * Set the script_ctx for an option, taking care of setting the buffer- or - * window-local value. - */ - static void -! set_option_sctx_idx(int opt_idx, int opt_flags, sctx_T script_ctx) - { - int both = (opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0; - int indir = (int)options[opt_idx].indir; -+ sctx_T new_script_ctx = script_ctx; -+ -+ new_script_ctx.sc_lnum += sourcing_lnum; - - /* Remember where the option was set. For local options need to do that - * in the buffer or window structure. */ - if (both || (opt_flags & OPT_GLOBAL) || (indir & (PV_BUF|PV_WIN)) == 0) -! options[opt_idx].script_ctx = new_script_ctx; - if (both || (opt_flags & OPT_LOCAL)) - { - if (indir & PV_BUF) -! curbuf->b_p_script_ctx[indir & PV_MASK] = new_script_ctx; - else if (indir & PV_WIN) -! curwin->w_p_script_ctx[indir & PV_MASK] = new_script_ctx; - } - } - #endif -*************** -*** 8262,8268 **** - *(int *)varp = value; /* set the new value */ - #ifdef FEAT_EVAL - /* Remember where the option was set. */ -! set_option_scriptID_idx(opt_idx, opt_flags, current_SID); - #endif - - #ifdef FEAT_GUI ---- 8276,8282 ---- - *(int *)varp = value; /* set the new value */ - #ifdef FEAT_EVAL - /* Remember where the option was set. */ -! set_option_sctx_idx(opt_idx, opt_flags, current_sctx); - #endif - - #ifdef FEAT_GUI -*************** -*** 8898,8904 **** - *pp = value; - #ifdef FEAT_EVAL - /* Remember where the option was set. */ -! set_option_scriptID_idx(opt_idx, opt_flags, current_SID); - #endif - #ifdef FEAT_GUI - need_mouse_correct = TRUE; ---- 8912,8918 ---- - *pp = value; - #ifdef FEAT_EVAL - /* Remember where the option was set. */ -! set_option_sctx_idx(opt_idx, opt_flags, current_sctx); - #endif - #ifdef FEAT_GUI - need_mouse_correct = TRUE; -*** ../vim-8.1.0361/src/proto/eval.pro 2018-08-01 19:05:59.278223228 +0200 ---- src/proto/eval.pro 2018-09-10 19:45:33.380367357 +0200 -*************** -*** 119,125 **** - int read_viminfo_varlist(vir_T *virp, int writing); - void write_viminfo_varlist(FILE *fp); - int store_session_globals(FILE *fd); -! void last_set_msg(scid_T scriptID); - void reset_v_option_vars(void); - void prepare_assert_error(garray_T *gap); - void assert_error(garray_T *gap); ---- 119,125 ---- - int read_viminfo_varlist(vir_T *virp, int writing); - void write_viminfo_varlist(FILE *fp); - int store_session_globals(FILE *fd); -! void last_set_msg(sctx_T script_ctx); - void reset_v_option_vars(void); - void prepare_assert_error(garray_T *gap); - void assert_error(garray_T *gap); -*** ../vim-8.1.0361/src/structs.h 2018-09-10 17:50:32.713306941 +0200 ---- src/structs.h 2018-09-10 20:18:06.669433878 +0200 -*************** -*** 75,80 **** ---- 75,93 ---- - #endif - - /* -+ * SCript ConteXt (SCTX): identifies a script script line. -+ * When sourcing a script "sc_lnum" is zero, "sourcing_lnum" is the current -+ * line number. When executing a user function "sc_lnum" is the line where the -+ * function was defined, "sourcing_lnum" is the line number inside the -+ * function. When stored with a function, mapping, option, etc. "sc_lnum" is -+ * the line number in the script "sc_sid". -+ */ -+ typedef struct { -+ scid_T sc_sid; // script ID -+ linenr_T sc_lnum; // line number -+ } sctx_T; -+ -+ /* - * Reference to a buffer that stores the value of buf_free_count. - * bufref_valid() only needs to check "buf" when the count differs. - */ -*************** -*** 278,285 **** - #endif - - #ifdef FEAT_EVAL -! int wo_scriptID[WV_COUNT]; /* SIDs for window-local options */ -! # define w_p_scriptID w_onebuf_opt.wo_scriptID - #endif - } winopt_T; - ---- 291,298 ---- - #endif - - #ifdef FEAT_EVAL -! sctx_T wo_script_ctx[WV_COUNT]; /* SCTXs for window-local options */ -! # define w_p_script_ctx w_onebuf_opt.wo_script_ctx - #endif - } winopt_T; - -*************** -*** 541,547 **** - int xp_pattern_len; /* bytes in xp_pattern before cursor */ - #if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL) - char_u *xp_arg; /* completion function */ -! int xp_scriptID; /* SID for completion function */ - #endif - int xp_backslash; /* one of the XP_BS_ values */ - #ifndef BACKSLASH_IN_FILENAME ---- 554,560 ---- - int xp_pattern_len; /* bytes in xp_pattern before cursor */ - #if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL) - char_u *xp_arg; /* completion function */ -! sctx_T xp_script_ctx; /* SCTX for completion function */ - #endif - int xp_backslash; /* one of the XP_BS_ values */ - #ifndef BACKSLASH_IN_FILENAME -*************** -*** 1071,1077 **** - char m_nowait; /* <nowait> used */ - #ifdef FEAT_EVAL - char m_expr; /* <expr> used, m_str is an expression */ -! scid_T m_script_ID; /* ID of script where map was defined */ - #endif - }; - ---- 1084,1090 ---- - char m_nowait; /* <nowait> used */ - #ifdef FEAT_EVAL - char m_expr; /* <expr> used, m_str is an expression */ -! sctx_T m_script_ctx; /* SCTX where map was defined */ - #endif - }; - -*************** -*** 1361,1367 **** - int uf_tml_idx; /* index of line being timed; -1 if none */ - int uf_tml_execed; /* line being timed was executed */ - #endif -! scid_T uf_script_ID; /* ID of script where function was defined, - used for s: variables */ - int uf_refcount; /* reference count, see func_name_refcount() */ - funccall_T *uf_scoped; /* l: local variables for closure */ ---- 1374,1380 ---- - int uf_tml_idx; /* index of line being timed; -1 if none */ - int uf_tml_execed; /* line being timed was executed */ - #endif -! sctx_T uf_script_ctx; /* SCTX where function was defined, - used for s: variables */ - int uf_refcount; /* reference count, see func_name_refcount() */ - funccall_T *uf_scoped; /* l: local variables for closure */ -*************** -*** 2123,2129 **** - int b_p_initialized; /* set when options initialized */ - - #ifdef FEAT_EVAL -! int b_p_scriptID[BV_COUNT]; /* SIDs for buffer-local options */ - #endif - - int b_p_ai; /* 'autoindent' */ ---- 2136,2142 ---- - int b_p_initialized; /* set when options initialized */ - - #ifdef FEAT_EVAL -! sctx_T b_p_script_ctx[BV_COUNT]; /* SCTXs for buffer-local options */ - #endif - - int b_p_ai; /* 'autoindent' */ -*** ../vim-8.1.0361/src/syntax.c 2018-07-20 19:56:06.006997358 +0200 ---- src/syntax.c 2018-09-10 20:08:06.315847823 +0200 -*************** -*** 58,64 **** - int sg_link; /* link to this highlight group ID */ - int sg_set; /* combination of SG_* flags */ - #ifdef FEAT_EVAL -! scid_T sg_scriptID; /* script in which the group was last set */ - #endif - }; - ---- 58,64 ---- - int sg_link; /* link to this highlight group ID */ - int sg_set; /* combination of SG_* flags */ - #ifdef FEAT_EVAL -! sctx_T sg_script_ctx; /* script in which the group was last set */ - #endif - }; - -*************** -*** 7507,7513 **** - } - else if (HL_TABLE()[from_id - 1].sg_link != to_id - #ifdef FEAT_EVAL -! || HL_TABLE()[from_id - 1].sg_scriptID != current_SID - #endif - || HL_TABLE()[from_id - 1].sg_cleared) - { ---- 7507,7514 ---- - } - else if (HL_TABLE()[from_id - 1].sg_link != to_id - #ifdef FEAT_EVAL -! || HL_TABLE()[from_id - 1].sg_script_ctx.sc_sid -! != current_sctx.sc_sid - #endif - || HL_TABLE()[from_id - 1].sg_cleared) - { -*************** -*** 7515,7521 **** - HL_TABLE()[from_id - 1].sg_set |= SG_LINK; - HL_TABLE()[from_id - 1].sg_link = to_id; - #ifdef FEAT_EVAL -! HL_TABLE()[from_id - 1].sg_scriptID = current_SID; - #endif - HL_TABLE()[from_id - 1].sg_cleared = FALSE; - redraw_all_later(SOME_VALID); ---- 7516,7523 ---- - HL_TABLE()[from_id - 1].sg_set |= SG_LINK; - HL_TABLE()[from_id - 1].sg_link = to_id; - #ifdef FEAT_EVAL -! HL_TABLE()[from_id - 1].sg_script_ctx = current_sctx; -! HL_TABLE()[from_id - 1].sg_script_ctx.sc_lnum += sourcing_lnum; - #endif - HL_TABLE()[from_id - 1].sg_cleared = FALSE; - redraw_all_later(SOME_VALID); -*************** -*** 8277,8283 **** - else - set_hl_attr(idx); - #ifdef FEAT_EVAL -! HL_TABLE()[idx].sg_scriptID = current_SID; - #endif - } - ---- 8279,8286 ---- - else - set_hl_attr(idx); - #ifdef FEAT_EVAL -! HL_TABLE()[idx].sg_script_ctx = current_sctx; -! HL_TABLE()[idx].sg_script_ctx.sc_lnum += sourcing_lnum; - #endif - } - -*************** -*** 8404,8410 **** - /* Clear the script ID only when there is no link, since that is not - * cleared. */ - if (HL_TABLE()[idx].sg_link == 0) -! HL_TABLE()[idx].sg_scriptID = 0; - #endif - } - ---- 8407,8416 ---- - /* Clear the script ID only when there is no link, since that is not - * cleared. */ - if (HL_TABLE()[idx].sg_link == 0) -! { -! HL_TABLE()[idx].sg_script_ctx.sc_sid = 0; -! HL_TABLE()[idx].sg_script_ctx.sc_lnum = 0; -! } - #endif - } - -*************** -*** 9272,9278 **** - highlight_list_arg(id, didh, LIST_STRING, 0, (char_u *)"cleared", ""); - #ifdef FEAT_EVAL - if (p_verbose > 0) -! last_set_msg(sgp->sg_scriptID); - #endif - } - ---- 9278,9284 ---- - highlight_list_arg(id, didh, LIST_STRING, 0, (char_u *)"cleared", ""); - #ifdef FEAT_EVAL - if (p_verbose > 0) -! last_set_msg(sgp->sg_script_ctx); - #endif - } - -*** ../vim-8.1.0361/src/testdir/test_alot.vim 2018-08-07 21:39:09.251060096 +0200 ---- src/testdir/test_alot.vim 2018-09-10 19:45:33.380367357 +0200 -*************** -*** 14,19 **** ---- 14,20 ---- - source test_execute_func.vim - source test_expand.vim - source test_expand_dllpath.vim -+ source test_expand_func.vim - source test_expr.vim - source test_feedkeys.vim - source test_file_perm.vim -*** ../vim-8.1.0361/src/testdir/test_expand_func.vim 2018-09-10 21:02:19.285589846 +0200 ---- src/testdir/test_expand_func.vim 2018-09-10 19:52:46.982566605 +0200 -*************** -*** 0 **** ---- 1,66 ---- -+ " Tests for expand() -+ -+ let s:sfile = expand('<sfile>') -+ let s:slnum = str2nr(expand('<slnum>')) -+ let s:sflnum = str2nr(expand('<sflnum>')) -+ -+ func s:expand_sfile() -+ return expand('<sfile>') -+ endfunc -+ -+ func s:expand_slnum() -+ return str2nr(expand('<slnum>')) -+ endfunc -+ -+ func s:expand_sflnum() -+ return str2nr(expand('<sflnum>')) -+ endfunc -+ -+ func Test_expand_sfile() -+ call assert_match('test_expand_func\.vim$', s:sfile) -+ call assert_match('^function .*\.\.Test_expand_sfile$', expand('<sfile>')) -+ -+ " Call in script-local function -+ call assert_match('^function .*\.\.Test_expand_sfile\[5\]\.\.<SNR>\d\+_expand_sfile$', s:expand_sfile()) -+ -+ " Call in command -+ command Sfile echo expand('<sfile>') -+ call assert_match('^function .*\.\.Test_expand_sfile$', trim(execute('Sfile'))) -+ delcommand Sfile -+ endfunc -+ -+ func Test_expand_slnum() -+ call assert_equal(4, s:slnum) -+ call assert_equal(2, str2nr(expand('<slnum>'))) -+ -+ " Line-continuation -+ call assert_equal( -+ \ 5, -+ \ str2nr(expand('<slnum>'))) -+ -+ " Call in script-local function -+ call assert_equal(1, s:expand_slnum()) -+ -+ " Call in command -+ command Slnum echo expand('<slnum>') -+ call assert_equal(14, str2nr(trim(execute('Slnum')))) -+ delcommand Slnum -+ endfunc -+ -+ func Test_expand_sflnum() -+ call assert_equal(5, s:sflnum) -+ call assert_equal(52, str2nr(expand('<sflnum>'))) -+ -+ " Line-continuation -+ call assert_equal( -+ \ 55, -+ \ str2nr(expand('<sflnum>'))) -+ -+ " Call in script-local function -+ call assert_equal(16, s:expand_sflnum()) -+ -+ " Call in command -+ command Flnum echo expand('<sflnum>') -+ call assert_equal(64, str2nr(trim(execute('Flnum')))) -+ delcommand Flnum -+ endfunc -*** ../vim-8.1.0361/src/testdir/test_maparg.vim 2018-05-21 13:28:40.320041589 +0200 ---- src/testdir/test_maparg.vim 2018-09-10 20:53:41.911220447 +0200 -*************** -*** 13,31 **** - set cpo-=< - set encoding=utf8 - " Test maparg() with a string result - map foo<C-V> is<F4>foo - vnoremap <script> <buffer> <expr> <silent> bar isbar -- let sid = s:SID() - call assert_equal("is<F4>foo", maparg('foo<C-V>')) - call assert_equal({'silent': 0, 'noremap': 0, 'lhs': 'foo<C-V>', -! \ 'mode': ' ', 'nowait': 0, 'expr': 0, 'sid': sid, 'rhs': 'is<F4>foo', -! \ 'buffer': 0}, maparg('foo<C-V>', '', 0, 1)) - call assert_equal({'silent': 1, 'noremap': 1, 'lhs': 'bar', 'mode': 'v', -! \ 'nowait': 0, 'expr': 1, 'sid': sid, 'rhs': 'isbar', 'buffer': 1}, - \ maparg('bar', '', 0, 1)) - map <buffer> <nowait> foo bar - call assert_equal({'silent': 0, 'noremap': 0, 'lhs': 'foo', 'mode': ' ', -! \ 'nowait': 1, 'expr': 0, 'sid': sid, 'rhs': 'bar', 'buffer': 1}, - \ maparg('foo', '', 0, 1)) - - map abc x<char-114>x ---- 13,36 ---- - set cpo-=< - set encoding=utf8 - " Test maparg() with a string result -+ let sid = s:SID() -+ let lnum = expand('<sflnum>') - map foo<C-V> is<F4>foo - vnoremap <script> <buffer> <expr> <silent> bar isbar - call assert_equal("is<F4>foo", maparg('foo<C-V>')) - call assert_equal({'silent': 0, 'noremap': 0, 'lhs': 'foo<C-V>', -! \ 'mode': ' ', 'nowait': 0, 'expr': 0, 'sid': sid, 'lnum': lnum + 1, -! \ 'rhs': 'is<F4>foo', 'buffer': 0}, -! \ maparg('foo<C-V>', '', 0, 1)) - call assert_equal({'silent': 1, 'noremap': 1, 'lhs': 'bar', 'mode': 'v', -! \ 'nowait': 0, 'expr': 1, 'sid': sid, 'lnum': lnum + 2, -! \ 'rhs': 'isbar', 'buffer': 1}, - \ maparg('bar', '', 0, 1)) -+ let lnum = expand('<sflnum>') - map <buffer> <nowait> foo bar - call assert_equal({'silent': 0, 'noremap': 0, 'lhs': 'foo', 'mode': ' ', -! \ 'nowait': 1, 'expr': 0, 'sid': sid, 'lnum': lnum + 1, 'rhs': 'bar', -! \ 'buffer': 1}, - \ maparg('foo', '', 0, 1)) - - map abc x<char-114>x -*** ../vim-8.1.0361/src/term.c 2018-08-21 13:09:06.250115910 +0200 ---- src/term.c 2018-09-10 20:08:15.351746667 +0200 -*************** -*** 6128,6134 **** - */ - if (STRNICMP(src, "<SID>", 5) == 0) - { -! if (current_SID <= 0) - EMSG(_(e_usingsid)); - else - { ---- 6128,6134 ---- - */ - if (STRNICMP(src, "<SID>", 5) == 0) - { -! if (current_sctx.sc_sid <= 0) - EMSG(_(e_usingsid)); - else - { -*************** -*** 6136,6142 **** - result[dlen++] = K_SPECIAL; - result[dlen++] = (int)KS_EXTRA; - result[dlen++] = (int)KE_SNR; -! sprintf((char *)result + dlen, "%ld", (long)current_SID); - dlen += (int)STRLEN(result + dlen); - result[dlen++] = '_'; - continue; ---- 6136,6143 ---- - result[dlen++] = K_SPECIAL; - result[dlen++] = (int)KS_EXTRA; - result[dlen++] = (int)KE_SNR; -! sprintf((char *)result + dlen, "%ld", -! (long)current_sctx.sc_sid); - dlen += (int)STRLEN(result + dlen); - result[dlen++] = '_'; - continue; -*** ../vim-8.1.0361/src/userfunc.c 2018-07-29 17:40:37.239467625 +0200 ---- src/userfunc.c 2018-09-10 20:08:27.575609884 +0200 -*************** -*** 302,308 **** - fp->uf_varargs = TRUE; - fp->uf_flags = flags; - fp->uf_calls = 0; -! fp->uf_script_ID = current_SID; - - pt->pt_func = fp; - pt->pt_refcount = 1; ---- 302,309 ---- - fp->uf_varargs = TRUE; - fp->uf_flags = flags; - fp->uf_calls = 0; -! fp->uf_script_ctx = current_sctx; -! fp->uf_script_ctx.sc_lnum += sourcing_lnum - newlines.ga_len; - - pt->pt_func = fp; - pt->pt_refcount = 1; -*************** -*** 505,515 **** - i = 3; - if (eval_fname_sid(name)) /* "<SID>" or "s:" */ - { -! if (current_SID <= 0) - *error = ERROR_SCRIPT; - else - { -! sprintf((char *)fname_buf + 3, "%ld_", (long)current_SID); - i = (int)STRLEN(fname_buf); - } - } ---- 506,516 ---- - i = 3; - if (eval_fname_sid(name)) /* "<SID>" or "s:" */ - { -! if (current_sctx.sc_sid <= 0) - *error = ERROR_SCRIPT; - else - { -! sprintf((char *)fname_buf + 3, "%ld_", (long)current_sctx.sc_sid); - i = (int)STRLEN(fname_buf); - } - } -*************** -*** 690,696 **** - { - char_u *save_sourcing_name; - linenr_T save_sourcing_lnum; -! scid_T save_current_SID; - int using_sandbox = FALSE; - funccall_T *fc; - int save_did_emsg; ---- 691,697 ---- - { - char_u *save_sourcing_name; - linenr_T save_sourcing_lnum; -! sctx_T save_current_sctx; - int using_sandbox = FALSE; - funccall_T *fc; - int save_did_emsg; -*************** -*** 944,951 **** - } - #endif - -! save_current_SID = current_SID; -! current_SID = fp->uf_script_ID; - save_did_emsg = did_emsg; - did_emsg = FALSE; - ---- 945,952 ---- - } - #endif - -! save_current_sctx = current_sctx; -! current_sctx = fp->uf_script_ctx; - save_did_emsg = did_emsg; - did_emsg = FALSE; - -*************** -*** 1026,1032 **** - vim_free(sourcing_name); - sourcing_name = save_sourcing_name; - sourcing_lnum = save_sourcing_lnum; -! current_SID = save_current_SID; - #ifdef FEAT_PROFILE - if (do_profiling == PROF_YES) - script_prof_restore(&wait_start); ---- 1027,1033 ---- - vim_free(sourcing_name); - sourcing_name = save_sourcing_name; - sourcing_lnum = save_sourcing_lnum; -! current_sctx = save_current_sctx; - #ifdef FEAT_PROFILE - if (do_profiling == PROF_YES) - script_prof_restore(&wait_start); -*************** -*** 1574,1580 **** - MSG_PUTS(" closure"); - msg_clr_eos(); - if (p_verbose > 0) -! last_set_msg(fp->uf_script_ID); - } - - /* ---- 1575,1581 ---- - MSG_PUTS(" closure"); - msg_clr_eos(); - if (p_verbose > 0) -! last_set_msg(fp->uf_script_ctx); - } - - /* -*************** -*** 1757,1768 **** - || eval_fname_sid(*pp)) - { - /* It's "s:" or "<SID>" */ -! if (current_SID <= 0) - { - EMSG(_(e_usingsid)); - goto theend; - } -! sprintf((char *)sid_buf, "%ld_", (long)current_SID); - lead += (int)STRLEN(sid_buf); - } - } ---- 1758,1769 ---- - || eval_fname_sid(*pp)) - { - /* It's "s:" or "<SID>" */ -! if (current_sctx.sc_sid <= 0) - { - EMSG(_(e_usingsid)); - goto theend; - } -! sprintf((char *)sid_buf, "%ld_", (long)current_sctx.sc_sid); - lead += (int)STRLEN(sid_buf); - } - } -*************** -*** 2454,2460 **** - flags |= FC_SANDBOX; - fp->uf_flags = flags; - fp->uf_calls = 0; -! fp->uf_script_ID = current_SID; - goto ret_free; - - erret: ---- 2455,2462 ---- - flags |= FC_SANDBOX; - fp->uf_flags = flags; - fp->uf_calls = 0; -! fp->uf_script_ctx = current_sctx; -! fp->uf_script_ctx.sc_lnum += sourcing_lnum - newlines.ga_len - 1; - goto ret_free; - - erret: -*** ../vim-8.1.0361/src/version.c 2018-09-10 19:03:01.641716307 +0200 ---- src/version.c 2018-09-10 20:58:39.847970755 +0200 -*************** -*** 796,797 **** ---- 796,799 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 362, - /**/ - --- -If you put 7 of the most talented OSS developers in a room for a week -and asked them to fix a bug in a spreadsheet program, in 1 week -you'd have 2 new mail readers and a text-based web browser. - - /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ an exciting new programming language -- http://www.Zimbu.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |