thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.0.0101

Browse Source 
Problem:    Some options are not strictly checked.
Solution:   Add flags for strickter checks.
This commit is contained in:
Bram Moolenaar 2016-11-24 21:46:19 +01:00
parent 319afe3804
commit 031cb743ae
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/option.c
View File

@ -992,7 +992,7 @@ static struct vimoption options[] =
(char_u *)NULL, PV_NONE, (char_u *)NULL, PV_NONE,
#endif #endif
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
{"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP, {"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP|P_NFNAME,
#ifdef FEAT_INS_EXPAND #ifdef FEAT_INS_EXPAND
(char_u *)&p_dict, PV_DICT, (char_u *)&p_dict, PV_DICT,
#else #else
@ -2058,7 +2058,7 @@ static struct vimoption options[] =
{(char_u *)NULL, (char_u *)0L} {(char_u *)NULL, (char_u *)0L}
#endif #endif
SCRIPTID_INIT}, SCRIPTID_INIT},
{"printexpr", "pexpr", P_STRING|P_VI_DEF, {"printexpr", "pexpr", P_STRING|P_VI_DEF|P_SECURE,
#ifdef FEAT_POSTSCRIPT #ifdef FEAT_POSTSCRIPT
(char_u *)&p_pexpr, PV_NONE, (char_u *)&p_pexpr, PV_NONE,
{(char_u *)"", (char_u *)0L} {(char_u *)"", (char_u *)0L}
@ -7021,6 +7021,7 @@ did_set_string_option(
#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
/* 'toolbar' */
else if (varp == &p_toolbar) else if (varp == &p_toolbar)
{ {
if (opt_strings_flags(p_toolbar, p_toolbar_values, if (opt_strings_flags(p_toolbar, p_toolbar_values,
@ -7235,6 +7236,7 @@ did_set_string_option(
#endif #endif
#if defined(FEAT_RENDER_OPTIONS) #if defined(FEAT_RENDER_OPTIONS)
/* 'renderoptions' */
else if (varp == &p_rop && gui.in_use) else if (varp == &p_rop && gui.in_use)
{ {
if (!gui_mch_set_rendering_options(p_rop)) if (!gui_mch_set_rendering_options(p_rop))
@ -7262,19 +7264,19 @@ did_set_string_option(
else else
{ {
p = NULL; p = NULL;
if (varp == &p_ww) if (varp == &p_ww) /* 'whichwrap' */
p = (char_u *)WW_ALL; p = (char_u *)WW_ALL;
if (varp == &p_shm) if (varp == &p_shm) /* 'shortmess' */
p = (char_u *)SHM_ALL; p = (char_u *)SHM_ALL;
else if (varp == &(p_cpo)) else if (varp == &(p_cpo)) /* 'cpoptions' */
p = (char_u *)CPO_ALL; p = (char_u *)CPO_ALL;
else if (varp == &(curbuf->b_p_fo)) else if (varp == &(curbuf->b_p_fo)) /* 'formatoptions' */
p = (char_u *)FO_ALL; p = (char_u *)FO_ALL;
#ifdef FEAT_CONCEAL #ifdef FEAT_CONCEAL
else if (varp == &curwin->w_p_cocu) else if (varp == &curwin->w_p_cocu) /* 'concealcursor' */
p = (char_u *)COCU_ALL; p = (char_u *)COCU_ALL;
#endif #endif
else if (varp == &p_mouse) else if (varp == &p_mouse) /* 'mouse' */
{ {
#ifdef FEAT_MOUSE #ifdef FEAT_MOUSE
p = (char_u *)MOUSE_ALL; p = (char_u *)MOUSE_ALL;
@ -7284,7 +7286,7 @@ did_set_string_option(
#endif #endif
} }
#if defined(FEAT_GUI) #if defined(FEAT_GUI)
else if (varp == &p_go) else if (varp == &p_go) /* 'guioptions' */
p = (char_u *)GO_ALL; p = (char_u *)GO_ALL;
#endif #endif
if (p != NULL) if (p != NULL)

2
src/version.c
View File

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