===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-display-message.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** src/usr.bin/tmux/cmd-display-message.c	2019/03/15 10:04:13	1.47
--- src/usr.bin/tmux/cmd-display-message.c	2019/03/18 14:10:25	1.48
***************
*** 1,4 ****
! /* $OpenBSD: cmd-display-message.c,v 1.47 2019/03/15 10:04:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-display-message.c,v 1.48 2019/03/18 14:10:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 39,46 ****
  	.name = "display-message",
  	.alias = "display",
  
! 	.args = { "c:pt:F:v", 0, 1 },
! 	.usage = "[-pv] [-c target-client] [-F format] "
  		 CMD_TARGET_PANE_USAGE " [message]",
  
  	.target = { 't', CMD_FIND_PANE, 0 },
--- 39,46 ----
  	.name = "display-message",
  	.alias = "display",
  
! 	.args = { "ac:pt:F:v", 0, 1 },
! 	.usage = "[-apv] [-c target-client] [-F format] "
  		 CMD_TARGET_PANE_USAGE " [message]",
  
  	.target = { 't', CMD_FIND_PANE, 0 },
***************
*** 49,54 ****
--- 49,62 ----
  	.exec = cmd_display_message_exec
  };
  
+ static void
+ cmd_display_message_each(const char *key, const char *value, void *arg)
+ {
+ 	struct cmdq_item	*item = arg;
+ 
+ 	cmdq_print(item, "%s=%s", key, value);
+ }
+ 
  static enum cmd_retval
  cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
  {
***************
*** 90,95 ****
--- 98,109 ----
  		flags = 0;
  	ft = format_create(item->client, item, FORMAT_NONE, flags);
  	format_defaults(ft, target_c, s, wl, wp);
+ 
+ 	if (args_has(args, 'a')) {
+ 		if (item != NULL)
+ 			format_each(ft, cmd_display_message_each, item);
+ 		return (CMD_RETURN_NORMAL);
+ 	}
  
  	msg = format_expand_time(ft, template);
  	if (args_has(self->args, 'p'))