diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-31 15:38:45 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-31 16:44:53 -0500 |
| commit | 723e009214ab321ad75051d3c36e3379b1c5e5a8 (patch) | |
| tree | 10e57056695804f3479176d28fc62f77b56bf20f /src/nvim/ex_cmds.c | |
| parent | 74b343a6f23de43590ab79750848f66e2fa9a7f7 (diff) | |
| download | rneovim-723e009214ab321ad75051d3c36e3379b1c5e5a8.tar.gz rneovim-723e009214ab321ad75051d3c36e3379b1c5e5a8.tar.bz2 rneovim-723e009214ab321ad75051d3c36e3379b1c5e5a8.zip | |
Revert "vim-patch:8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc"
This reverts commit 44bb7147e40743d9a70ee3a2663a7a7dacec7b13.
Avoid regression mentioned in https://github.com/neovim/neovim/commit/c64cce906e7ed828d331e1786c985ff7aa734546#commitcomment-45554271
Diffstat (limited to 'src/nvim/ex_cmds.c')
| -rw-r--r-- | src/nvim/ex_cmds.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index a7d97c904b..ae389a6727 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -3713,9 +3713,8 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, redraw_later(curwin, SOME_VALID); curwin->w_p_fen = save_p_fen; - if (msg_row == Rows - 1) { - msg_didout = false; // avoid a scroll-up - } + if (msg_row == Rows - 1) + msg_didout = FALSE; /* avoid a scroll-up */ msg_starthere(); i = msg_scroll; msg_scroll = 0; /* truncate msg when @@ -3734,8 +3733,8 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, typed = plain_vgetc(); no_mapping--; - // clear the question - msg_didout = false; // don't scroll up + /* clear the question */ + msg_didout = FALSE; /* don't scroll up */ msg_col = 0; gotocmdline(TRUE); |