bug#56393: Actually fix the long lines display bug

[Gregory Heytings]

> > I guess it's better, as it reduces the number of cases where the 
> > problem could happen, at the price of making those cases slower.
>
> Okay, I'll push that.  It seems to work as well.

Done.  Can you please check that the earlier segfaults are still gone?