1
0
forked from aniani/vim

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)
This commit is contained in:
Martin Tournoij
2022-10-04 16:28:45 +01:00
committed by Bram Moolenaar
parent 4ba5f1dab6
commit 7904fa420e
46 changed files with 151 additions and 315 deletions

View File

@@ -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;