summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-08-28 23:36:52 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-28 23:36:52 +0100
commit926218b5dad0dcdc273ccd92436a72f038d222c4 (patch)
treef59a1c07f95bef0a65141b2429b851166724ec50 /src
parentb849c82851192cf14cd92b78d83d90ca432332ea (diff)
patch 9.0.0311: test for hit-Enter prompt failsv9.0.0311
Problem: Test for hit-Enter prompt fails. Solution: Only reset cmdline_row when 'cmdheight' is zero.
Diffstat (limited to 'src')
-rw-r--r--src/drawscreen.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/drawscreen.c b/src/drawscreen.c
index aa5b8f7eb7..ecbdd9f0f2 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -831,8 +831,9 @@ after_updating_screen(int may_resize_shell UNUSED)
handle_any_postponed_drop();
#endif
- // in case it was changed in dont_use_message_window()
- cmdline_row = Rows - p_ch;
+ if (p_ch == 0)
+ // in case it was changed in dont_use_message_window()
+ cmdline_row = Rows;
}
/*
diff --git a/src/version.c b/src/version.c
index d8a68626ca..e6ecb97963 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 */
/**/
+ 311,
+/**/
310,
/**/
309,