===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.672
retrieving revision 1.673
diff -c -r1.672 -r1.673
*** src/usr.bin/tmux/tmux.h	2016/10/16 22:18:04	1.672
--- src/usr.bin/tmux/tmux.h	2016/10/18 08:46:43	1.673
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.672 2016/10/16 22:18:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.673 2016/10/18 08:46:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1239,1244 ****
--- 1239,1245 ----
  /* Command queue item. */
  typedef enum cmd_retval (*cmdq_cb) (struct cmdq_item *, void *);
  struct cmdq_item {
+ 	const char		*name;
  	struct cmdq_list	*queue;
  	struct cmdq_item	*next;
  
***************
*** 1779,1785 ****
  /* cmd-queue.c */
  struct cmdq_item *cmdq_get_command(struct cmd_list *, struct cmd_find_state *,
  		     struct mouse_event *, int);
! struct cmdq_item *cmdq_get_callback(cmdq_cb, void *);
  void		 cmdq_insert_after(struct cmdq_item *, struct cmdq_item *);
  void		 cmdq_append(struct client *, struct cmdq_item *);
  void printflike(3, 4) cmdq_format(struct cmdq_item *, const char *,
--- 1780,1787 ----
  /* cmd-queue.c */
  struct cmdq_item *cmdq_get_command(struct cmd_list *, struct cmd_find_state *,
  		     struct mouse_event *, int);
! #define cmdq_get_callback(cb, data) cmdq_get_callback1(#cb, cb, data)
! struct cmdq_item *cmdq_get_callback1(const char *, cmdq_cb, void *);
  void		 cmdq_insert_after(struct cmdq_item *, struct cmdq_item *);
  void		 cmdq_append(struct client *, struct cmdq_item *);
  void printflike(3, 4) cmdq_format(struct cmdq_item *, const char *,