diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2021-12-13 09:42:21 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2021-12-13 09:42:21 +0000 |
| commit | 67c1c7f46bfbe328ccbfca82616da21d2f0bd5f3 (patch) | |
| tree | 0c3fd5121e9dceb1de6d476fd59227915864dbf3 | |
| parent | ecf09021cd005f9000f12d7dbd7858695bd7388f (diff) | |
Make pane-border-format a pane option, GitHub issue 2999.
| -rw-r--r-- | usr.bin/tmux/options-table.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/screen-redraw.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c index 9724fab6eeb..01b7c446b67 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.154 2021/11/03 13:37:17 nicm Exp $ */ +/* $OpenBSD: options-table.c,v 1.155 2021/12/13 09:42:20 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -965,7 +965,7 @@ const struct options_table_entry options_table[] = { { .name = "pane-border-format", .type = OPTIONS_TABLE_STRING, - .scope = OPTIONS_TABLE_WINDOW, + .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE, .default_str = "#{?pane_active,#[reverse],}#{pane_index}#[default] " "\"#{pane_title}\"", .text = "Format of text in the pane status lines." diff --git a/usr.bin/tmux/screen-redraw.c b/usr.bin/tmux/screen-redraw.c index 15aa31d2d28..0fcec8fb02f 100644 --- a/usr.bin/tmux/screen-redraw.c +++ b/usr.bin/tmux/screen-redraw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: screen-redraw.c,v 1.91 2021/10/26 12:22:23 nicm Exp $ */ +/* $OpenBSD: screen-redraw.c,v 1.92 2021/12/13 09:42:20 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -373,7 +373,7 @@ screen_redraw_make_pane_status(struct client *c, struct window_pane *wp, style_apply(&gc, w->options, "pane-active-border-style", ft); else style_apply(&gc, w->options, "pane-border-style", ft); - fmt = options_get_string(w->options, "pane-border-format"); + fmt = options_get_string(wp->options, "pane-border-format"); expanded = format_expand_time(ft, fmt); if (wp->sx < 4) |