diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2020-05-16 14:55:39 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2020-05-16 14:55:39 +0000 |
| commit | 77b52d0eb703bbd2aa29920c8b3ce2774accf8f4 (patch) | |
| tree | 48b93ed973202e133d93da81fa871ca021c85276 /usr.bin | |
| parent | 15ce74dc20d25e97ca1265fcc7fd104f3b73ba9b (diff) | |
Call format_defaults_window for panes as well.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/format.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c index 5ad22a7cb51..03b4b024fdb 100644 --- a/usr.bin/tmux/format.c +++ b/usr.bin/tmux/format.c @@ -1,4 +1,4 @@ -/* $OpenBSD: format.c,v 1.250 2020/05/16 14:53:23 nicm Exp $ */ +/* $OpenBSD: format.c,v 1.251 2020/05/16 14:55:38 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -2550,7 +2550,7 @@ format_defaults(struct format_tree *ft, struct client *c, struct session *s, else log_debug("%s: s=none", __func__); if (wl != NULL) - log_debug("%s: wl=%u w=@%u", __func__, wl->idx, wl->window->id); + log_debug("%s: wl=%u", __func__, wl->idx); else log_debug("%s: wl=none", __func__); if (wp != NULL) @@ -2724,11 +2724,9 @@ format_defaults_winlink(struct format_tree *ft, struct winlink *wl) u_int ox, oy, sx, sy; if (ft->w == NULL) - ft->w = wl->window; + format_defaults_window(ft, w); ft->wl = wl; - format_defaults_window(ft, w); - if (c != NULL) { flag = tty_window_offset(&c->tty, &ox, &oy, &sx, &sy); format_add(ft, "window_bigger", "%d", flag); @@ -2788,7 +2786,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp) struct window_mode_entry *wme; if (ft->w == NULL) - ft->w = w; + format_defaults_window(ft, w); ft->wp = wp; format_add(ft, "history_size", "%u", gd->hsize); |