aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/getchar.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-04-30 09:46:41 -0400
committerGitHub <noreply@github.com>2017-04-30 09:46:41 -0400
commit5d73a6e5dfbd1a7ce27888e7a7ac1c402da9dfc8 (patch)
tree7652a59b6b7b7305f5b43a3ddb95c9a348cb377d /src/nvim/getchar.c
parent4afc93b926dc14365db4bad4cd4030d5d5a69747 (diff)
parent35d817e68c9d1f2fd724bf00ad6f1958a0c815a9 (diff)
downloadrneovim-5d73a6e5dfbd1a7ce27888e7a7ac1c402da9dfc8.tar.gz
rneovim-5d73a6e5dfbd1a7ce27888e7a7ac1c402da9dfc8.tar.bz2
rneovim-5d73a6e5dfbd1a7ce27888e7a7ac1c402da9dfc8.zip
Merge pull request #6621 from jamessan/vim-7.4.2231
vim-patch:7.4.2231,7.4.2239,7.4.2244,7.4.2245,7.4.2246,7.4.2263,8.0.0150
Diffstat (limited to 'src/nvim/getchar.c')
-rw-r--r--src/nvim/getchar.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 9d32df5a68..6e21ee96e8 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1592,7 +1592,7 @@ vungetc ( /* unget one character (can only be done once!) */
/// This may do a blocking wait if "advance" is TRUE.
///
/// if "advance" is TRUE (vgetc()):
-/// really get the character.
+/// Really get the character.
/// KeyTyped is set to TRUE in the case the user typed the key.
/// KeyStuffed is TRUE if the character comes from the stuff buffer.
/// if "advance" is FALSE (vpeekc()):
@@ -3168,6 +3168,10 @@ showmap (
{
size_t len = 1;
+ if (message_filtered(mp->m_keys) && message_filtered(mp->m_str)) {
+ return;
+ }
+
if (msg_didout || msg_silent != 0) {
msg_putchar('\n');
if (got_int) /* 'q' typed at MORE prompt */