diff options
| author | bfredl <bjorn.linse@gmail.com> | 2022-09-16 10:07:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-16 10:07:50 +0200 |
| commit | 0b7a3c173c929085f54a178c9fa852481d5f021e (patch) | |
| tree | 29816f88c85331e8b55cd2a113ab82263ee82dc4 /src/nvim/ops.c | |
| parent | 279c7b11fb89776f89789ee7e0c4f2624a10d156 (diff) | |
| parent | 708bd686516b420c2b65f4bc4d2c58fe43fb945e (diff) | |
| download | rneovim-0b7a3c173c929085f54a178c9fa852481d5f021e.tar.gz rneovim-0b7a3c173c929085f54a178c9fa852481d5f021e.tar.bz2 rneovim-0b7a3c173c929085f54a178c9fa852481d5f021e.zip | |
Merge pull request #20188 from bfredl/zerocmdline
feat(ui): use msg_grid based implementation for cmdheight=0
Diffstat (limited to 'src/nvim/ops.c')
| -rw-r--r-- | src/nvim/ops.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 420f6cf840..83484859ed 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -896,7 +896,6 @@ int do_record(int c) { char_u *p; static int regname; - static bool changed_cmdheight = false; yankreg_T *old_y_previous; int retval; @@ -907,18 +906,11 @@ int do_record(int c) retval = FAIL; } else { reg_recording = c; + // TODO(bfredl): showmode based messaging is currently missing with cmdheight=0 showmode(); regname = c; retval = OK; - if (!ui_has_messages()) { - // Enable macro indicator temporarily - set_option_value("ch", 1L, NULL, 0); - update_screen(UPD_VALID); - - changed_cmdheight = true; - } - apply_autocmds(EVENT_RECORDINGENTER, NULL, NULL, false, curbuf); } } else { // stop recording @@ -948,7 +940,7 @@ int do_record(int c) restore_v_event(dict, &save_v_event); reg_recorded = reg_recording; reg_recording = 0; - if (ui_has(kUIMessages)) { + if (p_ch == 0 || ui_has(kUIMessages)) { showmode(); } else { msg(""); @@ -964,12 +956,6 @@ int do_record(int c) y_previous = old_y_previous; } - - if (changed_cmdheight) { - // Restore cmdheight - set_option_value("ch", 0L, NULL, 0); - redraw_all_later(UPD_CLEAR); - } } return retval; } |