fix(cmdline): empty ext_cmdline block events for :<CR> #33118

Problem:  An ext_cmdline block event that should be empty after :<CR>
          re-emits the previous cmdline.
Solution: Clear `last_cmdline` even when `new_last_cmdline == NULL`.
This commit is contained in:
luukvbaal
2025-03-28 12:52:57 +01:00
committed by GitHub
parent ade58885c4
commit 95ab723995
2 changed files with 22 additions and 9 deletions

View File

@@ -577,7 +577,8 @@ int do_cmdline(char *cmdline, LineGetter fgetline, void *cookie, int flags)
int indent = cstack.cs_idx < 0 ? 0 : (cstack.cs_idx + 1) * 2;
if (count >= 1 && getline_equal(fgetline, cookie, getexline)) {
if (ui_has(kUICmdline)) {
ui_ext_cmdline_block_append((size_t)MAX(0, block_indent), last_cmdline);
char *line = last_cmdline ? last_cmdline : "";
ui_ext_cmdline_block_append((size_t)MAX(0, block_indent), line);
block_indent = indent;
} else if (count == 1) {
// Need to set msg_didout for the first line after an ":if",
@@ -683,8 +684,7 @@ int do_cmdline(char *cmdline, LineGetter fgetline, void *cookie, int flags)
// If the command was typed, remember it for the ':' register.
// Do this AFTER executing the command to make :@: work.
if (getline_equal(fgetline, cookie, getexline)
&& new_last_cmdline != NULL) {
if (getline_equal(fgetline, cookie, getexline)) {
xfree(last_cmdline);
last_cmdline = new_last_cmdline;
new_last_cmdline = NULL;