===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-break-pane.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/tmux/cmd-break-pane.c	2013/03/24 09:27:19	1.19
--- src/usr.bin/tmux/cmd-break-pane.c	2013/03/24 09:54:10	1.20
***************
*** 1,4 ****
! /* $OpenBSD: cmd-break-pane.c,v 1.19 2013/03/24 09:27:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-break-pane.c,v 1.20 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 26,32 ****
   * Break pane off into a window.
   */
  
! enum cmd_retval	 cmd_break_pane_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_break_pane_entry = {
  	"break-pane", "breakp",
--- 26,32 ----
   * Break pane off into a window.
   */
  
! enum cmd_retval	 cmd_break_pane_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_break_pane_entry = {
  	"break-pane", "breakp",
***************
*** 39,45 ****
  };
  
  enum cmd_retval
! cmd_break_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
  	struct winlink		*wl;
--- 39,45 ----
  };
  
  enum cmd_retval
! cmd_break_pane_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args		*args = self->args;
  	struct winlink		*wl;
***************
*** 54,64 ****
  	const char		*template;
  	char			*cp;
  
! 	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp)) == NULL)
  		return (CMD_RETURN_ERROR);
  
  	if (window_count_panes(wl->window) == 1) {
! 		ctx->error(ctx, "can't break with only one pane");
  		return (CMD_RETURN_ERROR);
  	}
  
--- 54,64 ----
  	const char		*template;
  	char			*cp;
  
! 	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp)) == NULL)
  		return (CMD_RETURN_ERROR);
  
  	if (window_count_panes(wl->window) == 1) {
! 		cmdq_error(cmdq, "can't break with only one pane");
  		return (CMD_RETURN_ERROR);
  	}
  
***************
*** 97,110 ****
  			template = BREAK_PANE_TEMPLATE;
  
  		ft = format_create();
! 		if ((c = cmd_find_client(ctx, NULL, 1)) != NULL)
  			format_client(ft, c);
  		format_session(ft, s);
  		format_winlink(ft, s, wl);
  		format_window_pane(ft, wp);
  
  		cp = format_expand(ft, template);
! 		ctx->print(ctx, "%s", cp);
  		free(cp);
  
  		format_free(ft);
--- 97,110 ----
  			template = BREAK_PANE_TEMPLATE;
  
  		ft = format_create();
! 		if ((c = cmd_find_client(cmdq, NULL, 1)) != NULL)
  			format_client(ft, c);
  		format_session(ft, s);
  		format_winlink(ft, s, wl);
  		format_window_pane(ft, wp);
  
  		cp = format_expand(ft, template);
! 		cmdq_print(cmdq, "%s", cp);
  		free(cp);
  
  		format_free(ft);