Patch 8.2.2800

[Bram Moolenaar]

Patch 8.2.2800
Problem: After a timer displays text a hit-enter prompt is given.
Solution: Reset msg_didany and need_wait_return. (closes #8136)
Files: src/drawscreen.c, src/testdir/test_timers.vim


*** ../vim-8.2.2799/src/drawscreen.c 2021-04-11 13:29:13.194824346 +0200
--- src/drawscreen.c 2021-04-22 21:36:46.615650238 +0200
***************
*** 3002,3007 ****
--- 3002,3014 ----
// 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
*** ../vim-8.2.2799/src/testdir/test_timers.vim 2020-09-04 21:18:40.492161906 +0200
--- src/testdir/test_timers.vim 2021-04-22 21:37:44.687710467 +0200
***************
*** 449,452 ****
--- 449,474 ----
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
*** ../vim-8.2.2799/src/version.c 2021-04-21 17:57:22.868103110 +0200
--- src/version.c 2021-04-22 21:18:46.445183147 +0200
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2800,
/**/

--
hundred-and-one symptoms of being an internet addict:
151. You find yourself engaged to someone you've never actually met,
except through e-mail.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///