circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-03-30 19:48:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2025-01-12 16:01:11 +00:00
commit d3cbe00f78
2 changed files with 7 additions and 3 deletions

8
popup.c
View File

@ -352,9 +352,11 @@ popup_make_pane(struct popup_data *pd, enum layout_type type)
new_wp = window_add_pane(wp->window, NULL, hlimit, 0); new_wp = window_add_pane(wp->window, NULL, hlimit, 0);
layout_assign_pane(lc, new_wp, 0); layout_assign_pane(lc, new_wp, 0);
new_wp->fd = job_transfer(pd->job, &new_wp->pid, new_wp->tty, if (pd->job != NULL) {
sizeof new_wp->tty); new_wp->fd = job_transfer(pd->job, &new_wp->pid, new_wp->tty,
pd->job = NULL; sizeof new_wp->tty);
pd->job = NULL;
}
screen_set_title(&pd->s, new_wp->base.title); screen_set_title(&pd->s, new_wp->base.title);
screen_free(&new_wp->base); screen_free(&new_wp->base);

2
tty.c
View File

@ -2880,6 +2880,8 @@ tty_check_fg(struct tty *tty, struct colour_palette *palette,
gc->fg &= 7; gc->fg &= 7;
if (colours >= 16) if (colours >= 16)
gc->fg += 90; gc->fg += 90;
else if (gc->fg == 0 && gc->bg == 0)
gc->fg = 7;
} }
} }
return; return;