Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-02-03 14:01:13 +00:00
26 changed files with 51 additions and 33 deletions

View File

@ -1230,7 +1230,7 @@ server_client_set_title(struct client *c)
template = options_get_string(s->options, "set-titles-string");
ft = format_create(NULL, 0);
ft = format_create(NULL, FORMAT_NONE, 0);
format_defaults(ft, c, NULL, NULL, NULL);
title = format_expand_time(ft, template, time(NULL));