From d33adc4fd0f7657ede3178c9b1f33c2d5df3c524 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 27 Jul 2015 08:45:45 +0000
Subject: Make -q suppress ambiguous option warnings too, from Cam Hutchison.

---
 cmd-set-option.c | 7 +++++--
 tmux.1           | 4 ++--
 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 7320df4f..a4422057 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2322,9 +2322,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 ,
-- 
cgit v1.2.3