diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-07-17 23:08:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-07-17 23:08:29 +0200 |
| commit | 5cbb8dbc329ab33ce56ea7ce4695778630c4e9ee (patch) | |
| tree | cb7354c01670e4e86057a17301d3db86bb2890df | |
| parent | fb9bc4829a1442fc8e93f078c9f923c9d382dbd2 (diff) | |
| download | vim-git-7.4.788.tar.gz | |
patch 7.4.788v7.4.788
Problem: Can't build without the crypt feature. (John Marriott)
Solution: Add #ifdef's.
| -rw-r--r-- | src/option.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c index 8b6393860..35cfd2b00 100644 --- 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 fe17b71ff..aa7b0337e 100644 --- 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 */ /**/ + 788, +/**/ 787, /**/ 786, |