diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-08-26 23:24:09 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-08-26 23:24:09 +0200 |
| commit | 5ea87a04964b0ccd017380b8247d04d2a69f6062 (patch) | |
| tree | d882269c45620ddd3530c1619d819b1804fe322f /src | |
| parent | 8e5f5b47c2198ffa4161c21a4140eaa9bed46f37 (diff) | |
patch 7.4.841v7.4.841
Problem: Can't compile without the multi-byte feature. (John Marriott)
Solution: Add more #ifdef's.
Diffstat (limited to 'src')
| -rw-r--r-- | src/option.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/option.c b/src/option.c index f0d1996a2d..2fc6bd0483 100644 --- a/src/option.c +++ b/src/option.c @@ -3652,13 +3652,19 @@ set_options_default(opt_flags) for (i = 0; !istermoption(&options[i]); i++) if (!(options[i].flags & P_NODEFAULT) +#if defined(FEAT_MBYTE) || defined(FEAT_CRYPT) && (opt_flags == 0 - || (options[i].var != (char_u *)&p_enc -#if defined(FEAT_CRYPT) + || (TRUE +# 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_key +# endif + )) #endif - ))) + ) set_option_default(i, opt_flags, p_cp); #ifdef FEAT_WINDOWS diff --git a/src/version.c b/src/version.c index b842fcf76b..bc95c5d6fd 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 841, +/**/ 840, /**/ 839, |