Mercurial > vim

comparison src/menu.c @ 12871:1a450ce6980c v8.0.1312

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 259983a729fa
children ac42c4b11dbc
comparison
equal deleted inserted replaced
12870:0469872186f5 12871:1a450ce6980c
813 menu->noremap[i] = menuarg->noremap[0]; 813 menu->noremap[i] = menuarg->noremap[0];
814 menu->silent[i] = menuarg->silent[0]; 814 menu->silent[i] = menuarg->silent[0];
815 } 815 }
816 } 816 }
817 #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) \ 817 #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) \
818 && (defined(FEAT_BEVAL) || defined(FEAT_GUI_GTK)) 818 && (defined(FEAT_BEVAL_GUI) || defined(FEAT_GUI_GTK))
819 /* Need to update the menu tip. */ 819 /* Need to update the menu tip. */
820 if (modes & MENU_TIP_MODE) 820 if (modes & MENU_TIP_MODE)
821 gui_mch_menu_set_tip(menu); 821 gui_mch_menu_set_tip(menu);
822 #endif 822 #endif
823 } 823 }
1008 menu->modes |= child->modes; 1008 menu->modes |= child->modes;
1009 if (modes & MENU_TIP_MODE) 1009 if (modes & MENU_TIP_MODE)
1010 { 1010 {
1011 free_menu_string(menu, MENU_INDEX_TIP); 1011 free_menu_string(menu, MENU_INDEX_TIP);
1012 #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) \ 1012 #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) \
1013 && (defined(FEAT_BEVAL) || defined(FEAT_GUI_GTK)) 1013 && (defined(FEAT_BEVAL_GUI) || defined(FEAT_GUI_GTK))
1014 /* Need to update the menu tip. */ 1014 /* Need to update the menu tip. */
1015 if (gui.in_use) 1015 if (gui.in_use)
1016 gui_mch_menu_set_tip(menu); 1016 gui_mch_menu_set_tip(menu);
1017 #endif 1017 #endif
1018 } 1018 }