summaryrefslogtreecommitdiffstats
path: root/src/getchar.c
diff options
context:
space:
mode:
authorMartin Tournoij <martin@arp242.net>2022-10-04 16:28:45 +0100
committerBram Moolenaar <Bram@vim.org>2022-10-04 16:28:45 +0100
commit7904fa420eb577274c4c3711295240100167d495 (patch)
treea38ab30cb4c947c2ebba45cd7ed711ffd2e719a7 /src/getchar.c
parent4ba5f1dab656103e8f4a4505452d1816b9e83c1e (diff)
patch 9.0.0657: too many #ifdefsv9.0.0657
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)
Diffstat (limited to 'src/getchar.c')
-rw-r--r--src/getchar.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 124a610d20..10f7f0e152 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3372,9 +3372,7 @@ vgetorpeek(int advance)
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 @@ vgetorpeek(int advance)
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;