circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 19:39:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-07-27 10:01:08 +01:00
commit ff18787b2c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd-set-option.c
View File

@ -110,9 +110,12 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
/* Find the option entry, try each table. */ /* Find the option entry, try each table. */
table = oe = NULL; table = oe = NULL;
if (options_table_find(optstr, &table, &oe) != 0) { if (options_table_find(optstr, &table, &oe) != 0) {
if (!args_has(args, 'q')) {
cmdq_error(cmdq, "ambiguous option: %s", optstr); cmdq_error(cmdq, "ambiguous option: %s", optstr);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
return (CMD_RETURN_NORMAL);
}
if (oe == NULL) { if (oe == NULL) {
if (!args_has(args, 'q')) { if (!args_has(args, 'q')) {
cmdq_error(cmdq, "unknown option: %s", optstr); cmdq_error(cmdq, "unknown option: %s", optstr);

4
tmux.1
View File

@ -2326,9 +2326,9 @@ restores a global option to the default).
.Pp .Pp
The The
.Fl o .Fl o
flag prevents setting an option that is already set and flag prevents setting an option that is already set and the
.Fl q .Fl q
flag suppresses errors about unknown options. flag suppresses errors about unknown or ambiguous options.
.Pp .Pp
With With
.Fl a , .Fl a ,