From f98c66ece81953c777cd332c6bd29d707b1685e5 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 7 Mar 2019 20:24:21 +0000
Subject: Add a separate mode struct for the active window mode if any.

---
 format.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'format.c')

diff --git a/format.c b/format.c
index f60a4019..166b18a6 100644
--- a/format.c
+++ b/format.c
@@ -1535,7 +1535,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
 
 	format_add(ft, "pane_in_mode", "%d", wp->screen != &wp->base);
 	if (wp->mode != NULL)
-		format_add(ft, "pane_mode", "%s", wp->mode->name);
+		format_add(ft, "pane_mode", "%s", wp->mode->mode->name);
 
 	format_add(ft, "pane_synchronized", "%d",
 	    !!options_get_number(w->options, "synchronize-panes"));
@@ -1552,8 +1552,8 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
 	format_add(ft, "scroll_region_upper", "%u", wp->base.rupper);
 	format_add(ft, "scroll_region_lower", "%u", wp->base.rlower);
 
-	if (wp->mode != NULL && wp->mode->formats != NULL)
-		wp->mode->formats(wp, ft);
+	if (wp->mode != NULL && wp->mode->mode->formats != NULL)
+		wp->mode->mode->formats(wp->mode, ft);
 
 	format_add(ft, "alternate_on", "%d", wp->saved_grid ? 1 : 0);
 	format_add(ft, "alternate_saved_x", "%u", wp->saved_cx);
-- 
cgit