aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 7.4.788

Browse Source 
Problem:    Can't build without the crypt feature. (John Marriott)
Solution:   Add #ifdef's.
This commit is contained in:
Bram Moolenaar
2015-07-17 23:08:29 +02:00
parent fb9bc4829a
commit 5cbb8dbc32
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/option.c
View File

@@ -4918,7 +4918,10 @@ do_set(arg, opt_flags)
*(char_u **)(varp) = newval; *(char_u **)(varp) = newval;
#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) #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 != NULL)
/* origval may be freed by /* origval may be freed by
* did_set_string_option(), make a copy. */ * did_set_string_option(), make a copy. */
@@ -5717,7 +5720,11 @@ set_string_option(opt_idx, value, opt_flags)
*varp = s; *varp = s;
#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) #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); saved_oldval = vim_strsave(oldval);
#endif #endif
if ((r = did_set_string_option(opt_idx, varp, TRUE, oldval, NULL, if ((r = did_set_string_option(opt_idx, varp, TRUE, oldval, NULL,

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
788,
/**/ /**/
787, 787,
/**/ /**/