Merge branch 'obsd-master'

2025-09-03 14:27:09 +00:00 · 2017-05-01 14:01:14 +01:00
parent 4b39120d22 0ccfb61bb0
commit e354b0e40f
17 changed files with 82 additions and 32 deletions
--- a/cfg.c
+++ b/cfg.c
@ -147,7 +147,8 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int quiet)
 				    line);
 				continue;
 			}
-			ft = format_create(NULL, FORMAT_NONE, FORMAT_NOJOBS);
+			ft = format_create(NULL, NULL, FORMAT_NONE,
+			    FORMAT_NOJOBS);

 			s = p + 3;
 			while (isspace((u_char)*s))