patch 9.0.0657: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate the +cmdwin feature. Now the tiny and small builds are
equal, drop the small build. (Martin Tournoij, closes #11268)
diff --git a/src/getchar.c b/src/getchar.c
index 124a610..10f7f0e 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3372,9 +3372,7 @@
if (ex_normal_busy > 0)
{
-#ifdef FEAT_CMDWIN
static int tc = 0;
-#endif
// No typeahead left and inside ":normal". Must return
// something to avoid getting stuck. When an incomplete
@@ -3398,16 +3396,11 @@
c = K_CANCEL;
#endif
else if ((State & MODE_CMDLINE)
-#ifdef FEAT_CMDWIN
- || (cmdwin_type > 0 && tc == ESC)
-#endif
- )
+ || (cmdwin_type > 0 && tc == ESC))
c = Ctrl_C;
else
c = ESC;
-#ifdef FEAT_CMDWIN
tc = c;
-#endif
// set a flag to indicate this wasn't a normal char
if (advance)
typebuf_was_empty = TRUE;