aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/menu.c2
-rw-r--r--src/nvim/term.c3
-rw-r--r--src/nvim/ui.c3
3 files changed, 3 insertions, 5 deletions
diff --git a/src/nvim/menu.c b/src/nvim/menu.c
index 44ae72a3dd..0f86a65bb5 100644
--- a/src/nvim/menu.c
+++ b/src/nvim/menu.c
@@ -1395,7 +1395,7 @@ void ex_emenu(exarg_T *eap)
}
#if defined(FEAT_GUI_MSWIN) \
- || (defined(FEAT_GUI_GTK) && defined(FEAT_MENU)) \
+ || defined(FEAT_GUI_GTK) \
|| defined(FEAT_BEVAL_TIP) || defined(PROTO)
/*
* Given a menu descriptor, e.g. "File.New", find it in the menu hierarchy.
diff --git a/src/nvim/term.c b/src/nvim/term.c
index c4a190c818..7ec758fc92 100644
--- a/src/nvim/term.c
+++ b/src/nvim/term.c
@@ -2324,8 +2324,7 @@ void ttest(int pairs)
t_colors = atoi((char *)T_CCO);
}
-#if (defined(FEAT_GUI) && (defined(FEAT_MENU) || !defined(USE_ON_FLY_SCROLL))) \
- || defined(PROTO)
+#if defined(FEAT_GUI) || defined(PROTO)
static int get_long_from_buf(char_u *buf, long_u *val);
/*
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index e00ee8b8d0..256d35f089 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -329,8 +329,7 @@ void add_to_input_buf(char_u *s, int len)
|| defined(FEAT_GUI_MSWIN) \
|| defined(FEAT_GUI_MAC) \
|| defined(FEAT_MBYTE_IME) \
- || (defined(FEAT_GUI) && (!defined(USE_ON_FLY_SCROLL) \
- || defined(FEAT_MENU))) \
+ || defined(FEAT_GUI) \
|| defined(PROTO)
/*
* Add "str[len]" to the input buffer while escaping CSI bytes.