diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-12-13 12:01:10 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-12-13 12:01:10 +0000 |
| commit | 70d330a353a421bf41b6d2dc9caa011f36c1ecc6 (patch) | |
| tree | 5bd975a23545c7b7c57595023ecd216a2d4836f9 | |
| parent | 5c5712be5c2af0867118894ed411c6d7462b5b3b (diff) | |
| parent | c6149adf55a1ab108a9336ba15a82bd11a809cb3 (diff) | |
| download | rtmux-70d330a353a421bf41b6d2dc9caa011f36c1ecc6.tar.gz rtmux-70d330a353a421bf41b6d2dc9caa011f36c1ecc6.tar.bz2 rtmux-70d330a353a421bf41b6d2dc9caa011f36c1ecc6.zip | |
Merge branch 'obsd-master' into master
| -rw-r--r-- | options-table.c | 2 | ||||
| -rw-r--r-- | screen-redraw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/options-table.c b/options-table.c index 3e0ff198..3be04399 100644 --- a/options-table.c +++ b/options-table.c @@ -964,7 +964,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/screen-redraw.c b/screen-redraw.c index 0326c12d..5ef9e64c 100644 --- a/screen-redraw.c +++ b/screen-redraw.c @@ -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) |