aboutsummaryrefslogtreecommitdiff
path: root/cmd-display-message.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-04-22 12:01:19 +0100
committerThomas Adam <thomas@xteddy.org>2017-04-22 12:01:19 +0100
commite802b683ea0ebfa377a5bb8a6b03454c1edbe2d5 (patch)
tree7a495bed6d4d979974826a11707f1c2585173768 /cmd-display-message.c
parentb08e451c916fd942b9d24706583ccedf307e0877 (diff)
parent55cd4c7bc756509f241788f7f73676676ef538f6 (diff)
downloadrtmux-e802b683ea0ebfa377a5bb8a6b03454c1edbe2d5.tar.gz
rtmux-e802b683ea0ebfa377a5bb8a6b03454c1edbe2d5.tar.bz2
rtmux-e802b683ea0ebfa377a5bb8a6b03454c1edbe2d5.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-display-message.c')
-rw-r--r--cmd-display-message.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-display-message.c b/cmd-display-message.c
index 3bb5f9ac..41be8362 100644
--- a/cmd-display-message.c
+++ b/cmd-display-message.c
@@ -43,8 +43,7 @@ const struct cmd_entry cmd_display_message_entry = {
.usage = "[-p] [-c target-client] [-F format] "
CMD_TARGET_PANE_USAGE " [message]",
- .cflag = CMD_CLIENT_CANFAIL,
- .tflag = CMD_PANE,
+ .target = { 't', CMD_FIND_PANE, 0 },
.flags = CMD_AFTERHOOK,
.exec = cmd_display_message_exec
@@ -54,10 +53,10 @@ static enum cmd_retval
cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = self->args;
- struct client *c = item->state.c;
- struct session *s = item->state.tflag.s;
- struct winlink *wl = item->state.tflag.wl;
- struct window_pane *wp = item->state.tflag.wp;
+ struct client *c;
+ struct session *s = item->target.s;
+ struct winlink *wl = item->target.wl;
+ struct window_pane *wp = item->target.wp;
const char *template;
char *msg;
struct format_tree *ft;
@@ -66,6 +65,7 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
cmdq_error(item, "only one of -F or argument must be given");
return (CMD_RETURN_ERROR);
}
+ c = cmd_find_client(item, args_get(args, 'c'), 1);
template = args_get(args, 'F');
if (args->argc != 0)