Merge branch 'master' of github.com:tmux/tmux

This commit is contained in:
Nicholas Marriott 2017-01-26 19:55:45 +00:00
commit b2e909b252

View File

@ -211,9 +211,11 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
}
if (o == NULL)
o = options_empty(oo, options_table_entry(parent));
if (idx == -1)
if (idx == -1) {
if (!append)
options_array_clear(o);
options_array_assign(o, value);
else if (options_array_set(o, idx, value, append) != 0) {
} else if (options_array_set(o, idx, value, append) != 0) {
cmdq_error(item, "invalid index: %s", args->argv[0]);
return (CMD_RETURN_ERROR);
}