patch 9.0.0301: the message window popup is delayed after an error message

Problem:    The message window popup is delayed after an error message.
Solution:   Do not set emsg_on_display when using the message window.

diff --git a/src/message.c b/src/message.c
index aa3506ebef8a46d4ab0aae8d6d49a1adcd86b6f7..e73b837727eddd463a428086683dbf8dbaa54816 100644 (file)
--- 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 fcd142ea00a9c5178d37931fa445286100dcd7b9..31e8182ca91b67948f70a5d7f3cd3edf8852a50c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -707,6 +707,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    301,
 /**/
     300,
 /**/