Prioritise COLUMNS above TIOCGWINSZ

Fixes Ubuntu bug #1315282.

* lib/linelength.c (get_line_length): Prioritise COLUMNS above
TIOCGWINSZ.
* man/man1/apropos.man1 (DESCRIPTION): Describe new terminal width
priorities.
* man/man1/man.man1 (DESCRIPTION): Likewise.
* man/man1/whatis.man1 (DESCRIPTION): Likewise.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
* NEWS: Document this.

1 files changed, 19 insertions, 4 deletions

diff --git a/man/po4a/po/nl.po b/man/po4a/po/nl.po
index cd93b7c7..e0a5ec8c 100644
--- a/man/po4a/po/nl.po
+++ b/man/po4a/po/nl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: man-db-manpages 2.5.8-pre1\n"
-"POT-Creation-Date: 2014-09-10 22:43+0100\n"
+"POT-Creation-Date: 2014-09-16 13:44+0100\n"
 "PO-Revision-Date: 2010-10-24 20:48+0200\n"
 "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -466,10 +466,16 @@ msgstr ""
 
 #. type: Plain text
 #: ../../man/man1/apropos.man1:232 ../../man/man1/whatis.man1:236
+#, fuzzy
+#| msgid ""
+#| "If $B<MANWIDTH> is set, its value is used as the terminal width (see the "
+#| "B<--long> option).  If it is not set, the terminal width will be "
+#| "calculated using an B<ioctl>(2)  if available, the value of $B<COLUMNS>, "
+#| "or falling back to 80 characters if all else fails."
 msgid ""
 "If $B<MANWIDTH> is set, its value is used as the terminal width (see the B<--"
 "long> option).  If it is not set, the terminal width will be calculated "
-"using an B<ioctl>(2)  if available, the value of $B<COLUMNS>, or falling "
+"using the value of $B<COLUMNS>, an B<ioctl>(2)  if available, or falling "
 "back to 80 characters if all else fails."
 msgstr ""
 "Wanneer $B<MANWIDTH> is opgegeven, wordt de waarde gebruikt als de breedte "
@@ -2513,11 +2519,20 @@ msgstr ""
 
 #. type: Plain text
 #: ../../man/man1/man.man1:1305
+#, fuzzy
+#| msgid ""
+#| "If $B<MANWIDTH> is set, its value is used as the line length for which "
+#| "manual pages should be formatted.  If it is not set, manual pages will be "
+#| "formatted with a line length appropriate to the current terminal (using "
+#| "an B<ioctl>(2)  if available, the value of $B<COLUMNS>, or falling back "
+#| "to 80 characters if neither is available).  Cat pages will only be saved "
+#| "when the default formatting can be used, that is when the terminal line "
+#| "length is between 66 and 80 characters."
 msgid ""
 "If $B<MANWIDTH> is set, its value is used as the line length for which "
 "manual pages should be formatted.  If it is not set, manual pages will be "
-"formatted with a line length appropriate to the current terminal (using an "
-"B<ioctl>(2)  if available, the value of $B<COLUMNS>, or falling back to 80 "
+"formatted with a line length appropriate to the current terminal (using the "
+"value of $B<COLUMNS>, an B<ioctl>(2)  if available, or falling back to 80 "
 "characters if neither is available).  Cat pages will only be saved when the "
 "default formatting can be used, that is when the terminal line length is "
 "between 66 and 80 characters."