kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 10:45:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(messages): avoid crash with :intro and ch=0 (#28343)

Browse Source 
This just copies code from msg_start() to wait_return().  Not sure if
there is a better place to put such a block.
This commit is contained in:
zeertzjq 2024-04-16 10:38:17 +08:00 committed by GitHub
parent e3c083832c
commit 60fb8a6a8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/message.c
View File

@ -1191,6 +1191,14 @@ void wait_return(int redraw)
check_timestamps(false);
}
// if cmdheight=0, we need to scroll in the first line of msg_grid upon the screen
if (p_ch == 0 && !ui_has(kUIMessages) && !msg_scrolled) {
msg_grid_validate();
msg_scroll_up(false, true);
msg_scrolled++;
cmdline_row = Rows - 1;
}
hit_return_msg(true);
do {

29
test/functional/ui/messages_spec.lua
View File

@ -1536,6 +1536,35 @@ vimComment xxx match /\s"[^\-:.%#=*].*$/ms=s+1,lc=1 excludenl contains=@vim
|*4
]])
end)
it('supports :intro with cmdheight=0 #26505', function()
screen:try_resize(80, 24)
command('set cmdheight=0')
feed(':intro<CR>')
screen:expect([[
|*5
{MATCH:.*}|
|
Nvim is open source and freely distributable |
https://neovim.io/#chat |
|
type :help nvim{18:<Enter>} if you are new! |
type :checkhealth{18:<Enter>} to optimize Nvim |
type :q{18:<Enter>} to exit |
type :help{18:<Enter>} for help |
|
{MATCH: +}type :help news{18:<Enter>} to see changes in v{MATCH:%d+%.%d+ +}|
|
Help poor children in Uganda! |
type :help iccf{18:<Enter>} for information |
|*2
{3: }|
|
{6:Press ENTER or type command to continue}^ |
]])
feed('<CR>')
assert_alive()
end)
end)
it('calling screenstring() after redrawing between messages without UI #20999', function()