Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-12-08 10:01:16 +00:00
23 changed files with 35 additions and 41 deletions

View File

@ -87,7 +87,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
to_free = NULL;
if (args_has(args, 'c')) {
ft = format_create();
ft = format_create(0);
format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, NULL,
NULL);
to_free = cwd = format_expand(ft, args_get(args, 'c'));
@ -164,7 +164,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
if ((template = args_get(args, 'F')) == NULL)
template = SPLIT_WINDOW_TEMPLATE;
ft = format_create();
ft = format_create(0);
format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, wl,
new_wp);