Mercurial > vim
comparison src/option.c @ 10960:d7b78cbf85e4 v8.0.0369
patch 8.0.0369: a few options are not defined, depending on features
commit https://github.com/vim/vim/commit/c43a8b8de0676caf8a460b6af1310d7aba8221bb
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 25 21:12:29 2017 +0100
patch 8.0.0369: a few options are not defined, depending on features
Problem: The 'balloondelay', 'ballooneval' and 'balloonexpr' options are
not defined without the +balloon_eval feature. Testing that an
option value fails does not work for unsupported options.
Solution: Make the options defined but not supported. Don't test if
setting unsupported options fails.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 25 Feb 2017 21:15:03 +0100 |
parents | 32b299ae6752 |
children | 6da4287fd735 |
comparison
equal
deleted
inserted
replaced
10959:1ac05274d9ee | 10960:d7b78cbf85e4 |
---|---|
622 #else | 622 #else |
623 (char_u *)NULL, PV_NONE, | 623 (char_u *)NULL, PV_NONE, |
624 {(char_u *)0L, (char_u *)0L} | 624 {(char_u *)0L, (char_u *)0L} |
625 #endif | 625 #endif |
626 SCRIPTID_INIT}, | 626 SCRIPTID_INIT}, |
627 {"balloondelay","bdlay",P_NUM|P_VI_DEF, | |
627 #ifdef FEAT_BEVAL | 628 #ifdef FEAT_BEVAL |
628 {"balloondelay","bdlay",P_NUM|P_VI_DEF, | |
629 (char_u *)&p_bdlay, PV_NONE, | 629 (char_u *)&p_bdlay, PV_NONE, |
630 {(char_u *)600L, (char_u *)0L} SCRIPTID_INIT}, | 630 {(char_u *)600L, (char_u *)0L} |
631 #else | |
632 (char_u *)NULL, PV_NONE, | |
633 {(char_u *)0L, (char_u *)0L} | |
634 #endif | |
635 SCRIPTID_INIT}, | |
631 {"ballooneval", "beval",P_BOOL|P_VI_DEF|P_NO_MKRC, | 636 {"ballooneval", "beval",P_BOOL|P_VI_DEF|P_NO_MKRC, |
637 #ifdef FEAT_BEVAL | |
632 (char_u *)&p_beval, PV_NONE, | 638 (char_u *)&p_beval, PV_NONE, |
633 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, | 639 {(char_u *)FALSE, (char_u *)0L} |
634 # ifdef FEAT_EVAL | 640 #else |
641 (char_u *)NULL, PV_NONE, | |
642 {(char_u *)0L, (char_u *)0L} | |
643 #endif | |
644 SCRIPTID_INIT}, | |
635 {"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, | 645 {"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, |
646 #if defined(FEAT_BEVAL) && defined(FEAT_EVAL) | |
636 (char_u *)&p_bexpr, PV_BEXPR, | 647 (char_u *)&p_bexpr, PV_BEXPR, |
637 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, | 648 {(char_u *)"", (char_u *)0L} |
638 # endif | 649 #else |
639 #endif | 650 (char_u *)NULL, PV_NONE, |
651 {(char_u *)0L, (char_u *)0L} | |
652 #endif | |
653 SCRIPTID_INIT}, | |
640 {"beautify", "bf", P_BOOL|P_VI_DEF, | 654 {"beautify", "bf", P_BOOL|P_VI_DEF, |
641 (char_u *)NULL, PV_NONE, | 655 (char_u *)NULL, PV_NONE, |
642 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, | 656 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, |
643 {"belloff", "bo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, | 657 {"belloff", "bo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, |
644 (char_u *)&p_bo, PV_NONE, | 658 (char_u *)&p_bo, PV_NONE, |