patch 9.0.0293: messages window not hidden when starting a command line

Problem:    Messages window not hidden when starting a command line.
Solution:   Hide the messages window. (closes #10996)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 587a9ff3dfd3cbcf4ab61439e6befdf18f7aee68..1644de812a65e90505c28d80d8e356a1d535e42f 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1603,6 +1603,9 @@ getcmdline_int(
        made_cmdheight_nonzero = TRUE;
        lastwin->w_p_so = 0;
        set_option_value((char_u *)"ch", 1L, NULL, 0);
+#ifdef HAS_MESSAGE_WINDOW
+       popup_hide_message_win();
+#endif
        update_screen(UPD_VALID);                 // redraw the screen NOW
        made_cmdheight_nonzero = FALSE;
        lastwin->w_p_so = save_so;

diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index bb761ab83331f39472c446dc0f21496e3524532d..00e942e7b1e8e4c43f80c062d82e4e2025592439 100644 (file)
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -398,6 +398,11 @@ func Test_cmdheight_zero()
   if using_popupwin
     redraw
     call assert_equal('test echo', Screenline(&lines))
+
+    " check that the popup is cleared when entering a command line
+    call feedkeys(':', 'xt')
+    redraw
+    call assert_equal('~', Screenline(&lines))
   else
     call assert_equal(116, screenchar(&lines, 1))
   endif

diff --git a/src/version.c b/src/version.c
index 4ff578f594eae9ddca0b949b3cb24beb33fa19e9..b25ed44f53714a431746be90ef167aca72932eb8 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 */
+/**/
+    293,
 /**/
     292,
 /**/