===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format-draw.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/tmux/format-draw.c	2021/08/22 15:33:14	1.24
--- src/usr.bin/tmux/format-draw.c	2021/10/26 12:22:23	1.25
***************
*** 1,4 ****
! /* $OpenBSD: format-draw.c,v 1.24 2021/08/22 15:33:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: format-draw.c,v 1.25 2021/10/26 12:22:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 677,683 ****
  /* Draw a format to a screen. */
  void
  format_draw(struct screen_write_ctx *octx, const struct grid_cell *base,
!     u_int available, const char *expanded, struct style_ranges *srs)
  {
  	enum { LEFT,
  	       CENTRE,
--- 677,684 ----
  /* Draw a format to a screen. */
  void
  format_draw(struct screen_write_ctx *octx, const struct grid_cell *base,
!     u_int available, const char *expanded, struct style_ranges *srs,
!     int default_colours)
  {
  	enum { LEFT,
  	       CENTRE,
***************
*** 819,824 ****
--- 820,829 ----
  		log_debug("%s: style '%s' -> '%s'", __func__, tmp,
  		    style_tostring(&sy));
  		free(tmp);
+ 		if (default_colours) {
+ 			sy.gc.bg = base->bg;
+ 			sy.gc.fg = base->fg;
+ 		}
  
  		/* If this style has a fill colour, store it for later. */
  		if (sy.fill != 8)