comparison src/feature.h @ 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 851393938fa3
comparison
equal deleted inserted replaced
12870:0469872186f5 12871:1a450ce6980c
1315 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)) \ 1315 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)) \
1316 && ( ((defined(FEAT_TOOLBAR) || defined(FEAT_GUI_TABLINE)) \ 1316 && ( ((defined(FEAT_TOOLBAR) || defined(FEAT_GUI_TABLINE)) \
1317 && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)) \ 1317 && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)) \
1318 || defined(FEAT_SUN_WORKSHOP) \ 1318 || defined(FEAT_SUN_WORKSHOP) \
1319 || defined(FEAT_NETBEANS_INTG) || defined(FEAT_EVAL)) 1319 || defined(FEAT_NETBEANS_INTG) || defined(FEAT_EVAL))
1320 # define FEAT_BEVAL 1320 # define FEAT_BEVAL_GUI
1321 # if !defined(FEAT_XFONTSET) && !defined(FEAT_GUI_GTK) \ 1321 # if !defined(FEAT_XFONTSET) && !defined(FEAT_GUI_GTK) \
1322 && !defined(FEAT_GUI_W32) 1322 && !defined(FEAT_GUI_W32)
1323 # define FEAT_XFONTSET 1323 # define FEAT_XFONTSET
1324 # endif 1324 # endif
1325 #endif 1325 #endif
1326 1326
1327 #if defined(FEAT_BEVAL) && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) 1327 #if defined(FEAT_BEVAL_GUI) && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA))
1328 # define FEAT_BEVAL_TIP /* balloon eval used for toolbar tooltip */ 1328 # define FEAT_BEVAL_TIP /* balloon eval used for toolbar tooltip */
1329 #endif 1329 #endif
1330 1330
1331 /* 1331 /*
1332 * +balloon_eval_term Allow balloon expression evaluation in the terminal. 1332 * +balloon_eval_term Allow balloon expression evaluation in the terminal.
1333 */ 1333 */
1334 #if defined(FEAT_BEVAL) && defined(UNIX) && defined(FEAT_TIMERS) 1334 #if defined(FEAT_HUGE) && defined(UNIX) && defined(FEAT_TIMERS)
1335 # define FEAT_BEVALTERM 1335 # define FEAT_BEVAL_TERM
1336 #endif
1337
1338 #if defined(FEAT_BEVAL_GUI) || defined(FEAT_BEVAL_TERM)
1339 # define FEAT_BEVAL
1336 #endif 1340 #endif
1337 1341
1338 /* both Motif and Athena are X11 and share some code */ 1342 /* both Motif and Athena are X11 and share some code */
1339 #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) 1343 #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
1340 # define FEAT_GUI_X11 1344 # define FEAT_GUI_X11