===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -c -r1.83 -r1.84
*** src/usr.bin/tmux/status.c	2012/01/20 19:10:29	1.83
--- src/usr.bin/tmux/status.c	2012/01/20 19:51:28	1.84
***************
*** 1,4 ****
! /* $OpenBSD: status.c,v 1.83 2012/01/20 19:10:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: status.c,v 1.84 2012/01/20 19:51:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 684,697 ****
  		fmt = options_get_string(oo, "window-status-current-format");
  	}
  
! 	if (wl->flags & WINLINK_ALERTFLAGS) {
! 		fg = options_get_number(oo, "window-status-alert-fg");
  		if (fg != 8)
  			colour_set_fg(gc, fg);
! 		bg = options_get_number(oo, "window-status-alert-bg");
  		if (bg != 8)
  			colour_set_bg(gc, bg);
! 		attr = options_get_number(oo, "window-status-alert-attr");
  		if (attr != 0)
  			gc->attr = attr;
  	}
--- 684,717 ----
  		fmt = options_get_string(oo, "window-status-current-format");
  	}
  
! 	if (wl->flags & WINLINK_BELL) {
! 		fg = options_get_number(oo, "window-status-bell-fg");
  		if (fg != 8)
  			colour_set_fg(gc, fg);
! 		bg = options_get_number(oo, "window-status-bell-bg");
  		if (bg != 8)
  			colour_set_bg(gc, bg);
! 		attr = options_get_number(oo, "window-status-bell-attr");
! 		if (attr != 0)
! 			gc->attr = attr;
! 	} else if (wl->flags & WINLINK_CONTENT) {
! 		fg = options_get_number(oo, "window-status-content-fg");
! 		if (fg != 8)
! 			colour_set_fg(gc, fg);
! 		bg = options_get_number(oo, "window-status-content-bg");
! 		if (bg != 8)
! 			colour_set_bg(gc, bg);
! 		attr = options_get_number(oo, "window-status-content-attr");
! 		if (attr != 0)
! 			gc->attr = attr;
! 	} else if (wl->flags & (WINLINK_ACTIVITY|WINLINK_SILENCE)) {
! 		fg = options_get_number(oo, "window-status-activity-fg");
! 		if (fg != 8)
! 			colour_set_fg(gc, fg);
! 		bg = options_get_number(oo, "window-status-activity-bg");
! 		if (bg != 8)
! 			colour_set_bg(gc, bg);
! 		attr = options_get_number(oo, "window-status-activity-attr");
  		if (attr != 0)
  			gc->attr = attr;
  	}