===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- src/usr.bin/tmux/window-copy.c	2009/09/07 18:50:45	1.26
+++ src/usr.bin/tmux/window-copy.c	2009/09/10 17:16:24	1.27
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.26 2009/09/07 18:50:45 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.27 2009/09/10 17:16:24 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -660,14 +660,15 @@
 {
 	struct window_copy_mode_data	*data = wp->modedata;
 	struct screen			*s = &data->screen;
+	struct options			*oo = &wp->window->options;
 	struct grid_cell		 gc;
 	char				 hdr[32];
 	size_t	 			 last, xoff = 0, size = 0;
 
 	memcpy(&gc, &grid_default_cell, sizeof gc);
-	gc.fg = options_get_number(&wp->window->options, "mode-fg");
-	gc.bg = options_get_number(&wp->window->options, "mode-bg");
-	gc.attr |= options_get_number(&wp->window->options, "mode-attr");
+	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) {
@@ -765,6 +766,7 @@
 {
 	struct window_copy_mode_data	*data = wp->modedata;
 	struct screen			*s = &data->screen;
+	struct options			*oo = &wp->window->options;
 	struct grid_cell		 gc;
 	u_int				 sx, sy, ty;
 
@@ -773,9 +775,9 @@
 
 	/* Set colours. */
 	memcpy(&gc, &grid_default_cell, sizeof gc);
-	gc.fg = options_get_number(&wp->window->options, "mode-fg");
-	gc.bg = options_get_number(&wp->window->options, "mode-bg");
-	gc.attr |= options_get_number(&wp->window->options, "mode-attr");
+	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(&wp->base) - data->oy;