summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2019-11-28 08:38:04 +0000
committernicm <nicm@openbsd.org>2019-11-28 08:38:04 +0000
commit57b78c229879d7c84c8a0e810ce7bfa0dfb26daf (patch)
tree94ae0f31b961cedc141751b24f4809bf0d89e396
parenttypo (diff)
downloadwireguard-openbsd-57b78c229879d7c84c8a0e810ce7bfa0dfb26daf.tar.xz
wireguard-openbsd-57b78c229879d7c84c8a0e810ce7bfa0dfb26daf.zip
status-left and status-right need push-default also, reported by Eric
Pruitt in GitHub issue 1989.
-rw-r--r--usr.bin/tmux/options-table.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c
index 333d78c8bb8..77903228e25 100644
--- a/usr.bin/tmux/options-table.c
+++ b/usr.bin/tmux/options-table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.113 2019/11/14 16:23:23 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.114 2019/11/28 08:38:04 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -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] }"