Mercurial > vim
comparison src/option.c @ 7052:9ec3329823f9 v7.4.838
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.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 25 Aug 2015 21:30:04 +0200 |
parents | 17a3fa77e941 |
children | 64dc5b11ad33 |
comparison
equal
deleted
inserted
replaced
7051:eff26a8620ce | 7052:9ec3329823f9 |
---|---|
3652 | 3652 |
3653 for (i = 0; !istermoption(&options[i]); i++) | 3653 for (i = 0; !istermoption(&options[i]); i++) |
3654 if (!(options[i].flags & P_NODEFAULT) | 3654 if (!(options[i].flags & P_NODEFAULT) |
3655 && (opt_flags == 0 | 3655 && (opt_flags == 0 |
3656 || (options[i].var != (char_u *)&p_enc | 3656 || (options[i].var != (char_u *)&p_enc |
3657 #if defined(FEAT_CRYPT) | |
3657 && options[i].var != (char_u *)&p_cm | 3658 && options[i].var != (char_u *)&p_cm |
3658 && options[i].var != (char_u *)&p_key))) | 3659 && options[i].var != (char_u *)&p_key |
3660 #endif | |
3661 ))) | |
3659 set_option_default(i, opt_flags, p_cp); | 3662 set_option_default(i, opt_flags, p_cp); |
3660 | 3663 |
3661 #ifdef FEAT_WINDOWS | 3664 #ifdef FEAT_WINDOWS |
3662 /* The 'scroll' option must be computed for all windows. */ | 3665 /* The 'scroll' option must be computed for all windows. */ |
3663 FOR_ALL_TAB_WINDOWS(tp, wp) | 3666 FOR_ALL_TAB_WINDOWS(tp, wp) |