From 1462f69f54eb2c43f884ffd5002d7c596c79f373 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 1 Sep 2018 14:52:47 -0400 Subject: [PATCH] reports on windows of partial status lines after level change tty: turn off an optimization that is the suspected cause of Windows reported partial status lines following level changes. It was turned on for non-unix platforms only --- doc/fixes36.2 | 2 ++ win/tty/wintty.c | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/fixes36.2 b/doc/fixes36.2 index 803c0abd9..fbf1544ba 100644 --- a/doc/fixes36.2 +++ b/doc/fixes36.2 @@ -112,6 +112,8 @@ fix access violation when --debug:xxxx has no other args after it setting the inverse attribute for gold had the space before "$:" getting highlighted along with the gold field sortloot segfaulted when filtering a subset of items (seen with 'A' command) +tty: turn off an optimization that is the suspected cause of Windows reported + partial status lines following level changes Platform- and/or Interface-Specific Fixes diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 42dad00c2..a0e2f66ed 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -3552,11 +3552,13 @@ static boolean truncation_expected = FALSE; * for all platforms eventually and the conditional * setting below can be removed. */ -#if defined(UNIX) -static int do_field_opt = 0; +static int do_field_opt = +#if defined(ENABLE_TTY_FIELD_OPT) + 1; #else -static int do_field_opt = 1; + 0; #endif + #endif /* STATUS_HILITES */ /* @@ -3691,7 +3693,8 @@ unsigned long *colormasks; /* The core botl engine sends a single blank to the window port for carrying-capacity when its unused. Let's suppress that */ - if (tty_status[NOW][fldidx].lth == 1 && status_vals[fldidx][0] == ' ') { + if (fldidx != BL_FLUSH && + tty_status[NOW][fldidx].lth == 1 && status_vals[fldidx][0] == ' ') { status_vals[fldidx][0] = '\0'; tty_status[NOW][fldidx].lth = 0; }