aboutsummaryrefslogtreecommitdiff
path: root/src/nvim
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim')
-rw-r--r--src/nvim/eval.c3
-rw-r--r--src/nvim/menu.c3
-rw-r--r--src/nvim/syntax.c3
3 files changed, 1 insertions, 8 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 95fb6ed732..fdd74a069b 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -1554,8 +1554,7 @@ call_func_retnr (
return retval;
}
-#if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) \
- || defined(FEAT_COMPL_FUNC) || defined(PROTO)
+#if defined(FEAT_USR_CMDS) || defined(FEAT_COMPL_FUNC) || defined(PROTO)
/*
* Call vimL function "func" and return the result as a string.
diff --git a/src/nvim/menu.c b/src/nvim/menu.c
index f71c1a351d..44ae72a3dd 100644
--- a/src/nvim/menu.c
+++ b/src/nvim/menu.c
@@ -1274,8 +1274,6 @@ static int menu_is_hidden(char_u *name)
return (name[0] == ']') || (menu_is_popup(name) && name[5] != NUL);
}
-#if defined(FEAT_CMDL_COMPL) \
- || (defined(FEAT_GUI_W32) && defined(FEAT_TEAROFF))
/*
* Return TRUE if the menu is the tearoff menu.
*/
@@ -1283,7 +1281,6 @@ static int menu_is_tearoff(char_u *name)
{
return FALSE;
}
-#endif
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index ccc6752793..746fbac0e8 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -7756,8 +7756,6 @@ static void highlight_list_two(int cnt, int attr)
}
-#if defined(FEAT_CMDL_COMPL) || (defined(FEAT_SYN_HL) && defined(FEAT_EVAL)) \
- || defined(FEAT_SIGNS) || defined(PROTO)
/*
* Function given to ExpandGeneric() to obtain the list of group names.
* Also used for synIDattr() function.
@@ -7779,7 +7777,6 @@ char_u *get_highlight_name(expand_T *xp, int idx)
return NULL;
return HL_TABLE()[idx].sg_name;
}
-#endif
/**************************************