IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Macro cleanup: FEAT_GUI_W32

Browse Source
This commit is contained in:
Hettomei 2015-05-08 13:02:05 +02:00 committed by Justin M. Keyes
parent 1b7dcb2f70
commit 031758ad5c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/eval.c
View File

@ -9937,7 +9937,6 @@ static void f_has(typval_T *argvars, typval_T *rettv)
"arabic", "arabic",
"autocmd", "autocmd",
#if defined(FEAT_BROWSE) && (defined(USE_FILE_CHOOSER) \ #if defined(FEAT_BROWSE) && (defined(USE_FILE_CHOOSER) \
|| defined(FEAT_GUI_W32) \
|| defined(FEAT_GUI_MOTIF)) || defined(FEAT_GUI_MOTIF))
"browsefilter", "browsefilter",
#endif #endif

6
src/nvim/menu.c
View File

@ -460,7 +460,7 @@ add_menu_path (
menu->silent[i] = menuarg->silent[0]; menu->silent[i] = menuarg->silent[0];
} }
} }
#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) \ #if defined(FEAT_TOOLBAR) \
&& (defined(FEAT_BEVAL) || defined(FEAT_GUI_GTK)) && (defined(FEAT_BEVAL) || defined(FEAT_GUI_GTK))
/* Need to update the menu tip. */ /* Need to update the menu tip. */
if (modes & MENU_TIP_MODE) if (modes & MENU_TIP_MODE)
@ -613,8 +613,8 @@ remove_menu (
menu->modes |= child->modes; menu->modes |= child->modes;
if (modes & MENU_TIP_MODE) { if (modes & MENU_TIP_MODE) {
free_menu_string(menu, MENU_INDEX_TIP); free_menu_string(menu, MENU_INDEX_TIP);
#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) \ #if defined(FEAT_TOOLBAR) && \
&& (defined(FEAT_BEVAL) || defined(FEAT_GUI_GTK)) (defined(FEAT_BEVAL) || defined(FEAT_GUI_GTK))
/* Need to update the menu tip. */ /* Need to update the menu tip. */
if (gui.in_use) if (gui.in_use)
gui_mch_menu_set_tip(menu); gui_mch_menu_set_tip(menu);

2
src/nvim/vim.h
View File

@ -338,7 +338,7 @@ enum {
* functions of these names. The declarations would break if the defines had * functions of these names. The declarations would break if the defines had
* been seen at that stage. But it must be before globals.h, where error_ga * been seen at that stage. But it must be before globals.h, where error_ga
* is declared. */ * is declared. */
#if !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_X11) \ #if !defined(FEAT_GUI_X11) \
&& !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC)
# define mch_errmsg(str) fprintf(stderr, "%s", (str)) # define mch_errmsg(str) fprintf(stderr, "%s", (str))
# define display_errors() fflush(stderr) # define display_errors() fflush(stderr)