circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-12-12 20:01:15 +00:00
parent 5a5db02b85 5ed17e84fa
commit 845a664bb2
16 changed files with 122 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
format.c
View File

@@ -1052,6 +1052,7 @@ void
format_defaults_client(struct format_tree *ft, struct client *c)
{
struct session *s;
const char *name;
if (ft->s == NULL)
ft->s = c->session;
@@ -1069,7 +1070,8 @@ format_defaults_client(struct format_tree *ft, struct client *c)
format_add_tv(ft, "client_created", &c->creation_time);
format_add_tv(ft, "client_activity", &c->activity_time);
if (strcmp(c->keytable->name, "root") == 0)
name = server_client_get_key_table(c);
if (strcmp(c->keytable->name, name) == 0)
format_add(ft, "client_prefix", "%d", 0);
else
format_add(ft, "client_prefix", "%d", 1);