patch 7.4.788

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

diff --git a/src/option.c b/src/option.c
index 8b6393860e92c1c47e2ceda2c3bb121bd9befa06..35cfd2b006ec07eb7ad6cf267cb118b15e8d5c59 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -4918,7 +4918,10 @@ do_set(arg, opt_flags)
                        *(char_u **)(varp) = newval;
 
 #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
-                       if (!starting && options[opt_idx].indir != PV_KEY
+                       if (!starting
+# ifdef FEAT_CRYPT
+                               && options[opt_idx].indir != PV_KEY
+# endif
                                                           && origval != NULL)
                            /* origval may be freed by
                             * did_set_string_option(), make a copy. */
@@ -5717,7 +5720,11 @@ set_string_option(opt_idx, value, opt_flags)
        *varp = s;
 
 #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
-       if (!starting && options[opt_idx].indir != PV_KEY)
+       if (!starting
+# ifdef FEAT_CRYPT
+               && options[opt_idx].indir != PV_KEY
+# endif
+               )
            saved_oldval = vim_strsave(oldval);
 #endif
        if ((r = did_set_string_option(opt_idx, varp, TRUE, oldval, NULL,

diff --git a/src/version.c b/src/version.c
index fe17b71ff461a93b8576711c44379b20a230dd1e..aa7b0337eae04b96588e6093d15133159a4c046b 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 */
+/**/
+    788,
 /**/
     787,
 /**/