To: vim_dev@googlegroups.com Subject: Patch 9.0.0431 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0431 Problem: Current mode shows in message window. Solution: Reset in_echowindow before redrawing. (issue #11094) Files: src/popupwin.c, src/testdir/test_messages.vim, src/testdir/dumps/Test_echowin_showmode.dump *** ../vim-9.0.0430/src/popupwin.c 2022-09-02 15:15:11.063569185 +0100 --- src/popupwin.c 2022-09-09 20:17:08.092425535 +0100 *************** *** 4545,4550 **** --- 4545,4552 ---- void end_echowindow(void) { + in_echowindow = FALSE; + // show the message window now redraw_cmd(FALSE); *************** *** 4553,4559 **** msg_didout = TRUE; if (msg_col == 0) msg_col = 1; - in_echowindow = FALSE; } #endif --- 4555,4560 ---- *** ../vim-9.0.0430/src/testdir/test_messages.vim 2022-09-02 12:16:01.876714257 +0100 --- src/testdir/test_messages.vim 2022-09-09 20:13:57.696902371 +0100 *************** *** 440,444 **** --- 440,464 ---- call delete('XtestEchowindow') endfunc + " messages window should not be used for showing the mode + func Test_echowin_showmode() + CheckScreendump + + let lines =<< trim END + vim9script + setline(1, ['one', 'two']) + timer_start(100, (_) => { + echowin 'echo window' + }) + normal V + END + call writefile(lines, 'XtestEchowinMode', 'D') + let buf = RunVimInTerminal('-S XtestEchowinMode', #{rows: 8}) + call VerifyScreenDump(buf, 'Test_echowin_showmode', {}) + + " clean up + call StopVimInTerminal(buf) + endfunc + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-9.0.0430/src/testdir/dumps/Test_echowin_showmode.dump 2022-09-09 20:18:48.196173800 +0100 --- src/testdir/dumps/Test_echowin_showmode.dump 2022-09-09 20:14:01.108893857 +0100 *************** *** 0 **** --- 1,8 ---- + >o+0&#ffffff0|n+0&#e0e0e08|e| | +0&#ffffff0@70 + |t|w|o| @71 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |═+0#e000002&@74 + |e|c|h|o| |w|i|n|d|o|w| @63 + |-+2#0000000&@1| |V|I|S|U|A|L| |L|I|N|E| |-@1| +0&&@29|1| @8|1|,|1| @10|A|l@1| *** ../vim-9.0.0430/src/version.c 2022-09-09 18:46:41.558660414 +0100 --- src/version.c 2022-09-09 20:16:02.288590621 +0100 *************** *** 705,706 **** --- 705,708 ---- { /* Add new patch number below this line */ + /**/ + 431, /**/ -- hundred-and-one symptoms of being an internet addict: 34. You laugh at people with a 10 Mbit connection. /// Bram Moolenaar -- Bram@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 ///