From c4d8100b2fd220d358481db419221ee1454d3cad Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 14 May 2020 16:58:14 +0100
Subject: [PATCH] Draw outside correctly with pane numbers.

---
 screen-redraw.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/screen-redraw.c b/screen-redraw.c
index ae9d8a90..002970e9 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -92,8 +92,13 @@ screen_redraw_border_set(struct window_pane *wp, int pane_lines, int cell_type,
 
 	switch (pane_lines) {
 	case PANE_LINES_NUMBER:
+		if (cell_type == CELL_OUTSIDE) {
+			gc->attr |= GRID_ATTR_CHARSET;
+			utf8_set(&gc->data, CELL_BORDERS[CELL_OUTSIDE]);
+			break;
+		}
 		gc->attr &= ~GRID_ATTR_CHARSET;
-		if (window_pane_index(wp, &idx) == 0)
+		if (wp != NULL && window_pane_index(wp, &idx) == 0)
 			utf8_set(&gc->data, '0' + (idx % 10));
 		else
 			utf8_set(&gc->data, '*');