From 5c824322004571b40668393876e9aaac0f97eb77 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 22 Dec 2017 10:16:36 +0000
Subject: [PATCH 1/2] Remove duplicate WheelUp/WheelDown entries in list,
 GitHub issue 1184.

---
 tmux.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tmux.1 b/tmux.1
index c0ed0e30..4e48d4a6 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3463,8 +3463,8 @@ The following mouse events are available:
 .It Li "MouseDown1" Ta "MouseUp1" Ta "MouseDrag1" Ta "MouseDragEnd1"
 .It Li "MouseDown2" Ta "MouseUp2" Ta "MouseDrag2" Ta "MouseDragEnd2"
 .It Li "MouseDown3" Ta "MouseUp3" Ta "MouseDrag3" Ta "MouseDragEnd3"
-.It Li "DoubleClick1" Ta "DoubleClick2" Ta "DoubleClick3" Ta "WheelUp"
-.It Li "TripleClick1" Ta "TripleClick2" Ta "TripleClick3" Ta "WheelDown"
+.It Li "DoubleClick1" Ta "DoubleClick2" Ta "DoubleClick3"
+.It Li "TripleClick1" Ta "TripleClick2" Ta "TripleClick3"
 .El
 .Pp
 Each should be suffixed with a location, for example

From 7ba5ad4cfb49a5de3971f823ba5d08d4760480c2 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 22 Dec 2017 10:18:51 +0000
Subject: [PATCH 2/2] 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));