Merge branch 'obsd-master'

screen-write.c

@@ -1832,6 +1832,7 @@ screen_write_collect_end(struct screen_write_ctx *ctx)
 
 	if (ci->used == 0)
 		return;
+	ctx->flags &= ~SCREEN_WRITE_COMBINE;
 
 	before = screen_write_collect_trim(ctx, s->cy, s->cx, ci->used,
 	    &wrapped);
@@ -1887,8 +1888,6 @@ screen_write_collect_add(struct screen_write_ctx *ctx,
 	u_int				 sx = screen_size_x(s);
 	int				 collect;
 
-	ctx->flags &= ~SCREEN_WRITE_COMBINE;
-
 	/*
 	 * Don't need to check that the attributes and whatnot are still the
 	 * same - input_parse will end the collection when anything that isn't
@@ -1968,7 +1967,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 		screen_write_collect_flush(ctx, 0, __func__);
 		gc = screen_write_combine(ctx, combine, &xx, &cx);
 		if (gc != NULL) {
-			cy = s->cy;
+			cx = s->cx; cy = s->cy;
 			screen_write_set_cursor(ctx, xx, s->cy);
 			screen_write_initctx(ctx, &ttyctx, 0);
 			ttyctx.cell = gc;