aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2022-01-27 13:43:27 +0100
committerGitHub <noreply@github.com>2022-01-27 13:43:27 +0100
commit7ea09dde5f0044e8a264cc2617f0a58a5684c57c (patch)
tree7693819a7aab27a4bb81d790923ab590ca8bc975
parent8c140be31f0d203b63e7052e698fdfe253e0b5d4 (diff)
parenta9f112ce3a076e9405a3c18fa608747d56c64726 (diff)
downloadrneovim-7ea09dde5f0044e8a264cc2617f0a58a5684c57c.tar.gz
rneovim-7ea09dde5f0044e8a264cc2617f0a58a5684c57c.tar.bz2
rneovim-7ea09dde5f0044e8a264cc2617f0a58a5684c57c.zip
Merge pull request #17136 from zeertzjq/vim-8.2.4133
vim-patch:8.2.4133: output of ":scriptnames" goes into the message history
-rw-r--r--src/nvim/ex_cmds2.c8
-rw-r--r--src/nvim/testdir/test_scriptnames.vim6
2 files changed, 11 insertions, 3 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 267f5616f5..846789233f 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -2323,9 +2323,11 @@ void ex_scriptnames(exarg_T *eap)
for (int i = 1; i <= script_items.ga_len && !got_int; i++) {
if (SCRIPT_ITEM(i).sn_name != NULL) {
- home_replace(NULL, SCRIPT_ITEM(i).sn_name,
- NameBuff, MAXPATHL, true);
- smsg("%3d: %s", i, NameBuff);
+ home_replace(NULL, SCRIPT_ITEM(i).sn_name, NameBuff, MAXPATHL, true);
+ vim_snprintf((char *)IObuff, IOSIZE, "%3d: %s", i, NameBuff);
+ msg_putchar('\n');
+ msg_outtrans(IObuff);
+ line_breakcheck();
}
}
}
diff --git a/src/nvim/testdir/test_scriptnames.vim b/src/nvim/testdir/test_scriptnames.vim
index fc6c910bfa..44ec146666 100644
--- a/src/nvim/testdir/test_scriptnames.vim
+++ b/src/nvim/testdir/test_scriptnames.vim
@@ -23,4 +23,10 @@ func Test_scriptnames()
bwipe
call delete('Xscripting')
+
+ let msgs = execute('messages')
+ scriptnames
+ call assert_equal(msgs, execute('messages'))
endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab