Mercurial > vim
comparison src/option.c @ 12871:1a450ce6980c v8.0.1312
patch 8.0.1312: balloon_show() only works in terminal when compiled with GUI
commit https://github.com/vim/vim/commit/c3719bd87beca9f72d2e9f11e36d561c2c3b57b0
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 18 22:13:31 2017 +0100
patch 8.0.1312: balloon_show() only works in terminal when compiled with GUI
Problem: balloon_show() only works in terminal when compiled with the GUI.
Solution: Add FEAT_BEVAL_GUI and refactor to move common code out of the GUI
specific file.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 18 Nov 2017 22:15:05 +0100 |
parents | ebb4f6c93598 |
children | 327e1264b9bf |
comparison
equal
deleted
inserted
replaced
12870:0469872186f5 | 12871:1a450ce6980c |
---|---|
632 (char_u *)NULL, PV_NONE, | 632 (char_u *)NULL, PV_NONE, |
633 {(char_u *)0L, (char_u *)0L} | 633 {(char_u *)0L, (char_u *)0L} |
634 #endif | 634 #endif |
635 SCRIPTID_INIT}, | 635 SCRIPTID_INIT}, |
636 {"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 | 637 #ifdef FEAT_BEVAL_GUI |
638 (char_u *)&p_beval, PV_NONE, | 638 (char_u *)&p_beval, PV_NONE, |
639 {(char_u *)FALSE, (char_u *)0L} | 639 {(char_u *)FALSE, (char_u *)0L} |
640 #else | 640 #else |
641 (char_u *)NULL, PV_NONE, | 641 (char_u *)NULL, PV_NONE, |
642 {(char_u *)0L, (char_u *)0L} | 642 {(char_u *)0L, (char_u *)0L} |
643 #endif | 643 #endif |
644 SCRIPTID_INIT}, | 644 SCRIPTID_INIT}, |
645 {"balloonevalterm", "bevalterm",P_BOOL|P_VI_DEF|P_NO_MKRC, | 645 {"balloonevalterm", "bevalterm",P_BOOL|P_VI_DEF|P_NO_MKRC, |
646 #ifdef FEAT_BEVALTERM | 646 #ifdef FEAT_BEVAL_TERM |
647 (char_u *)&p_bevalterm, PV_NONE, | 647 (char_u *)&p_bevalterm, PV_NONE, |
648 {(char_u *)FALSE, (char_u *)0L} | 648 {(char_u *)FALSE, (char_u *)0L} |
649 #else | 649 #else |
650 (char_u *)NULL, PV_NONE, | 650 (char_u *)NULL, PV_NONE, |
651 {(char_u *)0L, (char_u *)0L} | 651 {(char_u *)0L, (char_u *)0L} |
8427 else if (!p_wiv && old_value) | 8427 else if (!p_wiv && old_value) |
8428 T_XS = empty_option; | 8428 T_XS = empty_option; |
8429 p_wiv = (*T_XS != NUL); | 8429 p_wiv = (*T_XS != NUL); |
8430 } | 8430 } |
8431 | 8431 |
8432 #ifdef FEAT_BEVAL | 8432 #ifdef FEAT_BEVAL_GUI |
8433 else if ((int *)varp == &p_beval) | 8433 else if ((int *)varp == &p_beval) |
8434 { | 8434 { |
8435 if (!balloonEvalForTerm) | 8435 if (!balloonEvalForTerm) |
8436 { | 8436 { |
8437 if (p_beval && !old_value) | 8437 if (p_beval && !old_value) |
8439 else if (!p_beval && old_value) | 8439 else if (!p_beval && old_value) |
8440 gui_mch_disable_beval_area(balloonEval); | 8440 gui_mch_disable_beval_area(balloonEval); |
8441 } | 8441 } |
8442 } | 8442 } |
8443 #endif | 8443 #endif |
8444 # ifdef FEAT_BEVALTERM | 8444 #ifdef FEAT_BEVAL_TERM |
8445 else if ((int *)varp == &p_bevalterm) | 8445 else if ((int *)varp == &p_bevalterm) |
8446 { | 8446 { |
8447 mch_bevalterm_changed(); | 8447 mch_bevalterm_changed(); |
8448 } | 8448 } |
8449 # endif | 8449 #endif |
8450 | 8450 |
8451 #ifdef FEAT_AUTOCHDIR | 8451 #ifdef FEAT_AUTOCHDIR |
8452 else if ((int *)varp == &p_acd) | 8452 else if ((int *)varp == &p_acd) |
8453 { | 8453 { |
8454 /* Change directories when the 'acd' option is set now. */ | 8454 /* Change directories when the 'acd' option is set now. */ |