summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_messages.vim7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index 8a7d05509..bb761ab83 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -387,9 +387,7 @@ func Test_fileinfo_after_echo()
call delete('b.txt')
endfunc
-" FIXME: running this last as it seems to cause
-" Test_mapping_at_hit_return_prompt() to faile
-func Test_x_cmdheight_zero()
+func Test_cmdheight_zero()
enew
set cmdheight=0
set showcmd
@@ -463,6 +461,9 @@ func Test_x_cmdheight_zero()
set showcmd&
tabnew
tabonly
+
+ "redraw to hide the popup window
+ redraw
endfunc
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index cb54364b0..4ff578f59 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 */
/**/
+ 292,
+/**/
291,
/**/
290,