Restore change in r1.17 but add checks to prevent the line length overflowing, from Balazs Kezes.
Restore change in r1.17 but add checks to prevent the line length
overflowing, from Balazs Kezes.

klaxalk/tmux,klaxalk/tmux,klaxalk/tmux,klaxalk/tmux,klaxalk/tmux