Mercurial > vim

changeset 7058:64dc5b11ad33 v7.4.841

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Christian Brabandt <cb@256bit.org>
date Wed, 26 Aug 2015 23:30:04 +0200
parents 417dfdc030bf
children 9c30652a966b
files src/option.c src/version.c
diffstat 2 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,