wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(messages): :map output with ext_messages (#26126)

Browse Source
This commit is contained in:
Bara C. Tudor 2023-11-22 03:50:28 +02:00 committed by GitHub
parent 7663584708
commit 91ef26dece
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/mapping.c
View File

@ -45,6 +45,7 @@
#include "nvim/search.h"
#include "nvim/strings.h"
#include "nvim/types.h"
#include "nvim/ui.h"
#include "nvim/vim.h"
/// List used for abbreviations.
@ -220,7 +221,8 @@ static void showmap(mapblock_T *mp, bool local)
return;
}
if (msg_didout || msg_silent != 0) {
// When ext_messages is active, msg_didout is never set.
if (msg_didout || msg_silent != 0 || ui_has(kUIMessages)) {
msg_putchar('\n');
if (got_int) { // 'q' typed at MORE prompt
return;

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

@ -834,6 +834,19 @@ stack traceback:
end}
end)
it('supports multiline messages for :map', function()
command('mapclear')
command('nmap Y y$')
command('nmap Q @@')
command('nnoremap j k')
feed(':map<cr>')
screen:expect{messages={{
content = {{ "\nn Q @@\nn Y y$\nn j " }, { "*", 5 }, { " k" }},
kind = ''
}}}
end)
it('wildmode=list', function()
screen:try_resize(25, 7)
screen:set_option('ext_popupmenu', false)