screen: don't hide two-column characters at left edge in softwrap mode

When in softwrap mode, no "$" continuation characters are displayed,
so the code that reserves space for them should be skipped then.

This fixes https://savannah.gnu.org/bugs/?50335.
master
David Lawrence Ramsey 2017-02-17 01:39:45 -06:00 committed by Benno Schulenberg
parent de36e1c120
commit 61e8b3d542
1 changed files with 1 additions and 1 deletions

View File

@ -1833,7 +1833,7 @@ char *display_string(const char *buf, size_t start_col, size_t span,
buf += start_index; buf += start_index;
if (*buf != '\0' && *buf != '\t' && if (*buf != '\0' && *buf != '\t' &&
(column < start_col || (isdata && column > 0))) { (column < start_col || (isdata && !ISSET(SOFTWRAP) && column > 0))) {
/* We don't display the complete first character as it starts to /* We don't display the complete first character as it starts to
* the left of the screen. */ * the left of the screen. */
if (is_cntrl_mbchar(buf)) { if (is_cntrl_mbchar(buf)) {