Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2014-09-25 11:29:54 +01:00
20 changed files with 140 additions and 52 deletions

View File

@ -84,7 +84,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
cmd = options_get_string(&s->options, "default-command");
if (cmd != NULL && *cmd != '\0') {
argc = 1;
argv = (char**)&cmd;
argv = (char **)&cmd;
} else {
argc = 0;
argv = NULL;