aboutsummaryrefslogtreecommitdiff
path: root/cmd-set-option.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-12-22 12:01:22 +0000
committerThomas Adam <thomas@xteddy.org>2017-12-22 12:01:22 +0000
commite19df0e86994c6c63c2be413a039ba9a2f03301d (patch)
tree03ef6e7dcad8eb77470190d22c30c87d458cec94 /cmd-set-option.c
parent74ecc866cf7613a3af10f400b4d59c12200d38c5 (diff)
parent7ba5ad4cfb49a5de3971f823ba5d08d4760480c2 (diff)
downloadrtmux-e19df0e86994c6c63c2be413a039ba9a2f03301d.tar.gz
rtmux-e19df0e86994c6c63c2be413a039ba9a2f03301d.tar.bz2
rtmux-e19df0e86994c6c63c2be413a039ba9a2f03301d.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-option.c')
-rw-r--r--cmd-set-option.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c
index d1ec6fcf..bdc42cae 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -192,7 +192,9 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
if (o == NULL)
goto out;
if (idx == -1) {
- if (oo == global_options ||
+ if (*name == '@')
+ options_remove(o);
+ else if (oo == global_options ||
oo == global_s_options ||
oo == global_w_options)
options_default(oo, options_table_entry(o));