circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/15/head
Thomas Adam 2015-06-04 16:01:07 +01:00
parent 02e348c069 4a6c06d6a9
commit 83a70172a4
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd-set-option.c
View File

@ -266,16 +266,25 @@ cmd_set_option_unset(struct cmd *self, struct cmd_q *cmdq,
{ {
struct args *args = self->args; struct args *args = self->args;
if (args_has(args, 'g')) {
cmdq_error(cmdq, "can't unset global option: %s", oe->name);
return (-1);
}
if (value != NULL) { if (value != NULL) {
cmdq_error(cmdq, "value passed to unset option: %s", oe->name); cmdq_error(cmdq, "value passed to unset option: %s", oe->name);
return (-1); return (-1);
} }
options_remove(oo, oe->name); if (args_has(args, 'g') || oo == &global_options) {
switch (oe->type) {
case OPTIONS_TABLE_STRING:
options_set_string(oo, oe->name, "%s", oe->default_str);
break;
case OPTIONS_TABLE_STYLE:
options_set_style(oo, oe->name, oe->default_str, 0);
break;
default:
options_set_number(oo, oe->name, oe->default_num);
break;
}
} else
options_remove(oo, oe->name);
return (0); return (0);
} }

12
tmux.1
View File

@ -2277,21 +2277,19 @@ command),
a server option with a server option with
.Fl s , .Fl s ,
otherwise a session option. otherwise a session option.
.Pp
If If
.Fl g .Fl g
is specified, the global session or window option is set. is given, the global session or window option is set.
The The
.Fl u .Fl u
flag unsets an option, so a session inherits the option from the global flag unsets an option, so a session inherits the option from the global
options. options (or with
It is not possible to unset a global option. .Fl g ,
restores a global option to the default).
.Pp .Pp
The The
.Fl o .Fl o
flag prevents setting an option that is already set. flag prevents setting an option that is already set and
.Pp
The
.Fl q .Fl q
flag suppresses errors about unknown options. flag suppresses errors about unknown options.
.Pp .Pp