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 f0d1996a2d080a9e8f5f7b45c0d88c9b9abeefff..2fc6bd0483b95bd7dacdee55f987363a173808d7 100644 (file)
--- 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 b842fcf76bc3d9da3cfda2d773183825bb2eefbf..bc95c5d6fdb0a9fe29621e08e7b3c54520e52090 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    841,
 /**/
     840,
 /**/