===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -c -r1.110 -r1.111
*** src/usr.bin/tmux/format.c	2016/10/16 17:55:14	1.110
--- src/usr.bin/tmux/format.c	2016/10/16 19:04:05	1.111
***************
*** 1,4 ****
! /* $OpenBSD: format.c,v 1.110 2016/10/16 17:55:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: format.c,v 1.111 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 470,476 ****
  
  /* Create a new tree. */
  struct format_tree *
! format_create(struct cmd_q *cmdq, int flags)
  {
  	struct format_tree	*ft;
  
--- 470,476 ----
  
  /* Create a new tree. */
  struct format_tree *
! format_create(struct cmdq_item *item, int flags)
  {
  	struct format_tree	*ft;
  
***************
*** 489,498 ****
  	format_add(ft, "socket_path", "%s", socket_path);
  	format_add_tv(ft, "start_time", &start_time);
  
! 	if (cmdq != NULL && cmdq->cmd != NULL)
! 		format_add(ft, "command", "%s", cmdq->cmd->entry->name);
! 	if (cmdq != NULL && cmdq->hook != NULL)
! 		format_add(ft, "hook", "%s", cmdq->hook);
  
  	return (ft);
  }
--- 489,498 ----
  	format_add(ft, "socket_path", "%s", socket_path);
  	format_add_tv(ft, "start_time", &start_time);
  
! 	if (item != NULL && item->cmd != NULL)
! 		format_add(ft, "command", "%s", item->cmd->entry->name);
! 	if (item != NULL && item->hook != NULL)
! 		format_add(ft, "hook", "%s", item->hook);
  
  	return (ft);
  }