Merge branch 'obsd-master'

2 files changed, 7 insertions, 4 deletions

diff --git a/cmd-set-option.c b/cmd-set-option.c
index 77c7d7c2..761cee93 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -110,8 +110,11 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
 	/* Find the option entry, try each table. */
 	table = oe = NULL;
 	if (options_table_find(optstr, &table, &oe) != 0) {
-		cmdq_error(cmdq, "ambiguous option: %s", optstr);
-		return (CMD_RETURN_ERROR);
+		if (!args_has(args, 'q')) {
+			cmdq_error(cmdq, "ambiguous option: %s", optstr);
+			return (CMD_RETURN_ERROR);
+		}
+		return (CMD_RETURN_NORMAL);
 	}
 	if (oe == NULL) {
 		if (!args_has(args, 'q')) {
diff --git a/tmux.1 b/tmux.1
index 803eff02..83eab55a 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2326,9 +2326,9 @@ restores a global option to the default).
 .Pp
 The
 .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
-flag suppresses errors about unknown options.
+flag suppresses errors about unknown or ambiguous options.
 .Pp
 With
 .Fl a ,