===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-redraw.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- src/usr.bin/tmux/screen-redraw.c	2021/08/05 09:43:51	1.85
+++ src/usr.bin/tmux/screen-redraw.c	2021/08/11 09:05:21	1.86
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-redraw.c,v 1.85 2021/08/05 09:43:51 nicm Exp $ */
+/* $OpenBSD: screen-redraw.c,v 1.86 2021/08/11 09:05:21 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -680,7 +680,10 @@
 {
 	struct client		*c = ctx->c;
 	struct session		*s = c->session;
+	struct window		*w = s->curw->window;
+	struct options		*oo = w->options;
 	struct tty		*tty = &c->tty;
+	struct format_tree	*ft;
 	struct window_pane	*wp;
 	u_int			 cell_type, x = ctx->ox + i, y = ctx->oy + j;
 	int			 pane_status = ctx->pane_status, isolates;
@@ -694,9 +697,17 @@
 	if (cell_type == CELL_INSIDE)
 		return;
 
-	if (wp == NULL)
-		memcpy(&gc, &grid_default_cell, sizeof gc);
-	else {
+	if (wp == NULL) {
+		if (!ctx->no_pane_gc_set) {
+			ft = format_create_defaults(NULL, c, s, s->curw, NULL);
+			memcpy(&ctx->no_pane_gc, &grid_default_cell, sizeof gc);
+			style_add(&ctx->no_pane_gc, oo, "pane-border-style",
+			    ft);
+			format_free(ft);
+			ctx->no_pane_gc_set = 1;
+		}
+		memcpy(&gc, &ctx->no_pane_gc, sizeof gc);
+	} else {
 		tmp = screen_redraw_draw_borders_style(ctx, x, y, wp);
 		if (tmp == NULL)
 			return;