===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-display-message.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/tmux/cmd-display-message.c	2017/02/03 11:57:27	1.40
--- src/usr.bin/tmux/cmd-display-message.c	2017/04/22 10:22:39	1.41
***************
*** 1,4 ****
! /* $OpenBSD: cmd-display-message.c,v 1.40 2017/02/03 11:57:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-display-message.c,v 1.41 2017/04/22 10:22:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 43,50 ****
  	.usage = "[-p] [-c target-client] [-F format] "
  		 CMD_TARGET_PANE_USAGE " [message]",
  
! 	.cflag = CMD_CLIENT_CANFAIL,
! 	.tflag = CMD_PANE,
  
  	.flags = CMD_AFTERHOOK,
  	.exec = cmd_display_message_exec
--- 43,49 ----
  	.usage = "[-p] [-c target-client] [-F format] "
  		 CMD_TARGET_PANE_USAGE " [message]",
  
! 	.target = { 't', CMD_FIND_PANE, 0 },
  
  	.flags = CMD_AFTERHOOK,
  	.exec = cmd_display_message_exec
***************
*** 54,63 ****
  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;
  	const char		*template;
  	char			*msg;
  	struct format_tree	*ft;
--- 53,62 ----
  cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = self->args;
! 	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,71 ****
--- 65,71 ----
  		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)