===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-choose-client.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/tmux/Attic/cmd-choose-client.c	2012/07/10 11:53:01	1.10
--- src/usr.bin/tmux/Attic/cmd-choose-client.c	2012/07/11 07:10:15	1.11
***************
*** 1,4 ****
! /* $OpenBSD: cmd-choose-client.c,v 1.10 2012/07/10 11:53:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-choose-client.c,v 1.11 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 27,33 ****
   * Enter choice mode to choose a client.
   */
  
! int	cmd_choose_client_exec(struct cmd *, struct cmd_ctx *);
  
  void	cmd_choose_client_callback(struct window_choose_data *);
  void	cmd_choose_client_free(struct window_choose_data *);
--- 27,33 ----
   * Enter choice mode to choose a client.
   */
  
! enum cmd_retval	 cmd_choose_client_exec(struct cmd *, struct cmd_ctx *);
  
  void	cmd_choose_client_callback(struct window_choose_data *);
  void	cmd_choose_client_free(struct window_choose_data *);
***************
*** 47,53 ****
  	char   		*template;
  };
  
! int
  cmd_choose_client_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args			*args = self->args;
--- 47,53 ----
  	char   		*template;
  };
  
! enum cmd_retval
  cmd_choose_client_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args			*args = self->args;
***************
*** 60,73 ****
  
  	if (ctx->curclient == NULL) {
  		ctx->error(ctx, "must be run interactively");
! 		return (-1);
  	}
  
  	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
! 		return (-1);
  
  	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
! 		return (0);
  
  	if ((template = args_get(args, 'F')) == NULL)
  		template = DEFAULT_CLIENT_TEMPLATE;
--- 60,73 ----
  
  	if (ctx->curclient == NULL) {
  		ctx->error(ctx, "must be run interactively");
! 		return (CMD_RETURN_ERROR);
  	}
  
  	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
! 		return (CMD_RETURN_ERROR);
  
  	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
! 		return (CMD_RETURN_NORMAL);
  
  	if ((template = args_get(args, 'F')) == NULL)
  		template = DEFAULT_CLIENT_TEMPLATE;
***************
*** 104,110 ****
  	window_choose_ready(wl->window->active,
  	    cur, cmd_choose_client_callback, cmd_choose_client_free);
  
! 	return (0);
  }
  
  void
--- 104,110 ----
  	window_choose_ready(wl->window->active,
  	    cur, cmd_choose_client_callback, cmd_choose_client_free);
  
! 	return (CMD_RETURN_NORMAL);
  }
  
  void