aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/charset.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/charset.c')
-rw-r--r--src/nvim/charset.c24
1 files changed, 3 insertions, 21 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c
index ae5da557d5..1c979365bf 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -321,11 +321,6 @@ void trans_characters(char_u *buf, int bufsize)
}
}
-#if defined(FEAT_EVAL) \
- || defined(FEAT_TITLE) \
- || defined(FEAT_INS_EXPAND) \
- || defined(PROTO)
-
/// Translate a string into allocated memory, replacing special chars with
/// printable chars. Returns NULL when out of memory.
///
@@ -394,9 +389,6 @@ char_u *transstr(char_u *s)
return res;
}
-#endif // if defined(FEAT_EVAL) || defined(FEAT_TITLE)
- // || defined(FEAT_INS_EXPAND) || defined(PROTO)
-
/// Convert the string "str[orglen]" to do ignore-case comparing. Uses the
/// current locale.
///
@@ -756,19 +748,11 @@ int vim_strnsize(char_u *s, int len)
return ptr2cells(p); \
}
-#if defined(FEAT_VREPLACE) \
- || defined(FEAT_EX_EXTRA) \
- || defined(FEAT_GUI) \
- || defined(FEAT_VIRTUALEDIT) \
- || defined(PROTO)
int chartabsize(char_u *p, colnr_T col)
{
RET_WIN_BUF_CHARTABSIZE(curwin, curbuf, p, col)
}
-#endif /* if defined(FEAT_VREPLACE) || defined(FEAT_EX_EXTRA) ||
- defined(FEAT_GUI) || defined(FEAT_VIRTUALEDIT) || defined(PROTO) */
-
static int win_chartabsize(win_T *wp, char_u *p, colnr_T col)
{
RET_WIN_BUF_CHARTABSIZE(wp, wp->w_buffer, p, col)
@@ -1838,9 +1822,7 @@ int hex2nr(int c)
return c - '0';
}
-#if defined(FEAT_TERMRESPONSE) \
- || (defined(FEAT_GUI_GTK) && defined(FEAT_WINDOWS)) \
- || defined(PROTO)
+#if defined(FEAT_TERMRESPONSE) || defined(FEAT_GUI_GTK) || defined(PROTO)
/// Convert two hex characters to a byte.
/// Return -1 if one of the characters is not hex.
@@ -1857,8 +1839,8 @@ int hexhex2nr(char_u *p)
return (hex2nr(p[0]) << 4) + hex2nr(p[1]);
}
-#endif // if defined(FEAT_TERMRESPONSE) || (defined(FEAT_GUI_GTK)
- // && defined(FEAT_WINDOWS)) || defined(PROTO)
+#endif // if defined(FEAT_TERMRESPONSE) || defined(FEAT_GUI_GTK)
+ // || defined(PROTO)
/// Return TRUE if "str" starts with a backslash that should be removed.
/// For WIN32 this is only done when the character after the