vim-patch:9.0.0747: too many #ifdefs (#20641)

Problem:    Too many #ifdefs.
Solution:   Gradudate the +cmdline_info feature. (Martin Tournoij,
            closes vim/vim#11330)
ba43e76fcd
This commit is contained in:
zeertzjq
2022-10-14 07:29:58 +08:00
committed by GitHub
parent eb123b565e
commit 0578c67767
3 changed files with 5 additions and 0 deletions

View File

@@ -1132,6 +1132,7 @@ static int normal_execute(VimState *state, int key)
if (s->need_flushbuf) { if (s->need_flushbuf) {
ui_flush(); ui_flush();
} }
if (s->ca.cmdchar != K_IGNORE && s->ca.cmdchar != K_EVENT) { if (s->ca.cmdchar != K_IGNORE && s->ca.cmdchar != K_EVENT) {
did_cursorhold = false; did_cursorhold = false;
} }
@@ -3513,6 +3514,7 @@ static bool nv_z_get_count(cmdarg_T *cap, int *nchar_arg)
no_mapping--; no_mapping--;
allow_keys--; allow_keys--;
(void)add_to_showcmd(nchar); (void)add_to_showcmd(nchar);
if (nchar == K_DEL || nchar == K_KDEL) { if (nchar == K_DEL || nchar == K_KDEL) {
n /= 10; n /= 10;
} else if (ascii_isdigit(nchar)) { } else if (ascii_isdigit(nchar)) {
@@ -3553,6 +3555,7 @@ static int nv_zg_zw(cmdarg_T *cap, int nchar)
no_mapping--; no_mapping--;
allow_keys--; allow_keys--;
(void)add_to_showcmd(nchar); (void)add_to_showcmd(nchar);
if (vim_strchr("gGwW", nchar) == NULL) { if (vim_strchr("gGwW", nchar) == NULL) {
clearopbeep(cap->oap); clearopbeep(cap->oap);
return OK; return OK;

View File

@@ -860,6 +860,7 @@ int showmode(void)
if (redrawing() && last->w_status_height == 0 && global_stl_height() == 0) { if (redrawing() && last->w_status_height == 0 && global_stl_height() == 0) {
win_redr_ruler(last, true); win_redr_ruler(last, true);
} }
redraw_cmdline = false; redraw_cmdline = false;
redraw_mode = false; redraw_mode = false;
clear_cmdline = false; clear_cmdline = false;

View File

@@ -554,6 +554,7 @@ wingotofile:
no_mapping--; no_mapping--;
allow_keys--; allow_keys--;
(void)add_to_showcmd(xchar); (void)add_to_showcmd(xchar);
switch (xchar) { switch (xchar) {
case '}': case '}':
xchar = Ctrl_RSB; xchar = Ctrl_RSB;