# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1440624604 -7200
# Node ID 64dc5b11ad330bb96e8223c60c538caadd2703ff
# Parent  417dfdc030bff5cb0c815752c876bb6254765474
commit https://github.com/vim/vim/commit/5ea87a04964b0ccd017380b8247d04d2a69f6062
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Aug 26 23:24:09 2015 +0200

    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
--- 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
+			))
+#endif
+			)
 	    set_option_default(i, opt_flags, p_cp);
 
 #ifdef FEAT_WINDOWS
diff --git a/src/version.c b/src/version.c
--- 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,