Mercurial > vim
changeset 4170:14698f63de8d v7.3.837
updated for version 7.3.837
Problem: Empty lines in :version output when 'columns' is 320.
Solution: Simplify the logic of making columns. (Nazri Ramliy, Roland
Eggner)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 26 Feb 2013 15:27:23 +0100 |
| parents | 043c638a4fd7 |
| children | 5b33343b14a4 |
| files | src/version.c |
| diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 837, +/**/ 836, /**/ 835, @@ -2496,14 +2498,12 @@ list_features() return; } - ncol = (int) Columns / width; /* The rightmost column doesn't need a separator. * Sacrifice it to fit in one more column if possible. */ - if (Columns % width == width - 1) - ncol++; - + ncol = (int) (Columns + 1) / width; nrow = nfeat / ncol + (nfeat % ncol ? 1 : 0); + /* i counts columns then rows. idx counts rows then columns. */ for (i = 0; !got_int && i < nrow * ncol; ++i) { int idx = (i / ncol) + (i % ncol) * nrow; @@ -2525,7 +2525,10 @@ list_features() } } else - msg_putchar('\n'); + { + if (msg_col > 0) + msg_putchar('\n'); + } } }