===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-buffer.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/tmux/cmd-set-buffer.c	2012/07/11 07:10:15	1.12
--- src/usr.bin/tmux/cmd-set-buffer.c	2013/03/24 09:54:10	1.13
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-buffer.c,v 1.12 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-set-buffer.c,v 1.13 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 27,33 ****
   * Add or set a paste buffer.
   */
  
! enum cmd_retval	 cmd_set_buffer_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_set_buffer_entry = {
  	"set-buffer", "setb",
--- 27,33 ----
   * Add or set a paste buffer.
   */
  
! enum cmd_retval	 cmd_set_buffer_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_set_buffer_entry = {
  	"set-buffer", "setb",
***************
*** 40,46 ****
  };
  
  enum cmd_retval
! cmd_set_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
  	u_int		 limit;
--- 40,46 ----
  };
  
  enum cmd_retval
! cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
  	u_int		 limit;
***************
*** 60,73 ****
  
  	buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
  	if (cause != NULL) {
! 		ctx->error(ctx, "buffer %s", cause);
  		free(cause);
  		free(pdata);
  		return (CMD_RETURN_ERROR);
  	}
  
  	if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) {
! 		ctx->error(ctx, "no buffer %d", buffer);
  		free(pdata);
  		return (CMD_RETURN_ERROR);
  	}
--- 60,73 ----
  
  	buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
  	if (cause != NULL) {
! 		cmdq_error(cmdq, "buffer %s", cause);
  		free(cause);
  		free(pdata);
  		return (CMD_RETURN_ERROR);
  	}
  
  	if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) {
! 		cmdq_error(cmdq, "no buffer %d", buffer);
  		free(pdata);
  		return (CMD_RETURN_ERROR);
  	}