commit 5ea87a04964b0ccd017380b8247d04d2a69f6062
author Bram Moolenaar <Bram@vim.org> Wed Aug 26 23:24:09 2015 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Aug 26 23:24:09 2015 +0200
tree d882269c45620ddd3530c1619d819b1804fe322f
parent 8e5f5b47c2198ffa4161c21a4140eaa9bed46f37

patch 7.4.841
Problem:    Can't compile without the multi-byte feature. (John Marriott)
Solution:   Add more #ifdef's.

src/option.c

diff --git a/src/option.c b/src/option.c
index f0d1996..2fc6bd0 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3652,13 +3652,19 @@
 
     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