mirror of
https://github.com/tmux/tmux.git
synced 2025-09-09 04:48:19 +00:00
Merge branch 'obsd-master' into master
This commit is contained in:
8
format.c
8
format.c
@@ -4696,12 +4696,12 @@ format_defaults(struct format_tree *ft, struct client *c, struct session *s,
|
|||||||
if (c != NULL && s != NULL && c->session != s)
|
if (c != NULL && s != NULL && c->session != s)
|
||||||
log_debug("%s: session does not match", __func__);
|
log_debug("%s: session does not match", __func__);
|
||||||
|
|
||||||
if (s != NULL)
|
if (wp != NULL)
|
||||||
ft->type = FORMAT_TYPE_SESSION;
|
ft->type = FORMAT_TYPE_PANE;
|
||||||
else if (wl != NULL)
|
else if (wl != NULL)
|
||||||
ft->type = FORMAT_TYPE_WINDOW;
|
ft->type = FORMAT_TYPE_WINDOW;
|
||||||
else if (wp != NULL)
|
else if (s != NULL)
|
||||||
ft->type = FORMAT_TYPE_PANE;
|
ft->type = FORMAT_TYPE_SESSION;
|
||||||
else
|
else
|
||||||
ft->type = FORMAT_TYPE_UNKNOWN;
|
ft->type = FORMAT_TYPE_UNKNOWN;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user