Mercurial > vim
changeset 32607:753b0bde34b0 v9.0.1635
patch 9.0.1635: error message is cleared when removing mode message
Commit: https://github.com/vim/vim/commit/da51ad51bf4fbd66619786d0e6a83fb3ca09930b
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jun 15 18:44:50 2023 +0100
patch 9.0.1635: error message is cleared when removing mode message
Problem: Error message is cleared when removing mode message.
Solution: Also reset flags when the message is further down.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 15 Jun 2023 19:45:04 +0200 |
| parents | 97d541860e3b |
| children | 5782057ea5d4 |
| files | src/message.c src/testdir/dumps/Test_message_not_cleared_after_mode_1.dump src/testdir/dumps/Test_message_not_cleared_after_mode_2.dump src/testdir/dumps/Test_message_not_cleared_after_mode_3.dump src/testdir/test_messages.vim src/version.c |
| diffstat | 6 files changed, 23 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/message.c +++ b/src/message.c @@ -1643,7 +1643,7 @@ msg_outtrans_len_attr(char_u *msgstr, in // When drawing over the command line no need to clear it later or remove // the mode message. - if (msg_row == cmdline_row && msg_col == 0) + if (msg_row >= cmdline_row && msg_col == 0) { clear_cmdline = FALSE; mode_displayed = FALSE;
--- a/src/testdir/dumps/Test_message_not_cleared_after_mode_1.dump +++ b/src/testdir/dumps/Test_message_not_cleared_after_mode_1.dump @@ -1,5 +1,5 @@ >o+0&#ffffff0|n|e| @71 -|t|w|o| @71 +|N|o|S|u|c|h|F|i|l|e| @64 |t|h|r|e@1| @69 |~+0#4040ff13&| @73 |~| @73
--- a/src/testdir/dumps/Test_message_not_cleared_after_mode_2.dump +++ b/src/testdir/dumps/Test_message_not_cleared_after_mode_2.dump @@ -1,5 +1,5 @@ >o+0&#ffffff0|n|e| @71 -|t|w|o| @71 +|N|o|S|u|c|h|F|i|l|e| @64 |t|h|r|e@1| @69 |~+0#4040ff13&| @73 |~| @73
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_message_not_cleared_after_mode_3.dump @@ -0,0 +1,10 @@ +|o+0&#ffffff0|n|e| @71 +|N|o|S|u|c|h|F|i|l>e| @64 +|t|h|r|e@1| @69 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@74 +|E+0#ffffff16#e000002|4@1|7|:| |C|a|n|'|t| |f|i|n|d| |f|i|l|e| |"|N|o|S|u|c|h|F|i|l|e|"| |i|n| |p|a|t|h| +0#0000000#ffffff0@14|2|,|1|0| @9|A|l@1|
--- a/src/testdir/test_messages.vim +++ b/src/testdir/test_messages.vim @@ -347,7 +347,8 @@ func Test_message_not_cleared_after_mode endfunction set showmode set cmdheight=1 - call setline(1, ['one', 'two', 'three']) + call test_settime(1) + call setline(1, ['one', 'NoSuchFile', 'three']) END call writefile(lines, 'XmessageMode', 'D') let buf = RunVimInTerminal('-S XmessageMode', {'rows': 10}) @@ -361,6 +362,12 @@ func Test_message_not_cleared_after_mode call TermWait(buf) call VerifyScreenDump(buf, 'Test_message_not_cleared_after_mode_2', {}) + " removing the mode message used to also clear the error message + call term_sendkeys(buf, ":set cmdheight=2\<CR>") + call term_sendkeys(buf, '2GvEgf') + call TermWait(buf) + call VerifyScreenDump(buf, 'Test_message_not_cleared_after_mode_3', {}) + call StopVimInTerminal(buf) endfunc