# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1440531004 -7200
# Node ID 9ec3329823f96db275cc99b1057176c9ba7566d8
# Parent  eff26a8620ceccbe6a20034a2f59fd31c05a9f3f
commit https://github.com/vim/vim/commit/8060687905bdadc46abb68ee6d40e5660e352297
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Aug 25 21:27:35 2015 +0200

    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
--- 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
--- 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 */
 /**/
+    838,
+/**/
     837,
 /**/
     836,