summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2019-04-03 06:43:05 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2019-04-03 06:43:05 +0000
commit009ef5c16ebc1ed3670bafbe4a70725f1efdbaa3 (patch)
tree139fccfc8ab5363014d1815dd0ca51560bca5932
parent34f24bf28ba46ecf33b9b45f99d533d344c8f9b0 (diff)
screen_write_fast_copy can no longer assume the target screen is default
(it isn't for the pane status lines).
-rw-r--r--usr.bin/tmux/screen-write.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c
index 6bb1a1196be..ab6f3f52c3c 100644
--- a/usr.bin/tmux/screen-write.c
+++ b/usr.bin/tmux/screen-write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-write.c,v 1.149 2019/03/18 20:53:33 nicm Exp $ */
+/* $OpenBSD: screen-write.c,v 1.150 2019/04/03 06:43:04 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -324,7 +324,7 @@ screen_write_copy(struct screen_write_ctx *ctx, struct screen *src, u_int px,
/*
* Copy from another screen but without the selection stuff. Also assumes the
- * target region is already big enough and already cleared.
+ * target region is already big enough.
*/
void
screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src,
@@ -349,8 +349,7 @@ screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src,
grid_get_cell(gd, xx, yy, &gc);
if (xx + gc.data.width > px + nx)
break;
- if (!grid_cells_equal(&gc, &grid_default_cell))
- grid_view_set_cell(ctx->s->grid, cx, cy, &gc);
+ grid_view_set_cell(ctx->s->grid, cx, cy, &gc);
cx++;
}
cy++;