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

patch 7.4.838

Browse Source 
Problem:    Can't compile without the crypt feature. (John Marriott)
Solution:   Add #ifdef.
This commit is contained in:
Bram Moolenaar
2015-08-25 21:27:35 +02:00
parent 88774fdd23
commit 8060687905
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/option.c
View File

@@ -3654,8 +3654,11 @@ set_options_default(opt_flags)
if (!(options[i].flags & P_NODEFAULT) if (!(options[i].flags & P_NODEFAULT)
&& (opt_flags == 0 && (opt_flags == 0
|| (options[i].var != (char_u *)&p_enc || (options[i].var != (char_u *)&p_enc
#if defined(FEAT_CRYPT)
&& options[i].var != (char_u *)&p_cm && options[i].var != (char_u *)&p_cm
&& options[i].var != (char_u *)&p_key))) && options[i].var != (char_u *)&p_key
#endif
)))
set_option_default(i, opt_flags, p_cp); set_option_default(i, opt_flags, p_cp);
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS

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 */
/**/
838,
/**/ /**/
837, 837,
/**/ /**/