IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1737: :args command that outputs one line gives more prompt

Browse Source 
Problem:    :args command that outputs one line gives more prompt.
Solution:   Only output line break if needed. (Daniel Hahler, closes vim/vim#4715)
949f1989cb

Closes https://github.com/neovim/neovim/pull/10147.
This commit is contained in:
Daniel Hahler 2019-07-23 07:01:12 +02:00
parent e134cc9d4a
commit 733e1a0e73
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/testdir/test_arglist.vim
View File

@ -122,10 +122,7 @@ func Test_argument()
call assert_equal(['d', 'c', 'b', 'a', 'c'], g:buffers) call assert_equal(['d', 'c', 'b', 'a', 'c'], g:buffers)
redir => result call assert_equal("\na b [c] d ", execute(':args'))
args
redir END
call assert_equal('a b [c] d', trim(result))
.argd .argd
call assert_equal(['a', 'b', 'd'], argv()) call assert_equal(['a', 'b', 'd'], argv())

12
src/nvim/version.c
View File

@ -2076,9 +2076,10 @@ void list_in_columns(char_u **items, int size, int current)
// Sacrifice it to fit in one more column if possible. // Sacrifice it to fit in one more column if possible.
int ncol = (int)(Columns + 1) / width; int ncol = (int)(Columns + 1) / width;
int nrow = item_count / ncol + (item_count % ncol ? 1 : 0); int nrow = item_count / ncol + (item_count % ncol ? 1 : 0);
int cur_row = 1;
// i counts columns then rows. idx counts rows then columns. // "i" counts columns then rows. "idx" counts rows then columns.
for (i = 0; !got_int && i < nrow * ncol; ++i) { for (i = 0; !got_int && i < nrow * ncol; i++) {
int idx = (i / ncol) + (i % ncol) * nrow; int idx = (i / ncol) + (i % ncol) * nrow;
if (idx < item_count) { if (idx < item_count) {
int last_col = (i + 1) % ncol == 0; int last_col = (i + 1) % ncol == 0;
@ -2090,18 +2091,15 @@ void list_in_columns(char_u **items, int size, int current)
msg_putchar(']'); msg_putchar(']');
} }
if (last_col) { if (last_col) {
if (msg_col > 0) { if (msg_col > 0 && cur_row < nrow) {
msg_putchar('\n'); msg_putchar('\n');
} }
cur_row++;
} else { } else {
while (msg_col % width) { while (msg_col % width) {
msg_putchar(' '); msg_putchar(' ');
} }
} }
} else {
if (msg_col > 0) {
msg_putchar('\n');
}
} }
} }
} }