aboutsummaryrefslogtreecommitdiff
path: root/cmd-show-options.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-12-28 12:01:21 +0000
committerThomas Adam <thomas@xteddy.org>2020-12-28 12:01:21 +0000
commit3cbe186efb93980959e410162c1583a3b54a8417 (patch)
tree624677812a1be17ffc72241465fca81b21cadaa4 /cmd-show-options.c
parentd936fde7ef62863fbb8b142c3ee229cb460dbfdb (diff)
parenta98ee00dd988b813b0b0cba1af939978505936b7 (diff)
downloadrtmux-3cbe186efb93980959e410162c1583a3b54a8417.tar.gz
rtmux-3cbe186efb93980959e410162c1583a3b54a8417.tar.bz2
rtmux-3cbe186efb93980959e410162c1583a3b54a8417.zip
Merge branch 'obsd-master' into master
Diffstat (limited to 'cmd-show-options.c')
-rw-r--r--cmd-show-options.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/cmd-show-options.c b/cmd-show-options.c
index ed93311a..e3ba821d 100644
--- a/cmd-show-options.c
+++ b/cmd-show-options.c
@@ -200,11 +200,13 @@ cmd_show_options_all(struct cmd *self, struct cmdq_item *item, int scope,
u_int idx;
int parent;
- o = options_first(oo);
- while (o != NULL) {
- if (options_table_entry(o) == NULL)
- cmd_show_options_print(self, item, o, -1, 0);
- o = options_next(o);
+ if (cmd_get_entry(self) != &cmd_show_hooks_entry) {
+ o = options_first(oo);
+ while (o != NULL) {
+ if (options_table_entry(o) == NULL)
+ cmd_show_options_print(self, item, o, -1, 0);
+ o = options_next(o);
+ }
}
for (oe = options_table; oe->name != NULL; oe++) {
if (~oe->scope & scope)