diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-04-21 16:01:30 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-04-21 16:01:30 +0100 |
| commit | dd5299841a87c0bf842488f7f9feb84b7e37c819 (patch) | |
| tree | cd5fe7e48a56a1efcffabff18c09a3aa99cde02d | |
| parent | 291b85746ff2c3bf142f59f2264ec25caf0af411 (diff) | |
| parent | 445dfa8512b3b5552a444dd03958cdec3f968f83 (diff) | |
| download | rtmux-dd5299841a87c0bf842488f7f9feb84b7e37c819.tar.gz rtmux-dd5299841a87c0bf842488f7f9feb84b7e37c819.tar.bz2 rtmux-dd5299841a87c0bf842488f7f9feb84b7e37c819.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | screen-write.c | 3 | ||||
| -rw-r--r-- | tty-features.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/screen-write.c b/screen-write.c index 98a4a701..afa1e96a 100644 --- a/screen-write.c +++ b/screen-write.c @@ -1372,10 +1372,11 @@ screen_write_collect_scroll(struct screen_write_ctx *ctx) for (y = s->rupper; y < s->rlower; y++) { cl = &ctx->s->write_list[y + 1]; TAILQ_CONCAT(&ctx->s->write_list[y].items, &cl->items, entry); + ctx->s->write_list[y].bg = cl->bg; ctx->s->write_list[y].data = cl->data; } - ctx->s->write_list[s->rlower].data = saved; ctx->s->write_list[s->rlower].bg = 1 + 8; + ctx->s->write_list[s->rlower].data = saved; } /* Flush collected lines. */ diff --git a/tty-features.c b/tty-features.c index ae0869e1..1996c750 100644 --- a/tty-features.c +++ b/tty-features.c @@ -33,8 +33,8 @@ * - alternate escape (under XT). * * Also: - * - XT is used to decide whether to send DA and DSR, - * - DECSLRM and DECFRA use a flag instead of capabilities. + * - XT is used to decide whether to send DA and DSR; + * - DECSLRM and DECFRA use a flag instead of capabilities; * - UTF-8 is a separate flag on the client; needed for unattached clients. */ |