1
0
forked from aniani/vim

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)
This commit is contained in:
Bram Moolenaar
2013-02-26 15:27:23 +01:00
parent 693e40c2cd
commit f13f45d59b

View File

@@ -728,6 +728,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 */
/**/
837,
/**/ /**/
836, 836,
/**/ /**/
@@ -2496,14 +2498,12 @@ list_features()
return; return;
} }
ncol = (int) Columns / width;
/* The rightmost column doesn't need a separator. /* The rightmost column doesn't need a separator.
* Sacrifice it to fit in one more column if possible. */ * Sacrifice it to fit in one more column if possible. */
if (Columns % width == width - 1) ncol = (int) (Columns + 1) / width;
ncol++;
nrow = nfeat / ncol + (nfeat % ncol ? 1 : 0); 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) for (i = 0; !got_int && i < nrow * ncol; ++i)
{ {
int idx = (i / ncol) + (i % ncol) * nrow; int idx = (i / ncol) + (i % ncol) * nrow;
@@ -2525,7 +2525,10 @@ list_features()
} }
} }
else else
msg_putchar('\n'); {
if (msg_col > 0)
msg_putchar('\n');
}
} }
} }