===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-layout.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/tmux/cmd-select-layout.c	2016/10/14 22:14:22	1.31
--- src/usr.bin/tmux/cmd-select-layout.c	2016/10/16 19:04:05	1.32
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-layout.c,v 1.31 2016/10/14 22:14:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-select-layout.c,v 1.32 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 26,32 ****
   * Switch window to selected layout.
   */
  
! static enum cmd_retval	 cmd_select_layout_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_select_layout_entry = {
  	.name = "select-layout",
--- 26,33 ----
   * Switch window to selected layout.
   */
  
! static enum cmd_retval	cmd_select_layout_exec(struct cmd *,
! 			    struct cmdq_item *);
  
  const struct cmd_entry cmd_select_layout_entry = {
  	.name = "select-layout",
***************
*** 68,77 ****
  };
  
  static enum cmd_retval
! cmd_select_layout_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
! 	struct winlink	*wl = cmdq->state.tflag.wl;
  	struct window	*w;
  	const char	*layoutname;
  	char		*oldlayout;
--- 69,78 ----
  };
  
  static enum cmd_retval
! cmd_select_layout_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args	*args = self->args;
! 	struct winlink	*wl = item->state.tflag.wl;
  	struct window	*w;
  	const char	*layoutname;
  	char		*oldlayout;
***************
*** 118,124 ****
  
  	if (layoutname != NULL) {
  		if (layout_parse(w, layoutname) == -1) {
! 			cmdq_error(cmdq, "can't set layout: %s", layoutname);
  			goto error;
  		}
  		goto changed;
--- 119,125 ----
  
  	if (layoutname != NULL) {
  		if (layout_parse(w, layoutname) == -1) {
! 			cmdq_error(item, "can't set layout: %s", layoutname);
  			goto error;
  		}
  		goto changed;