aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc

Browse Source 
Problem:    Mode is not cleared when leaving Insert mode with mapped Esc.
Solution:   Clear the mode when redraw_cmdline is set. (closes #4269)
This commit is contained in:
Bram Moolenaar
2019-04-20 23:38:07 +02:00
parent 0fdd943595
commit 4c25bd785a
4 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/screen.c
View File

@@ -790,7 +790,7 @@ update_screen(int type_arg)
/* Clear or redraw the command line. Done last, because scrolling may
* mess up the command line. */
if (clear_cmdline || redraw_cmdline)
if (clear_cmdline || redraw_cmdline || redraw_mode)
showmode();
if (no_update)
@@ -857,7 +857,7 @@ update_prepare(void)
static void
update_finish(void)
{
if (redraw_cmdline)
if (redraw_cmdline || redraw_mode)
showmode();
# ifdef FEAT_SEARCH_EXTRA
@@ -10128,7 +10128,7 @@ skip_showmode()
|| !redrawing()
|| (char_avail() && !KeyTyped))
{
redraw_cmdline = TRUE; // show mode later
redraw_mode = TRUE; // show mode later
return TRUE;
}
return FALSE;
@@ -10140,6 +10140,7 @@ skip_showmode()
* If clear_cmdline is TRUE, clear the rest of the cmdline.
* If clear_cmdline is FALSE there may be a message there that needs to be
* cleared only if a mode is shown.
* If redraw_mode is TRUE show or clear the mode.
* Return the length of the message (0 if no message).
*/
int
@@ -10313,7 +10314,7 @@ showmode(void)
}
mode_displayed = TRUE;
if (need_clear || clear_cmdline)
if (need_clear || clear_cmdline || redraw_mode)
msg_clr_eos();
msg_didout = FALSE; /* overwrite this message */
length = msg_col;
@@ -10323,6 +10324,11 @@ showmode(void)
else if (clear_cmdline && msg_silent == 0)
/* Clear the whole command line. Will reset "clear_cmdline". */
msg_clr_cmdline();
else if (redraw_mode)
{
msg_pos_mode();
msg_clr_eos();
}
#ifdef FEAT_CMDL_INFO
/* In Visual mode the size of the selected area must be redrawn. */
@@ -10335,6 +10341,7 @@ showmode(void)
win_redr_ruler(lastwin, TRUE, FALSE);
#endif
redraw_cmdline = FALSE;
redraw_mode = FALSE;
clear_cmdline = FALSE;
return length;