diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-12-22 12:01:22 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-12-22 12:01:22 +0000 |
| commit | e19df0e86994c6c63c2be413a039ba9a2f03301d (patch) | |
| tree | 03ef6e7dcad8eb77470190d22c30c87d458cec94 | |
| parent | 74ecc866cf7613a3af10f400b4d59c12200d38c5 (diff) | |
| parent | 7ba5ad4cfb49a5de3971f823ba5d08d4760480c2 (diff) | |
| download | rtmux-e19df0e86994c6c63c2be413a039ba9a2f03301d.tar.gz rtmux-e19df0e86994c6c63c2be413a039ba9a2f03301d.tar.bz2 rtmux-e19df0e86994c6c63c2be413a039ba9a2f03301d.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-set-option.c | 4 | ||||
| -rw-r--r-- | tmux.1 | 4 |
2 files changed, 5 insertions, 3 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)); @@ -3467,8 +3467,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 |