Merge branch 'obsd-master'

Conflicts:
	Makefile
	cmd-link-window.c
	cmd-unlink-window.c
This commit is contained in:
Thomas Adam
2014-10-29 12:50:05 +00:00
21 changed files with 134 additions and 213 deletions

View File

@ -167,16 +167,16 @@ key_bindings_init(void)
RB_INIT(&key_bindings);
cmdq = cmdq_new (NULL);
cmdq = cmdq_new(NULL);
for (i = 0; i < nitems(defaults); i++) {
error = cmd_string_parse(defaults[i], &cmdlist,
"<default-keys>", i, &cause);
if (error != 0)
fatalx("bad default key");
cmdq_run (cmdq, cmdlist);
cmd_list_free (cmdlist);
cmdq_run(cmdq, cmdlist);
cmd_list_free(cmdlist);
}
cmdq_free (cmdq);
cmdq_free(cmdq);
}
void