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)
diff --git a/src/version.c b/src/version.c
index c6412bd..6e42c66 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 837,
+/**/
836,
/**/
835,
@@ -2496,14 +2498,12 @@
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 @@
}
}
else
- msg_putchar('\n');
+ {
+ if (msg_col > 0)
+ msg_putchar('\n');
+ }
}
}