diff options
Diffstat (limited to 'usr.bin/tmux')
| -rw-r--r-- | usr.bin/tmux/popup.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tty-keys.c | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/usr.bin/tmux/popup.c b/usr.bin/tmux/popup.c index ec75dc4774a..24d5e568c8a 100644 --- a/usr.bin/tmux/popup.c +++ b/usr.bin/tmux/popup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: popup.c,v 1.15 2020/05/16 15:34:08 nicm Exp $ */ +/* $OpenBSD: popup.c,v 1.16 2020/05/16 15:41:54 nicm Exp $ */ /* * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -70,8 +70,10 @@ popup_set_client_cb(struct tty_ctx *ttyctx, struct client *c) { struct popup_data *pd = ttyctx->arg; + if (c != pd->c) + return (0); if (pd->c->flags & CLIENT_REDRAWOVERLAY) - return (-1); + return (0); ttyctx->bigger = 0; ttyctx->wox = 0; diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index 7e5356b0ad8..eebdcaff5d9 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.760 2020/05/16 15:25:24 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.761 2020/05/16 15:41:54 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> .\" @@ -4553,7 +4553,7 @@ The following variables are available, where appropriate: .It Li "pane_marked" Ta "" Ta "1 if this is the marked pane" .It Li "pane_marked_set" Ta "" Ta "1 if a marked pane is set" .It Li "pane_mode" Ta "" Ta "Name of pane mode, if any" -.It Li "pane_path" Ta "#T" Ta "Path of pane (can be set by application)" +.It Li "pane_path" Ta "" Ta "Path of pane (can be set by application)" .It Li "pane_pid" Ta "" Ta "PID of first process in pane" .It Li "pane_pipe" Ta "" Ta "1 if pane is being piped" .It Li "pane_right" Ta "" Ta "Right of pane" diff --git a/usr.bin/tmux/tty-keys.c b/usr.bin/tmux/tty-keys.c index 9a8ab2c7b25..c6191878cd1 100644 --- a/usr.bin/tmux/tty-keys.c +++ b/usr.bin/tmux/tty-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty-keys.c,v 1.130 2020/05/16 14:30:17 nicm Exp $ */ +/* $OpenBSD: tty-keys.c,v 1.131 2020/05/16 15:41:54 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1064,10 +1064,7 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len, /* Add terminal features. */ switch (p[0]) { case 41: /* VT420 */ - tty_add_features(&c->term_features, - "margins," - "rectfill", - ","); + tty_add_features(&c->term_features, "margins,rectfill", ","); break; case 'M': /* mintty */ tty_default_features(&c->term_features, "mintty", 0); |