circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix user options after show-hooks merge, GitHub issue 1704.

Browse Source
This commit is contained in:
nicm
2019-04-30 18:02:03 +00:00
parent 5a288b1efe
commit 429c4bc51b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd-show-options.c
View File

@@ -219,16 +219,18 @@ cmd_show_options_all(struct cmd *self, struct cmdq_item *item,
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;
} }