circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/1731/head
Thomas Adam 2019-04-30 21:02:26 +01:00
parent 1156d91cf8 429c4bc51b
commit dc7e53897a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd-show-options.c
View File

@ -215,19 +215,21 @@ static enum cmd_retval
cmd_show_options_all(struct cmd *self, struct cmdq_item *item, cmd_show_options_all(struct cmd *self, struct cmdq_item *item,
struct options *oo) struct options *oo)
{ {
struct options_entry *o; struct options_entry *o;
struct options_array_item *a; struct options_array_item *a;
u_int idx; u_int idx;
int flags; const struct options_table_entry *oe;
o = options_first(oo); o = options_first(oo);
while (o != NULL) { while (o != NULL) {
flags = options_table_entry(o)->flags; oe = options_table_entry(o);
if ((self->entry != &cmd_show_hooks_entry && if ((self->entry != &cmd_show_hooks_entry &&
!args_has(self->args, 'H') && !args_has(self->args, 'H') &&
(flags & OPTIONS_TABLE_IS_HOOK)) || oe != NULL &&
(oe->flags & OPTIONS_TABLE_IS_HOOK)) ||
(self->entry == &cmd_show_hooks_entry && (self->entry == &cmd_show_hooks_entry &&
(~flags & OPTIONS_TABLE_IS_HOOK))) { (oe == NULL ||
(~oe->flags & OPTIONS_TABLE_IS_HOOK)))) {
o = options_next(o); o = options_next(o);
continue; continue;
} }