From 7ba5ad4cfb49a5de3971f823ba5d08d4760480c2 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 22 Dec 2017 10:18:51 +0000
Subject: [PATCH] Do not try to set default value on user options (they don't
 have one), from Charles Howard in GitHub issue 1161.

---
 cmd-set-option.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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));