aboutsummaryrefslogtreecommitdiff
path: root/cmd-display-message.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-08-23 15:58:46 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-08-23 15:58:46 +0100
commit2f7ffab0e8de524832b591a9ce6f034406f52e3d (patch)
tree2eb118467251a2b38eb48c39b13cb93678cf846b /cmd-display-message.c
parent3ed5e56a3974016dad9c28f42356aba9c05e0f4c (diff)
parenta0802dd4869bfefe548734a840dc2e1d3cb15c90 (diff)
downloadrtmux-2f7ffab0e8de524832b591a9ce6f034406f52e3d.tar.gz
rtmux-2f7ffab0e8de524832b591a9ce6f034406f52e3d.tar.bz2
rtmux-2f7ffab0e8de524832b591a9ce6f034406f52e3d.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'cmd-display-message.c')
-rw-r--r--cmd-display-message.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/cmd-display-message.c b/cmd-display-message.c
index 485ccf08..78752f86 100644
--- a/cmd-display-message.c
+++ b/cmd-display-message.c
@@ -36,7 +36,6 @@ const struct cmd_entry cmd_display_message_entry = {
" [message]",
0,
NULL,
- NULL,
cmd_display_message_exec
};
@@ -71,9 +70,9 @@ cmd_display_message_exec(struct cmd *self, struct cmd_q *cmdq)
}
if (args_has(args, 'c')) {
- c = cmd_find_client(cmdq, args_get(args, 'c'), 0);
- if (c == NULL)
- return (CMD_RETURN_ERROR);
+ c = cmd_find_client(cmdq, args_get(args, 'c'), 0);
+ if (c == NULL)
+ return (CMD_RETURN_ERROR);
} else {
c = cmd_current_client(cmdq);
if (c == NULL && !args_has(self->args, 'p')) {