Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-04-13 14:01:45 +01:00
62 changed files with 470 additions and 336 deletions

View File

@@ -124,7 +124,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = cmd_get_args(self);
struct cmd_source_file_data *cdata;
struct client *c = item->client;
struct client *c = cmdq_get_client(item);
enum cmd_retval retval = CMD_RETURN_NORMAL;
char *pattern, *cwd;
const char *path, *error;