Merge pull request #27812 from luukvbaal/cmdheight

feat(ui): allow non-zero 'cmdheight' with ext_messages
This commit is contained in:
bfredl 2024-03-11 19:44:18 +01:00 committed by GitHub
commit 205cf0d296
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions

View File

@ -2024,9 +2024,6 @@ static const char *did_set_cmdheight(optset_T *args)
{
OptInt old_value = args->os_oldval.number;
if (ui_has(kUIMessages)) {
p_ch = 0;
}
if (p_ch > Rows - min_rows() + 1) {
p_ch = Rows - min_rows() + 1;
}

View File

@ -844,7 +844,7 @@ describe('ui/ext_messages', function()
}
end)
it('implies ext_cmdline and ignores cmdheight', function()
it("implies ext_cmdline but allows changing 'cmdheight'", function()
eq(0, eval('&cmdheight'))
feed(':set cmdheight=1')
screen:expect {
@ -864,15 +864,17 @@ describe('ui/ext_messages', function()
feed('<cr>')
screen:expect([[
^ |
{1:~ }|*4
{1:~ }|*3
|
]])
eq(0, eval('&cmdheight'))
eq(1, eval('&cmdheight'))
feed(':set cmdheight=0')
screen:expect {
grid = [[
^ |
{1:~ }|*4
{1:~ }|*3
|
]],
cmdline = {
{