===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-write.c,v
retrieving revision 1.220
retrieving revision 1.221
diff -c -r1.220 -r1.221
*** src/usr.bin/tmux/screen-write.c	2023/09/01 16:01:54	1.220
--- src/usr.bin/tmux/screen-write.c	2023/09/14 13:01:35	1.221
***************
*** 1,4 ****
! /* $OpenBSD: screen-write.c,v 1.220 2023/09/01 16:01:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: screen-write.c,v 1.221 2023/09/14 13:01:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1742,1747 ****
--- 1742,1748 ----
  
  	if (ci->used == 0)
  		return;
+ 	ctx->flags &= ~SCREEN_WRITE_COMBINE;
  
  	before = screen_write_collect_trim(ctx, s->cy, s->cx, ci->used,
  	    &wrapped);
***************
*** 1792,1799 ****
  	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
--- 1793,1798 ----
***************
*** 1873,1879 ****
  		screen_write_collect_flush(ctx, 0, __func__);
  		gc = screen_write_combine(ctx, combine, &xx, &cx);
  		if (gc != NULL) {
! 			cy = s->cy;
  			screen_write_set_cursor(ctx, xx, s->cy);
  			screen_write_initctx(ctx, &ttyctx, 0);
  			ttyctx.cell = gc;
--- 1872,1878 ----
  		screen_write_collect_flush(ctx, 0, __func__);
  		gc = screen_write_combine(ctx, combine, &xx, &cx);
  		if (gc != NULL) {
! 			cx = s->cx; cy = s->cy;
  			screen_write_set_cursor(ctx, xx, s->cy);
  			screen_write_initctx(ctx, &ttyctx, 0);
  			ttyctx.cell = gc;