mirror of
https://github.com/tmux/tmux.git
synced 2025-04-15 15:58:50 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
dfdced2ab1
@ -36,7 +36,7 @@ const struct cmd_entry cmd_refresh_client_entry = {
|
||||
|
||||
.args = { "A:B:cC:Df:r:F:l::LRSt:U", 0, 1, NULL },
|
||||
.usage = "[-cDlLRSU] [-A pane:state] [-B name:what:format] "
|
||||
"[-C XxY] [-f flags] [-r pane:report]" CMD_TARGET_CLIENT_USAGE
|
||||
"[-C XxY] [-f flags] [-r pane:report] " CMD_TARGET_CLIENT_USAGE
|
||||
" [adjustment]",
|
||||
|
||||
.flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG,
|
||||
|
10
session.c
10
session.c
@ -361,7 +361,7 @@ session_detach(struct session *s, struct winlink *wl)
|
||||
|
||||
if (RB_EMPTY(&s->windows))
|
||||
return (1);
|
||||
return (0);
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* Return if session has window. */
|
||||
@ -759,8 +759,10 @@ session_theme_changed(struct session *s)
|
||||
struct window_pane *wp;
|
||||
struct winlink *wl;
|
||||
|
||||
RB_FOREACH(wl, winlinks, &s->windows) {
|
||||
TAILQ_FOREACH(wp, &wl->window->panes, entry)
|
||||
wp->flags |= PANE_THEMECHANGED;
|
||||
if (s != NULL) {
|
||||
RB_FOREACH(wl, winlinks, &s->windows) {
|
||||
TAILQ_FOREACH(wp, &wl->window->panes, entry)
|
||||
wp->flags |= PANE_THEMECHANGED;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -795,12 +795,12 @@ tty_keys_next(struct tty *tty)
|
||||
switch (tty_keys_colours(tty, buf, len, &size, &tty->fg, &tty->bg)) {
|
||||
case 0: /* yes */
|
||||
key = KEYC_UNKNOWN;
|
||||
session_theme_changed(tty->client->session);
|
||||
session_theme_changed(c->session);
|
||||
goto complete_key;
|
||||
case -1: /* no, or not valid */
|
||||
break;
|
||||
case 1: /* partial */
|
||||
session_theme_changed(tty->client->session);
|
||||
session_theme_changed(c->session);
|
||||
goto partial_key;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user