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

9
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.
* *
@ -6875,7 +6876,8 @@ 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 =
buf->b_p_vsts && buf->b_p_vsts != empty_option
? vim_strsave(buf->b_p_vsts) : NULL; ? 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,
/**/ /**/