mirror of
https://github.com/tmux/tmux.git
synced 2026-05-30 22:26:18 +00:00
Merge branch 'master' into floating_panes
This commit is contained in:
12
format.c
12
format.c
@@ -2059,8 +2059,10 @@ format_cb_pane_at_right(struct format_tree *ft)
|
||||
static void *
|
||||
format_cb_pane_bottom(struct format_tree *ft)
|
||||
{
|
||||
if (ft->wp != NULL)
|
||||
return (format_printf("%d", ft->wp->yoff + (int)ft->wp->sy - 1));
|
||||
struct window_pane *wp = ft->wp;
|
||||
|
||||
if (wp != NULL)
|
||||
return (format_printf("%d", wp->yoff + (int)wp->sy - 1));
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
@@ -2357,8 +2359,10 @@ format_cb_pane_pb_state(struct format_tree *ft)
|
||||
static void *
|
||||
format_cb_pane_right(struct format_tree *ft)
|
||||
{
|
||||
if (ft->wp != NULL)
|
||||
return (format_printf("%d", ft->wp->xoff + (int)ft->wp->sx - 1));
|
||||
struct window_pane *wp = ft->wp;
|
||||
|
||||
if (wp != NULL)
|
||||
return (format_printf("%d", wp->xoff + (int)wp->sx - 1));
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user