From 7fb8eec8f13bf54b3a6c06763d2cf0b29df51281 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 28 Nov 2019 08:38:04 +0000
Subject: status-left and status-right need push-default also, reported by Eric
 Pruitt in GitHub issue 1989.

---
 options-table.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 6e2db178..1d22b662 100644
--- a/options-table.c
+++ b/options-table.c
@@ -70,7 +70,10 @@ static const char *options_table_window_size_list[] = {
 /* Status line format. */
 #define OPTIONS_TABLE_STATUS_FORMAT1 \
 	"#[align=left range=left #{status-left-style}]" \
-	"#{T;=/#{status-left-length}:status-left}#[norange default]" \
+	"#[push-default]" \
+	"#{T;=/#{status-left-length}:status-left}" \
+	"#[pop-default]" \
+	"#[norange default]" \
 	"#[list=on align=#{status-justify}]" \
 	"#[list=left-marker]<#[list=right-marker]>#[list=on]" \
 	"#{W:" \
@@ -126,7 +129,10 @@ static const char *options_table_window_size_list[] = {
 		"#{?window_end_flag,,#{window-status-separator}}" \
 	"}" \
 	"#[nolist align=right range=right #{status-right-style}]" \
-	"#{T;=/#{status-right-length}:status-right}#[norange default]"
+	"#[push-default]" \
+	"#{T;=/#{status-right-length}:status-right}" \
+	"#[pop-default]" \
+	"#[norange default]"
 #define OPTIONS_TABLE_STATUS_FORMAT2 \
 	"#[align=centre]#{P:#{?pane_active,#[reverse],}" \
 	"#{pane_index}[#{pane_width}x#{pane_height}]#[default] }"
-- 
cgit 


From fa409194d3dfe0095bf6572a253772f2825f5dec Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 28 Nov 2019 10:55:45 +0000
Subject: Missing after-kill-pane option.

---
 options-table.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 1d22b662..d8612ff2 100644
--- a/options-table.c
+++ b/options-table.c
@@ -811,6 +811,7 @@ const struct options_table_entry options_table[] = {
 	OPTIONS_TABLE_HOOK("after-copy-mode", ""),
 	OPTIONS_TABLE_HOOK("after-display-message", ""),
 	OPTIONS_TABLE_HOOK("after-display-panes", ""),
+	OPTIONS_TABLE_HOOK("after-kill-pane", ""),
 	OPTIONS_TABLE_HOOK("after-list-buffers", ""),
 	OPTIONS_TABLE_HOOK("after-list-clients", ""),
 	OPTIONS_TABLE_HOOK("after-list-keys", ""),
-- 
cgit