patch 7.4.841
Problem: Can't compile without the multi-byte feature. (John Marriott)
Solution: Add more #ifdef's.
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
diff --git a/src/version.c b/src/version.c
index b842fcf..bc95c5d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 841,
+/**/
840,
/**/
839,