patch 7.4.838

Problem:    Can't compile without the crypt feature. (John Marriott)
Solution:   Add #ifdef.

diff --git a/src/option.c b/src/option.c
index b5e53efee7027a87d66ae0e453ed3eabb0e2cbec..f0d1996a2d080a9e8f5f7b45c0d88c9b9abeefff 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -3654,8 +3654,11 @@ set_options_default(opt_flags)
        if (!(options[i].flags & P_NODEFAULT)
                && (opt_flags == 0
                    || (options[i].var != (char_u *)&p_enc
+#if defined(FEAT_CRYPT)
                        && options[i].var != (char_u *)&p_cm
-                       && options[i].var != (char_u *)&p_key)))
+                       && options[i].var != (char_u *)&p_key
+#endif
+                       )))
            set_option_default(i, opt_flags, p_cp);
 
 #ifdef FEAT_WINDOWS

diff --git a/src/version.c b/src/version.c
index 57ff84c32acf0e777b2549ec5e5954f6cb994a17..df4275952c2b2ce730c8760ced3e20328d2275e3 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 */
+/**/
+    838,
 /**/
     837,
 /**/