thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.841

Browse Source 
Problem:    Can't compile without the multi-byte feature. (John Marriott)
Solution:   Add more #ifdef's.
This commit is contained in:
Bram Moolenaar
2015-08-26 23:24:09 +02:00
parent 8e5f5b47c2
commit 5ea87a0496
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/option.c
View File

@@ -3652,13 +3652,19 @@ set_options_default(opt_flags)
for (i = 0; !istermoption(&options[i]); i++) for (i = 0; !istermoption(&options[i]); i++)
if (!(options[i].flags & P_NODEFAULT) if (!(options[i].flags & P_NODEFAULT)
#if defined(FEAT_MBYTE) || defined(FEAT_CRYPT)
&& (opt_flags == 0 && (opt_flags == 0
|| (options[i].var != (char_u *)&p_enc || (TRUE
#if defined(FEAT_CRYPT) # if defined(FEAT_MBYTE)
&& options[i].var != (char_u *)&p_enc
# endif
# 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
))
#endif #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 */
/**/
841,
/**/ /**/
840, 840,
/**/ /**/