summaryrefslogtreecommitdiff
path: root/src/option.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-08-26 23:24:09 +0200
committerBram Moolenaar <Bram@vim.org>2015-08-26 23:24:09 +0200
commit5ea87a04964b0ccd017380b8247d04d2a69f6062 (patch)
treed882269c45620ddd3530c1619d819b1804fe322f /src/option.c
parent8e5f5b47c2198ffa4161c21a4140eaa9bed46f37 (diff)
downloadvim-git-5ea87a04964b0ccd017380b8247d04d2a69f6062.tar.gz
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/option.c')
-rw-r--r--src/option.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/option.c b/src/option.c
index f0d1996a2..2fc6bd048 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