Fix line width computation

We an only use the line_width - remaining_width shortcut if we are actually maintaining remaining_width, i.e. not if we don't wrap lines.

Testcase included.

Fixes: #635 (closed)