===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-show-buffer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/tmux/Attic/cmd-show-buffer.c	2009/12/03 22:50:10	1.8
--- src/usr.bin/tmux/Attic/cmd-show-buffer.c	2010/12/30 23:16:18	1.9
***************
*** 1,4 ****
! /* $OpenBSD: cmd-show-buffer.c,v 1.8 2009/12/03 22:50:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-show-buffer.c,v 1.9 2010/12/30 23:16:18 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 30,36 ****
  
  const struct cmd_entry cmd_show_buffer_entry = {
  	"show-buffer", "showb",
! 	CMD_BUFFER_SESSION_USAGE,
  	0, "",
  	cmd_buffer_init,
  	cmd_buffer_parse,
--- 30,36 ----
  
  const struct cmd_entry cmd_show_buffer_entry = {
  	"show-buffer", "showb",
! 	CMD_BUFFER_USAGE,
  	0, "",
  	cmd_buffer_init,
  	cmd_buffer_parse,
***************
*** 49,68 ****
  	size_t			 size, len;
  	u_int			 width;
  
! 	if ((s = cmd_find_session(ctx, data->target)) == NULL)
  		return (-1);
  
  	if (data->buffer == -1) {
! 		if ((pb = paste_get_top(&s->buffers)) == NULL) {
  			ctx->error(ctx, "no buffers");
  			return (-1);
  		}
! 	} else if ((pb = paste_get_index(&s->buffers, data->buffer)) == NULL) {
! 		ctx->error(ctx, "no buffer %d", data->buffer);
! 		return (-1);
  	}
- 	if (pb == NULL)
- 		return (0);
  
  	size = pb->size;
  	if (size > SIZE_MAX / 4 - 1)
--- 49,69 ----
  	size_t			 size, len;
  	u_int			 width;
  
! 	if ((s = cmd_find_session(ctx, NULL)) == NULL)
  		return (-1);
  
  	if (data->buffer == -1) {
! 		if ((pb = paste_get_top(&global_buffers)) == NULL) {
  			ctx->error(ctx, "no buffers");
  			return (-1);
  		}
! 	} else {
! 		pb = paste_get_index(&global_buffers, data->buffer);
! 		if (pb == NULL) {
! 			ctx->error(ctx, "no buffer %d", data->buffer);
! 			return (-1);
! 		}
  	}
  
  	size = pb->size;
  	if (size > SIZE_MAX / 4 - 1)