diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-04-03 09:02:41 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-04-03 09:02:41 +0100 |
| commit | cb039b986ec2400439410a1cf983bd0a5ef4f9ca (patch) | |
| tree | 6be857786a1f7d44940b53c7b03ce58b466bf6c6 | |
| parent | c9ef144dcacb03645e04f262e107618fb103a7c1 (diff) | |
| parent | f6c54f3f03353c415cfc59a65118f570972d51ff (diff) | |
| download | rtmux-cb039b986ec2400439410a1cf983bd0a5ef4f9ca.tar.gz rtmux-cb039b986ec2400439410a1cf983bd0a5ef4f9ca.tar.bz2 rtmux-cb039b986ec2400439410a1cf983bd0a5ef4f9ca.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cfg.c | 3 | ||||
| -rw-r--r-- | screen-write.c | 5 |
2 files changed, 4 insertions, 4 deletions
@@ -101,7 +101,8 @@ start_cfg(void) cmdq_append(c, cfg_item); } - load_cfg(TMUX_CONF, NULL, NULL, 1); + if (cfg_file == NULL) + load_cfg(TMUX_CONF, NULL, NULL, 1); if (cfg_file == NULL && (home = find_home()) != NULL) { xasprintf(&cfg_file, "%s/.tmux.conf", home); diff --git a/screen-write.c b/screen-write.c index 0d57b818..566d4d14 100644 --- a/screen-write.c +++ b/screen-write.c @@ -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++; |