aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1760: extra line break for wrapping output of :args

Browse Source 
Problem:    Extra line break for wrapping output of :args.
Solution:   Avoid the extra line break. (Daniel Hahler, closes #4737)
This commit is contained in:
Bram Moolenaar 2019-07-27 21:23:45 +02:00
parent 14371ed697
commit 9800bfe0fc
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/testdir/test_arglist.vim
View File

@ -169,6 +169,25 @@ func Test_argument()
let &hidden = save_hidden let &hidden = save_hidden
let save_columns = &columns
let &columns = 79
exe 'args ' .. join(range(1, 81))
call assert_equal(join([
\ '',
\ '[1] 6 11 16 21 26 31 36 41 46 51 56 61 66 71 76 81 ',
\ '2 7 12 17 22 27 32 37 42 47 52 57 62 67 72 77 ',
\ '3 8 13 18 23 28 33 38 43 48 53 58 63 68 73 78 ',
\ '4 9 14 19 24 29 34 39 44 49 54 59 64 69 74 79 ',
\ '5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 ',
\ ], "\n"),
\ execute('args'))
" No trailing newline with one item per row.
let long_arg = repeat('X', 81)
exe 'args ' .. long_arg
call assert_equal("\n[".long_arg.']', execute('args'))
let &columns = save_columns
" Setting argument list should fail when the current buffer has unsaved " Setting argument list should fail when the current buffer has unsaved
" changes " changes
%argd %argd

13
src/version.c
View File

@ -777,6 +777,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1760,
/**/ /**/
1759, 1759,
/**/ /**/
@ -4418,11 +4420,11 @@ list_in_columns(char_u **items, int size, int current)
if (Columns < width) if (Columns < width)
{ {
/* Not enough screen columns - show one per line */ // Not enough screen columns - show one per line
for (i = 0; i < item_count; ++i) for (i = 0; i < item_count; ++i)
{ {
version_msg_wrap(items[i], i == current); version_msg_wrap(items[i], i == current);
if (msg_col > 0) if (msg_col > 0 && i < item_count - 1)
msg_putchar('\n'); msg_putchar('\n');
} }
return; return;
@ -4433,7 +4435,7 @@ list_in_columns(char_u **items, int size, int current)
ncol = (int) (Columns + 1) / width; ncol = (int) (Columns + 1) / width;
nrow = item_count / ncol + (item_count % ncol ? 1 : 0); nrow = item_count / ncol + (item_count % ncol ? 1 : 0);
// "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;
@ -4467,11 +4469,14 @@ list_in_columns(char_u **items, int size, int current)
else else
{ {
// this row is out of items, thus at the end of the row // this row is out of items, thus at the end of the row
if (msg_col > 0 && cur_row < nrow) if (msg_col > 0)
{
if (cur_row < nrow)
msg_putchar('\n'); msg_putchar('\n');
++cur_row; ++cur_row;
} }
} }
}
} }
void void