diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-04-06 11:10:17 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-04-06 11:10:17 +0100 |
| commit | 5f662d91db658abbcd46d7a678c0250754be35e3 (patch) | |
| tree | bed316d0ce8c4a770b5e42608a36dafc0a9eee2d /format.c | |
| parent | 05c97d7fe9ede1b9d185ed21242eb8470350affc (diff) | |
| parent | 94b71bcb6403d381515319b08a85878b829785d5 (diff) | |
| download | rtmux-5f662d91db658abbcd46d7a678c0250754be35e3.tar.gz rtmux-5f662d91db658abbcd46d7a678c0250754be35e3.tar.bz2 rtmux-5f662d91db658abbcd46d7a678c0250754be35e3.zip | |
Merge branch 'obsd-master'
Conflicts:
server-client.c
tmux.1
Diffstat (limited to 'format.c')
| -rw-r--r-- | format.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1159,11 +1159,11 @@ format_defaults_client(struct format_tree *ft, struct client *c) if (ft->s == NULL) ft->s = c->session; + format_add(ft, "client_name", "%s", c->name); format_add(ft, "client_pid", "%ld", (long) c->pid); format_add(ft, "client_height", "%u", tty->sy); format_add(ft, "client_width", "%u", tty->sx); - if (tty->path != NULL) - format_add(ft, "client_tty", "%s", tty->path); + format_add(ft, "client_tty", "%s", c->ttyname); format_add(ft, "client_control_mode", "%d", !!(c->flags & CLIENT_CONTROL)); |