Merge branch 'obsd-master'

pull/1758/head
Thomas Adam 2019-05-22 21:02:28 +01:00
commit 9d450cc6d0
1 changed files with 8 additions and 1 deletions

View File

@ -90,7 +90,14 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
window = (self->entry == &cmd_show_window_options_entry);
if (args->argc == 0) {
options_scope_from_flags(args, window, fs, &oo, &cause);
scope = options_scope_from_flags(args, window, fs, &oo, &cause);
if (scope == OPTIONS_TABLE_NONE) {
if (args_has(args, 'q'))
return (CMD_RETURN_NORMAL);
cmdq_error(item, "%s", cause);
free(cause);
return (CMD_RETURN_ERROR);
}
return (cmd_show_options_all(self, item, oo));
}
argument = format_single(item, args->argv[0], c, s, wl, NULL);