summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-08-28 12:06:21 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-28 12:06:21 +0100
commitb0509c542ed974cb388d49273d365ff2daf43159 (patch)
treebce4fb65d329cf42ef735f0a9c4b8827f39379b6
parentd1f8fd59074d9c8b4d00ccdea77726a9195e0be4 (diff)
downloadvim-git-b0509c542ed974cb388d49273d365ff2daf43159.tar.gz
patch 9.0.0293: messages window not hidden when starting a command linev9.0.0293
Problem: Messages window not hidden when starting a command line. Solution: Hide the messages window. (closes #10996)
-rw-r--r--src/ex_getln.c3
-rw-r--r--src/testdir/test_messages.vim5
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 587a9ff3d..1644de812 100644
--- 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 bb761ab83..00e942e7b 100644
--- 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 4ff578f59..b25ed44f5 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 */
/**/
+ 293,
+/**/
292,
/**/
291,