aboutsummaryrefslogtreecommitdiff
path: root/cmd-set-option.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2015-08-07 15:08:26 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2015-08-07 15:08:26 +0100
commit3c9b8a28c61e88d258060e38d459b05023b525ab (patch)
tree19dfe2b769fe01698316d9b336cfa9c8be392b49 /cmd-set-option.c
parent736d8350e930c37b12b9e78d92def3b701040667 (diff)
parent73b4d098ce42039e111ef51b64135d8fc0c7a58f (diff)
downloadrtmux-3c9b8a28c61e88d258060e38d459b05023b525ab.tar.gz
rtmux-3c9b8a28c61e88d258060e38d459b05023b525ab.tar.bz2
rtmux-3c9b8a28c61e88d258060e38d459b05023b525ab.zip
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'cmd-set-option.c')
-rw-r--r--cmd-set-option.c7
1 files changed, 5 insertions, 2 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')) {