===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -c -r1.81 -r1.82
*** src/usr.bin/tmux/window-copy.c	2012/07/10 11:53:01	1.81
--- src/usr.bin/tmux/window-copy.c	2012/08/11 06:45:33	1.82
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.81 2012/07/10 11:53:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.82 2012/08/11 06:45:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1115,1124 ****
  	char				 hdr[32];
  	size_t	 			 last, xoff = 0, size = 0;
  
! 	memcpy(&gc, &grid_default_cell, sizeof gc);
! 	colour_set_fg(&gc, options_get_number(oo, "mode-fg"));
! 	colour_set_bg(&gc, options_get_number(oo, "mode-bg"));
! 	gc.attr |= options_get_number(oo, "mode-attr");
  
  	last = screen_size_y(s) - 1;
  	if (py == 0) {
--- 1115,1121 ----
  	char				 hdr[32];
  	size_t	 			 last, xoff = 0, size = 0;
  
! 	window_mode_attrs(&gc, oo);
  
  	last = screen_size_y(s) - 1;
  	if (py == 0) {
***************
*** 1232,1241 ****
  		return (0);
  
  	/* Set colours. */
! 	memcpy(&gc, &grid_default_cell, sizeof gc);
! 	colour_set_fg(&gc, options_get_number(oo, "mode-fg"));
! 	colour_set_bg(&gc, options_get_number(oo, "mode-bg"));
! 	gc.attr |= options_get_number(oo, "mode-attr");
  
  	/* Find top of screen. */
  	ty = screen_hsize(data->backing) - data->oy;
--- 1229,1235 ----
  		return (0);
  
  	/* Set colours. */
! 	window_mode_attrs(&gc, oo);
  
  	/* Find top of screen. */
  	ty = screen_hsize(data->backing) - data->oy;