Merge branch 'obsd-master'

2 files changed, 4 insertions, 4 deletions

diff --git a/cfg.c b/cfg.c
index 84db9fb3..4ce3485b 100644
--- a/cfg.c
+++ b/cfg.c
@@ -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++;