circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-13 03:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-12-22 12:01:22 +00:00
commit e19df0e869
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd-set-option.c
View File

@ -192,7 +192,9 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
if (o == NULL) if (o == NULL)
goto out; goto out;
if (idx == -1) { if (idx == -1) {
if (oo == global_options || if (*name == '@')
options_remove(o);
else if (oo == global_options ||
oo == global_s_options || oo == global_s_options ||
oo == global_w_options) oo == global_w_options)
options_default(oo, options_table_entry(o)); options_default(oo, options_table_entry(o));

4
tmux.1
View File

@ -3467,8 +3467,8 @@ The following mouse events are available:
.It Li "MouseDown1" Ta "MouseUp1" Ta "MouseDrag1" Ta "MouseDragEnd1" .It Li "MouseDown1" Ta "MouseUp1" Ta "MouseDrag1" Ta "MouseDragEnd1"
.It Li "MouseDown2" Ta "MouseUp2" Ta "MouseDrag2" Ta "MouseDragEnd2" .It Li "MouseDown2" Ta "MouseUp2" Ta "MouseDrag2" Ta "MouseDragEnd2"
.It Li "MouseDown3" Ta "MouseUp3" Ta "MouseDrag3" Ta "MouseDragEnd3" .It Li "MouseDown3" Ta "MouseUp3" Ta "MouseDrag3" Ta "MouseDragEnd3"
.It Li "DoubleClick1" Ta "DoubleClick2" Ta "DoubleClick3" Ta "WheelUp" .It Li "DoubleClick1" Ta "DoubleClick2" Ta "DoubleClick3"
.It Li "TripleClick1" Ta "TripleClick2" Ta "TripleClick3" Ta "WheelDown" .It Li "TripleClick1" Ta "TripleClick2" Ta "TripleClick3"
.El .El
.Pp .Pp
Each should be suffixed with a location, for example Each should be suffixed with a location, for example