mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-22 19:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4265 'vim-patch:7.4.925'.

Browse Source
This commit is contained in:
Justin M. Keyes
2016-03-02 01:24:38 -05:00
parent 36cb847d09 0d6cd2b808
commit 56bfdd7934
7 changed files with 78 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/nvim/screen.c
View File

@@ -6780,8 +6780,8 @@ int showmode(void)
if (Recording
&& edit_submode == NULL /* otherwise it gets too long */
) {
MSG_PUTS_ATTR(_("recording"), attr);
need_clear = TRUE;
recording_mode(attr);
need_clear = true;
}
mode_displayed = TRUE;
@@ -6820,26 +6820,33 @@ static void msg_pos_mode(void)
msg_row = Rows - 1;
}
/*
* Delete mode message. Used when ESC is typed which is expected to end
* Insert mode (but Insert mode didn't end yet!).
* Caller should check "mode_displayed".
*/
void unshowmode(int force)
/// Delete mode message. Used when ESC is typed which is expected to end
/// Insert mode (but Insert mode didn't end yet!).
/// Caller should check "mode_displayed".
void unshowmode(bool force)
{
/*
* Don't delete it right now, when not redrawing or inside a mapping.
*/
if (!redrawing() || (!force && char_avail() && !KeyTyped))
redraw_cmdline = TRUE; /* delete mode later */
else {
// Don't delete it right now, when not redrawing or inside a mapping.
if (!redrawing() || (!force && char_avail() && !KeyTyped)) {
redraw_cmdline = true; // delete mode later
} else {
msg_pos_mode();
if (Recording)
MSG_PUTS_ATTR(_("recording"), hl_attr(HLF_CM));
if (Recording) {
recording_mode(hl_attr(HLF_CM));
}
msg_clr_eos();
}
}
static void recording_mode(int attr)
{
MSG_PUTS_ATTR(_("recording"), attr);
if (!shortmess(SHM_RECORDING)) {
char_u s[4];
vim_snprintf((char *)s, ARRAY_SIZE(s), " @%c", Recording);
MSG_PUTS_ATTR(s, attr);
}
}
/*
* Draw the tab pages line at the top of the Vim window.
*/