patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Problem: FEAT_WINDOWS adds a lot of #ifdefs while it is nearly always
enabled and only adds 7% to the binary size of the tiny build.
Solution: Graduate FEAT_WINDOWS.
diff --git a/src/charset.c b/src/charset.c
index 8b83f68..4f79c90 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1092,10 +1092,7 @@
&& VIM_ISBREAK(c)
&& !VIM_ISBREAK((int)s[1])
&& wp->w_p_wrap
-# ifdef FEAT_WINDOWS
- && wp->w_width != 0
-# endif
- )
+ && wp->w_width != 0)
{
/*
* Count all characters from first non-blank after a blank up to next
@@ -1249,10 +1246,8 @@
int width1; /* width of first line (after line number) */
int width2; /* width of further lines */
-# ifdef FEAT_WINDOWS
if (wp->w_width == 0) /* there is no border */
return FALSE;
-# endif
width1 = W_WIDTH(wp) - win_col_off(wp);
if ((int)vcol < width1 - 1)
return FALSE;
@@ -2029,8 +2024,7 @@
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.