===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-split-window.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/tmux/cmd-split-window.c	2012/07/10 11:53:01	1.34
--- src/usr.bin/tmux/cmd-split-window.c	2012/07/11 07:10:15	1.35
***************
*** 1,4 ****
! /* $OpenBSD: cmd-split-window.c,v 1.34 2012/07/10 11:53:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-split-window.c,v 1.35 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 28,35 ****
   * Split a window (add a new pane).
   */
  
! void	cmd_split_window_key_binding(struct cmd *, int);
! int	cmd_split_window_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_split_window_entry = {
  	"split-window", "splitw",
--- 28,35 ----
   * Split a window (add a new pane).
   */
  
! void		 cmd_split_window_key_binding(struct cmd *, int);
! enum cmd_retval	 cmd_split_window_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_split_window_entry = {
  	"split-window", "splitw",
***************
*** 50,56 ****
  		args_set(self->args, 'h', NULL);
  }
  
! int
  cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
--- 50,56 ----
  		args_set(self->args, 'h', NULL);
  }
  
! enum cmd_retval
  cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
***************
*** 71,77 ****
  	char			*cp;
  
  	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp)) == NULL)
! 		return (-1);
  	w = wl->window;
  
  	environ_init(&env);
--- 71,77 ----
  	char			*cp;
  
  	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp)) == NULL)
! 		return (CMD_RETURN_ERROR);
  	w = wl->window;
  
  	environ_init(&env);
***************
*** 156,162 ****
  		format_free(ft);
  	}
  	notify_window_layout_changed(w);
! 	return (0);
  
  error:
  	environ_free(&env);
--- 156,162 ----
  		format_free(ft);
  	}
  	notify_window_layout_changed(w);
! 	return (CMD_RETURN_NORMAL);
  
  error:
  	environ_free(&env);
***************
*** 164,168 ****
  		window_remove_pane(w, new_wp);
  	ctx->error(ctx, "create pane failed: %s", cause);
  	free(cause);
! 	return (-1);
  }
--- 164,168 ----
  		window_remove_pane(w, new_wp);
  	ctx->error(ctx, "create pane failed: %s", cause);
  	free(cause);
! 	return (CMD_RETURN_ERROR);
  }