Merge pull request #17932 from zeertzjq/vim-8.1.2145

vim-patch:8.1.{2145,2159,2165,2167,2333,2346,2350},8.2.{0839,0851,0855,0867,0916,0919,2084,2728,3595,4504,4819,4824,4827,4828,4829,4833,4837}

1 files changed, 3 insertions, 1 deletions

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 6708001495..3660dc20af 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1146,6 +1146,7 @@ void wait_return(int redraw)
       // Don't do mappings here, we put the character back in the
       // typeahead buffer.
       no_mapping++;
+      allow_keys++;
 
       // Temporarily disable Recording. If Recording is active, the
       // character will be recorded later, since it will be added to the
@@ -1159,6 +1160,7 @@ void wait_return(int redraw)
         got_int = false;
       }
       no_mapping--;
+      allow_keys--;
       reg_recording = save_reg_recording;
       scriptout = save_scriptout;
 
@@ -1214,7 +1216,7 @@ void wait_return(int redraw)
     } else if (vim_strchr((char_u *)"\r\n ", c) == NULL && c != Ctrl_C) {
       // Put the character back in the typeahead buffer.  Don't use the
       // stuff buffer, because lmaps wouldn't work.
-      ins_char_typebuf(c, mod_mask);
+      ins_char_typebuf(vgetc_char, vgetc_mod_mask);
       do_redraw = true;             // need a redraw even though there is
                                     // typeahead
     }