aboutsummaryrefslogtreecommitdiff
path: root/cmd-set-option.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2014-10-02 09:29:48 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2014-10-02 09:29:48 +0100
commit931c17ed4f3ac18470f5b385210d61b24a57b5d4 (patch)
tree6dbcfe073cec1ba8f34626bdfa04123b621eb9ed /cmd-set-option.c
parent24d9dc518de6761f645165d49f321b2b56904fb5 (diff)
parent2874a431c050527244a56e7f241baf053c722f88 (diff)
downloadrtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.tar.gz
rtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.tar.bz2
rtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'cmd-set-option.c')
-rw-r--r--cmd-set-option.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c
index f55b0d30..22432b7d 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -201,7 +201,7 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
/* Set user option. */
enum cmd_retval
-cmd_set_option_user(struct cmd *self, struct cmd_q *cmdq, const char* optstr,
+cmd_set_option_user(struct cmd *self, struct cmd_q *cmdq, const char *optstr,
const char *valstr)
{
struct args *args = self->args;
@@ -254,7 +254,7 @@ cmd_set_option_user(struct cmd *self, struct cmd_q *cmdq, const char* optstr,
if (args_has(args, 'o') && options_find1(oo, optstr) != NULL) {
if (!args_has(args, 'q')) {
cmdq_error(cmdq, "already set: %s", optstr);
- return CMD_RETURN_ERROR;
+ return (CMD_RETURN_ERROR);
}
return (CMD_RETURN_NORMAL);
}