Merging upstream version 2.12.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 7 deletions

diff --git a/src/man.c b/src/man.c
index 5d3be39..195d35d 100644
--- a/src/man.c
+++ b/src/man.c
@@ -685,13 +685,11 @@ static int get_roff_line_length (void)
 {
 	int line_length = cat_width ? cat_width : get_line_length ();
 
-	if (!troff || ditroff) {
-		int length = line_length * 39 / 40;
-		if (length > line_length - 2)
-			return line_length - 2;
-		else
-			return length;
-	} else
+	if (!troff || ditroff)
+		/* groff ≤1.23 tbl often overflows the page width by 1 column:
+		 * let it do so without mangling the output completely. */
+		return line_length - 1;
+	else
 		return 0;
 }