aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.0921: missing defined(PROTO) in #ifdef

Browse Source 
Problem:    Missing defined(PROTO) in #ifdef.
Solution:   Adjust #ifdef so that proto works with different features.
            Clean up some preprocessor indenting.
This commit is contained in:
Bram Moolenaar 2022-11-22 18:18:38 +00:00
parent b775e72439
commit 9af2ea80a8
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/option.c
View File

@ -3925,7 +3925,8 @@ findoption(char_u *arg)
return opt_idx; return opt_idx;
} }
#if defined(FEAT_EVAL) || defined(FEAT_TCL) || defined(FEAT_MZSCHEME) || defined(FEAT_SPELL) #if defined(FEAT_EVAL) || defined(FEAT_TCL) || defined(FEAT_MZSCHEME) \
|| defined(FEAT_SPELL) || defined(PROTO)
/* /*
* Get the value for an option. * Get the value for an option.
* *
@ -4127,14 +4128,14 @@ get_option_value_strict(
*numval = bufIsChanged((buf_T *)from); *numval = bufIsChanged((buf_T *)from);
varp = NULL; varp = NULL;
} }
#ifdef FEAT_CRYPT # ifdef FEAT_CRYPT
else if (p->indir == PV_KEY) else if (p->indir == PV_KEY)
{ {
// never return the value of the crypt key // never return the value of the crypt key
*stringval = NULL; *stringval = NULL;
varp = NULL; varp = NULL;
} }
#endif # endif
else else
{ {
buf_T *save_curbuf = curbuf; buf_T *save_curbuf = curbuf;
@ -5151,29 +5152,29 @@ unset_global_local_option(char_u *name, void *from)
case PV_SO: case PV_SO:
curwin->w_p_so = -1; curwin->w_p_so = -1;
break; break;
#ifdef FEAT_FIND_ID # ifdef FEAT_FIND_ID
case PV_DEF: case PV_DEF:
clear_string_option(&buf->b_p_def); clear_string_option(&buf->b_p_def);
break; break;
case PV_INC: case PV_INC:
clear_string_option(&buf->b_p_inc); clear_string_option(&buf->b_p_inc);
break; break;
#endif # endif
case PV_DICT: case PV_DICT:
clear_string_option(&buf->b_p_dict); clear_string_option(&buf->b_p_dict);
break; break;
case PV_TSR: case PV_TSR:
clear_string_option(&buf->b_p_tsr); clear_string_option(&buf->b_p_tsr);
break; break;
#ifdef FEAT_COMPL_FUNC # ifdef FEAT_COMPL_FUNC
case PV_TSRFU: case PV_TSRFU:
clear_string_option(&buf->b_p_tsrfu); clear_string_option(&buf->b_p_tsrfu);
break; break;
#endif # endif
case PV_FP: case PV_FP:
clear_string_option(&buf->b_p_fp); clear_string_option(&buf->b_p_fp);
break; break;
#ifdef FEAT_QUICKFIX # ifdef FEAT_QUICKFIX
case PV_EFM: case PV_EFM:
clear_string_option(&buf->b_p_efm); clear_string_option(&buf->b_p_efm);
break; break;
@ -5183,27 +5184,27 @@ unset_global_local_option(char_u *name, void *from)
case PV_MP: case PV_MP:
clear_string_option(&buf->b_p_mp); clear_string_option(&buf->b_p_mp);
break; break;
#endif # endif
#if defined(FEAT_BEVAL) && defined(FEAT_EVAL) # if defined(FEAT_BEVAL) && defined(FEAT_EVAL)
case PV_BEXPR: case PV_BEXPR:
clear_string_option(&buf->b_p_bexpr); clear_string_option(&buf->b_p_bexpr);
break; break;
#endif # endif
#if defined(FEAT_CRYPT) # if defined(FEAT_CRYPT)
case PV_CM: case PV_CM:
clear_string_option(&buf->b_p_cm); clear_string_option(&buf->b_p_cm);
break; break;
#endif # endif
#ifdef FEAT_LINEBREAK # ifdef FEAT_LINEBREAK
case PV_SBR: case PV_SBR:
clear_string_option(&((win_T *)from)->w_p_sbr); clear_string_option(&((win_T *)from)->w_p_sbr);
break; break;
#endif # endif
#ifdef FEAT_STL_OPT # ifdef FEAT_STL_OPT
case PV_STL: case PV_STL:
clear_string_option(&((win_T *)from)->w_p_stl); clear_string_option(&((win_T *)from)->w_p_stl);
break; break;
#endif # endif
case PV_UL: case PV_UL:
buf->b_p_ul = NO_LOCAL_UNDOLEVEL; buf->b_p_ul = NO_LOCAL_UNDOLEVEL;
break; break;
@ -6875,8 +6876,9 @@ paste_option_changed(void)
#ifdef FEAT_VARTABS #ifdef FEAT_VARTABS
if (buf->b_p_vsts_nopaste) if (buf->b_p_vsts_nopaste)
vim_free(buf->b_p_vsts_nopaste); vim_free(buf->b_p_vsts_nopaste);
buf->b_p_vsts_nopaste = buf->b_p_vsts && buf->b_p_vsts != empty_option buf->b_p_vsts_nopaste =
? vim_strsave(buf->b_p_vsts) : NULL; buf->b_p_vsts && buf->b_p_vsts != empty_option
? vim_strsave(buf->b_p_vsts) : NULL;
#endif #endif
} }
@ -6897,7 +6899,8 @@ paste_option_changed(void)
#ifdef FEAT_VARTABS #ifdef FEAT_VARTABS
if (p_vsts_nopaste) if (p_vsts_nopaste)
vim_free(p_vsts_nopaste); vim_free(p_vsts_nopaste);
p_vsts_nopaste = p_vsts && p_vsts != empty_option ? vim_strsave(p_vsts) : NULL; p_vsts_nopaste = p_vsts && p_vsts != empty_option
? vim_strsave(p_vsts) : NULL;
#endif #endif
} }

2
src/version.c
View File

@ -695,6 +695,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 */
/**/
921,
/**/ /**/
920, 920,
/**/ /**/