===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -c -r1.65 -r1.66
*** src/usr.bin/tmux/window-copy.c	2010/12/29 21:49:06	1.65
--- src/usr.bin/tmux/window-copy.c	2010/12/30 23:16:18	1.66
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.65 2010/12/29 21:49:06 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.66 2010/12/30 23:16:18 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 52,58 ****
  void	window_copy_update_cursor(struct window_pane *, u_int, u_int);
  void	window_copy_start_selection(struct window_pane *);
  int	window_copy_update_selection(struct window_pane *);
! void	window_copy_copy_selection(struct window_pane *, struct session *);
  void	window_copy_clear_selection(struct window_pane *);
  void	window_copy_copy_line(
  	    struct window_pane *, char **, size_t *, u_int, u_int, u_int);
--- 52,58 ----
  void	window_copy_update_cursor(struct window_pane *, u_int, u_int);
  void	window_copy_start_selection(struct window_pane *);
  int	window_copy_update_selection(struct window_pane *);
! void	window_copy_copy_selection(struct window_pane *);
  void	window_copy_clear_selection(struct window_pane *);
  void	window_copy_copy_line(
  	    struct window_pane *, char **, size_t *, u_int, u_int, u_int);
***************
*** 506,512 ****
  		break;
  	case MODEKEYCOPY_COPYSELECTION:
  		if (sess != NULL) {
! 			window_copy_copy_selection(wp, sess);
  			window_pane_reset_mode(wp);
  			return;
  		}
--- 506,512 ----
  		break;
  	case MODEKEYCOPY_COPYSELECTION:
  		if (sess != NULL) {
! 			window_copy_copy_selection(wp);
  			window_pane_reset_mode(wp);
  			return;
  		}
***************
*** 796,802 ****
  			s->mode &= ~MODE_MOUSE_ANY;
  			s->mode |= MODE_MOUSE_STANDARD;
  			if (sess != NULL) {
! 				window_copy_copy_selection(wp, sess);
  				window_pane_reset_mode(wp);
  			}
  		}
--- 796,802 ----
  			s->mode &= ~MODE_MOUSE_ANY;
  			s->mode |= MODE_MOUSE_STANDARD;
  			if (sess != NULL) {
! 				window_copy_copy_selection(wp);
  				window_pane_reset_mode(wp);
  			}
  		}
***************
*** 1210,1216 ****
  }
  
  void
! window_copy_copy_selection(struct window_pane *wp, struct session *sess)
  {
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
--- 1210,1216 ----
  }
  
  void
! window_copy_copy_selection(struct window_pane *wp)
  {
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
***************
*** 1305,1312 ****
  	off--;	/* remove final \n */
  
  	/* Add the buffer to the stack. */
! 	limit = options_get_number(&sess->options, "buffer-limit");
! 	paste_add(&sess->buffers, buf, off, limit);
  }
  
  void
--- 1305,1312 ----
  	off--;	/* remove final \n */
  
  	/* Add the buffer to the stack. */
! 	limit = options_get_number(&global_options, "buffer-limit");
! 	paste_add(&global_buffers, buf, off, limit);
  }
  
  void