===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -c -r1.129 -r1.130
*** src/usr.bin/tmux/grid.c	2023/06/30 21:55:08	1.129
--- src/usr.bin/tmux/grid.c	2023/07/13 06:03:48	1.130
***************
*** 1,4 ****
! /* $OpenBSD: grid.c,v 1.129 2023/06/30 21:55:08 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: grid.c,v 1.130 2023/07/13 06:03:48 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 37,43 ****
  
  /* Default grid cell data. */
  const struct grid_cell grid_default_cell = {
! 	{ { ' ' }, 0, 1, 1 }, 0, 0, 8, 8, 0, 0
  };
  
  /*
--- 37,43 ----
  
  /* Default grid cell data. */
  const struct grid_cell grid_default_cell = {
! 	{ { ' ' }, 0, 1, 1 }, 0, 0, 8, 8, 8, 0
  };
  
  /*
***************
*** 45,56 ****
   * appears in the grid - because of this, they are always extended cells.
   */
  static const struct grid_cell grid_padding_cell = {
! 	{ { '!' }, 0, 0, 0 }, 0, GRID_FLAG_PADDING, 8, 8, 0, 0
  };
  
  /* Cleared grid cell data. */
  static const struct grid_cell grid_cleared_cell = {
! 	{ { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 0, 0
  };
  static const struct grid_cell_entry grid_cleared_entry = {
  	{ .data = { 0, 8, 8, ' ' } }, GRID_FLAG_CLEARED
--- 45,56 ----
   * appears in the grid - because of this, they are always extended cells.
   */
  static const struct grid_cell grid_padding_cell = {
! 	{ { '!' }, 0, 0, 0 }, 0, GRID_FLAG_PADDING, 8, 8, 8, 0
  };
  
  /* Cleared grid cell data. */
  static const struct grid_cell grid_cleared_cell = {
! 	{ { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 8, 0
  };
  static const struct grid_cell_entry grid_cleared_entry = {
  	{ .data = { 0, 8, 8, ' ' } }, GRID_FLAG_CLEARED
***************
*** 528,534 ****
  	gc->bg = gce->data.bg;
  	if (gce->flags & GRID_FLAG_BG256)
  		gc->bg |= COLOUR_FLAG_256;
! 	gc->us = 0;
  	utf8_set(&gc->data, gce->data.data);
  	gc->link = 0;
  }
--- 528,534 ----
  	gc->bg = gce->data.bg;
  	if (gce->flags & GRID_FLAG_BG256)
  		gc->bg |= COLOUR_FLAG_256;
! 	gc->us = 8;
  	utf8_set(&gc->data, gce->data.data);
  	gc->link = 0;
  }
***************
*** 956,962 ****
  	for (i = 0; i < nitems(attrs); i++) {
  		if (((~attr & attrs[i].mask) &&
  		    (lastattr & attrs[i].mask)) ||
! 		    (lastgc->us != 0 && gc->us == 0)) {
  			s[n++] = 0;
  			lastattr &= GRID_ATTR_CHARSET;
  			break;
--- 956,962 ----
  	for (i = 0; i < nitems(attrs); i++) {
  		if (((~attr & attrs[i].mask) &&
  		    (lastattr & attrs[i].mask)) ||
! 		    (lastgc->us != 8 && gc->us == 8)) {
  			s[n++] = 0;
  			lastattr &= GRID_ATTR_CHARSET;
  			break;