From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 25 Aug 2015 19:27:35 +0000 (+0200)
Subject: patch 7.4.838
X-Git-Tag: v7.4.838
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8060687905bdadc46abb68ee6d40e5660e352297;p=vim

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 b5e53efee..f0d1996a2 100644
--- 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 57ff84c32..df4275952 100644
--- 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,
 /**/