Mercurial > vim

comparison src/option.c @ 6939:ca0990adc2e3 v7.4.788

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 7.4.788 Problem: Can't build without the crypt feature. (John Marriott) Solution: Add #ifdef's.
author Bram Moolenaar <bram@vim.org>
date Fri, 17 Jul 2015 23:08:29 +0200
parents c31bd9ca75d2
children b63f09edb493
comparison
equal deleted inserted replaced
6938:e4031308afa9 6939:ca0990adc2e3
4916 4916
4917 /* Set the new value. */ 4917 /* Set the new value. */
4918 *(char_u **)(varp) = newval; 4918 *(char_u **)(varp) = newval;
4919 4919
4920 #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) 4920 #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
4921 if (!starting && options[opt_idx].indir != PV_KEY 4921 if (!starting
4922 # ifdef FEAT_CRYPT
4923 && options[opt_idx].indir != PV_KEY
4924 # endif
4922 && origval != NULL) 4925 && origval != NULL)
4923 /* origval may be freed by 4926 /* origval may be freed by
4924 * did_set_string_option(), make a copy. */ 4927 * did_set_string_option(), make a copy. */
4925 saved_origval = vim_strsave(origval); 4928 saved_origval = vim_strsave(origval);
4926 #endif 4929 #endif
5715 : opt_flags); 5718 : opt_flags);
5716 oldval = *varp; 5719 oldval = *varp;
5717 *varp = s; 5720 *varp = s;
5718 5721
5719 #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) 5722 #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
5720 if (!starting && options[opt_idx].indir != PV_KEY) 5723 if (!starting
5724 # ifdef FEAT_CRYPT
5725 && options[opt_idx].indir != PV_KEY
5726 # endif
5727 )
5721 saved_oldval = vim_strsave(oldval); 5728 saved_oldval = vim_strsave(oldval);
5722 #endif 5729 #endif
5723 if ((r = did_set_string_option(opt_idx, varp, TRUE, oldval, NULL, 5730 if ((r = did_set_string_option(opt_idx, varp, TRUE, oldval, NULL,
5724 opt_flags)) == NULL) 5731 opt_flags)) == NULL)
5725 did_set_option(opt_idx, opt_flags, TRUE); 5732 did_set_option(opt_idx, opt_flags, TRUE);