patch 9.0.0310: output of :messages dissappears when cmdheight is zero

Problem:    Output of :messages dissappears when cmdheight is zero.
Solution:   Do not use the messages window for :messages.  Make Esc close the
            messages window.

diff --git a/src/message.c b/src/message.c
index 096f274dd30fc8902a9ee862f468628effaa15b1..e4f8af11afa168be6610bb43a6c8a88acc06638e 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -1077,6 +1077,7 @@ ex_messages(exarg_T *eap)
     }
 
     msg_hist_off = TRUE;
+    dont_use_message_window();
 
     p = first_msg_hist;
     if (eap->addr_count != 0)

diff --git a/src/normal.c b/src/normal.c
index 6fcdaeb78efeec3fbe54ff52518ce6aacefdfb08..12b611e1742d6fb779d4d804fdd4a804c33cceb7 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -6820,7 +6820,14 @@ nv_esc(cmdarg_T *cap)
        redraw_curbuf_later(UPD_INVERTED);
     }
     else if (no_reason)
-       vim_beep(BO_ESC);
+    {
+#ifdef HAS_MESSAGE_WINDOW
+       if (popup_message_win_visible())
+           popup_hide_message_win();
+       else
+#endif
+           vim_beep(BO_ESC);
+    }
     clearop(cap->oap);
 
     // A CTRL-C is often used at the start of a menu.  When 'insertmode' is

diff --git a/src/version.c b/src/version.c
index c69e46c491bdff7961609356f38eb3a01dd1684f..d8a68626ca8271ae8ea1e596b08b2623bf75fdeb 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 */
+/**/
+    310,
 /**/
     309,
 /**/