aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 9.0.0500: when quitting cmdline window with CTRL-C it remains visible

Browse Source 
Problem:    When quitting the cmdline window with CTRL-C it remains visible.
Solution:   Redraw to avoid confusion. Adjust the error message.
            (closes #11152)  Adjust the cursor position after CTRL-C.
This commit is contained in:
Bram Moolenaar
2022-09-18 15:08:19 +01:00
parent 566badc76b
commit b2f0ca820e
6 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ex_getln.c
View File

@@ -4631,13 +4631,11 @@ open_cmdwin(void)
ccline.cmdlen = (int)STRLEN(ccline.cmdbuff);
ccline.cmdbufflen = ccline.cmdlen + 1;
ccline.cmdpos = curwin->w_cursor.col;
if (ccline.cmdpos > ccline.cmdlen)
// If the cursor is on the last character, it probably should be
// after it.
if (ccline.cmdpos == ccline.cmdlen - 1
|| ccline.cmdpos > ccline.cmdlen)
ccline.cmdpos = ccline.cmdlen;
if (cmdwin_result == K_IGNORE)
{
set_cmdspos_cursor();
redrawcmd();
}
}
# ifdef FEAT_CONCEAL
@@ -4664,6 +4662,15 @@ open_cmdwin(void)
// Restore window sizes.
win_size_restore(&winsizes);
skip_win_fix_cursor = FALSE;
if (cmdwin_result == K_IGNORE)
{
// It can be confusing that the cmdwin still shows, redraw the
// screen.
update_screen(UPD_VALID);
set_cmdspos_cursor();
redrawcmd();
}
}
ga_clear(&winsizes);