Mercurial > vim

comparison src/option.c @ 7058:64dc5b11ad33 v7.4.841

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/5ea87a04964b0ccd017380b8247d04d2a69f6062 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Aug 26 23:24:09 2015 +0200 patch 7.4.841 Problem: Can't compile without the multi-byte feature. (John Marriott) Solution: Add more #ifdef's.
author Christian Brabandt <cb@256bit.org>
date Wed, 26 Aug 2015 23:30:04 +0200
parents 9ec3329823f9
children 83b3261352b3
comparison
equal deleted inserted replaced
7057:417dfdc030bf 7058:64dc5b11ad33
3650 tabpage_T *tp; 3650 tabpage_T *tp;
3651 #endif 3651 #endif
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 #if defined(FEAT_MBYTE) || defined(FEAT_CRYPT)
3655 && (opt_flags == 0 3656 && (opt_flags == 0
3656 || (options[i].var != (char_u *)&p_enc 3657 || (TRUE
3657 #if defined(FEAT_CRYPT) 3658 # if defined(FEAT_MBYTE)
3659 && options[i].var != (char_u *)&p_enc
3660 # endif
3661 # if defined(FEAT_CRYPT)
3658 && options[i].var != (char_u *)&p_cm 3662 && options[i].var != (char_u *)&p_cm
3659 && options[i].var != (char_u *)&p_key 3663 && options[i].var != (char_u *)&p_key
3660 #endif 3664 # endif
3661 ))) 3665 ))
3666 #endif
3667 )
3662 set_option_default(i, opt_flags, p_cp); 3668 set_option_default(i, opt_flags, p_cp);
3663 3669
3664 #ifdef FEAT_WINDOWS 3670 #ifdef FEAT_WINDOWS
3665 /* The 'scroll' option must be computed for all windows. */ 3671 /* The 'scroll' option must be computed for all windows. */
3666 FOR_ALL_TAB_WINDOWS(tp, wp) 3672 FOR_ALL_TAB_WINDOWS(tp, wp)