mirror of
https://github.com/vim/vim.git
synced 2025-09-28 04:24:06 -04:00
patch 7.4.788
Problem: Can't build without the crypt feature. (John Marriott) Solution: Add #ifdef's.
This commit is contained in:
11
src/option.c
11
src/option.c
@@ -4918,7 +4918,10 @@ do_set(arg, opt_flags)
|
||||
*(char_u **)(varp) = newval;
|
||||
|
||||
#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
|
||||
if (!starting && options[opt_idx].indir != PV_KEY
|
||||
if (!starting
|
||||
# ifdef FEAT_CRYPT
|
||||
&& options[opt_idx].indir != PV_KEY
|
||||
# endif
|
||||
&& origval != NULL)
|
||||
/* origval may be freed by
|
||||
* did_set_string_option(), make a copy. */
|
||||
@@ -5717,7 +5720,11 @@ set_string_option(opt_idx, value, opt_flags)
|
||||
*varp = s;
|
||||
|
||||
#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
|
||||
if (!starting && options[opt_idx].indir != PV_KEY)
|
||||
if (!starting
|
||||
# ifdef FEAT_CRYPT
|
||||
&& options[opt_idx].indir != PV_KEY
|
||||
# endif
|
||||
)
|
||||
saved_oldval = vim_strsave(oldval);
|
||||
#endif
|
||||
if ((r = did_set_string_option(opt_idx, varp, TRUE, oldval, NULL,
|
||||
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
788,
|
||||
/**/
|
||||
787,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user