summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-08-28 17:53:23 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-28 17:53:23 +0100
commit878e1d25a0a5b03233bf6ad64073fcf576c2aea5 (patch)
tree49f2e1b6e498e3560aaa45bcde1531a31b2de15a
parenta85e4db9780a4cf7a72cbb98c7127922f668cdf6 (diff)
patch 9.0.0301: the message window popup is delayed after an error messagev9.0.0301
Problem: The message window popup is delayed after an error message. Solution: Do not set emsg_on_display when using the message window.
-rw-r--r--src/message.c8
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/message.c b/src/message.c
index aa3506ebef..e73b837727 100644
--- a/src/message.c
+++ b/src/message.c
@@ -750,8 +750,12 @@ emsg_core(char_u *s)
#endif
}
- emsg_on_display = TRUE; // remember there is an error message
- attr = HL_ATTR(HLF_E); // set highlight mode for error messages
+#ifdef HAS_MESSAGE_WINDOW
+ if (!use_message_window())
+#endif
+ emsg_on_display = TRUE; // remember there is an error message
+
+ attr = HL_ATTR(HLF_E); // set highlight mode for error messages
if (msg_scrolled != 0)
need_wait_return = TRUE; // needed in case emsg() is called after
// wait_return has reset need_wait_return
diff --git a/src/version.c b/src/version.c
index fcd142ea00..31e8182ca9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -708,6 +708,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 301,
+/**/
300,
/**/
299,