mirror of
https://github.com/vim/vim.git
synced 2025-09-27 04:14:06 -04:00
patch 7.4.838
Problem: Can't compile without the crypt feature. (John Marriott) Solution: Add #ifdef.
This commit is contained in:
@@ -3654,8 +3654,11 @@ set_options_default(opt_flags)
|
||||
if (!(options[i].flags & P_NODEFAULT)
|
||||
&& (opt_flags == 0
|
||||
|| (options[i].var != (char_u *)&p_enc
|
||||
#if defined(FEAT_CRYPT)
|
||||
&& 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);
|
||||
|
||||
#ifdef FEAT_WINDOWS
|
||||
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
838,
|
||||
/**/
|
||||
837,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user