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

2
cfg.c
View File

@ -122,7 +122,7 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int quiet)
line);
continue;
}
ft = format_create(NULL, FORMAT_NOJOBS);
ft = format_create(NULL, FORMAT_NONE, FORMAT_NOJOBS);
s = p + 3;
while (isspace((u_char)*s))