From 84d9390480548c8d711dd772cb162a91d0bb3c30 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 11 Sep 2018 20:10:20 +0200 Subject: [PATCH] patch 8.1.0367: getchar(1) no longer processes pending messages Problem: getchar(1) no longer processes pending messages. (Yasuhiro Matsumoto) Solution: Call parse_queued_messages(). --- src/evalfunc.c | 7 +++++++ src/version.c | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/evalfunc.c b/src/evalfunc.c index 54e7dcdd3..19e2657ba 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -4680,6 +4680,13 @@ f_getchar(typval_T *argvars, typval_T *rettv) varnumber_T n; int error = FALSE; +#ifdef MESSAGE_QUEUE + // vpeekc() used to check for messages, but that caused problems, invoking + // a callback where it was not expected. Some plugins use getchar(1) in a + // loop to await a message, therefore make sure we check for messages here. + parse_queued_messages(); +#endif + /* Position the cursor. Needed after a message that ends in a space. */ windgoto(msg_row, msg_col); diff --git a/src/version.c b/src/version.c index 32f0d1d9e..3e86c4006 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 367, /**/ 366, /**/ -- 2.40.0