patch 8.2.2800: after a timer displays text a hit-enter prompt is given
Problem: After a timer displays text a hit-enter prompt is given.
Solution: Reset msg_didany and need_wait_return. (closes #8136)
diff --git a/src/drawscreen.c b/src/drawscreen.c
index 7df4a96..4a716b2 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -3002,6 +3002,13 @@
// keep the command line if possible
update_screen(VALID_NO_UPDATE);
setcursor();
+
+ if (msg_scrolled == 0)
+ {
+ // don't want a hit-enter prompt when something else is displayed
+ msg_didany = FALSE;
+ need_wait_return = FALSE;
+ }
}
cursor_on();
#ifdef FEAT_GUI
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 47e2699..caeeed6 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -449,4 +449,26 @@
call delete('XTest_timerchange')
endfunc
+func Test_timer_outputting_message()
+ CheckRunVimInTerminal
+
+ let lines =<< trim END
+ vim9script
+ setline(1, 'some text')
+ set showcmd ut=2000 cmdheight=1
+ timer_start(0, (_) => {
+ echon repeat('x', &columns - 11)
+ })
+ END
+ call writefile(lines, 'XTest_timermessage')
+ let buf = RunVimInTerminal('-S XTest_timermessage', #{rows: 6})
+ call term_sendkeys(buf, "l")
+ call term_wait(buf)
+ " should not get a hit-enter prompt
+ call WaitForAssert({-> assert_match('xxxxxxxxxxx', term_getline(buf, 6))})
+
+ call StopVimInTerminal(buf)
+ call delete('XTest_timermessage')
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 1c33c9f..ebe5268 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2800,
+/**/
2799,
/**/
2798,